Refactor JndiPropertySource

Prior to this change, JndiPropertySource worked directly against a JNDI
Context instance as its 'source' object.  This works well enough, but is
not nearly as fully-featured as Spring's existing JndiLocatorDelegate.

This change refactors JndiPropertySource from relying on an underlying
Context to relying on an underlying JndiLocatorDelegate.  By default,
the delegate's "resourceRef" property is set to true, meaning that the
implementation will always try to prepand a given name with
"java:comp/env/" before looking up the name, and upon failure will drop
back to the given name sans prefix.

See JndiPropertySource Javadoc for complete details.

Issue: SPR-8490

org.springframework.context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jndi;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.junit.Test;
+import org.springframework.mock.jndi.SimpleNamingContext;
+
+/**
+ * Unit tests for {@link JndiPropertySource}.
+ *
+ * @author Chris Beams
+ * @since 3.1
+ */
+public class JndiPropertySourceTests {
+
+	@Test
+	public void nonExistentProperty() {
+		JndiPropertySource ps = new JndiPropertySource();
+		assertThat(ps.getProperty("bogus"), nullValue());
+	}
+
+	@Test
+	public void nameBoundWithoutPrefix() {
+		final SimpleNamingContext context = new SimpleNamingContext();
+		context.bind("p1", "v1");
+
+		JndiTemplate jndiTemplate = new JndiTemplate() {
+			@Override
+			protected Context createInitialContext() throws NamingException {
+				return context;
+			}
+		};
+		JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate();
+		jndiLocator.setResourceRef(true);
+		jndiLocator.setJndiTemplate(jndiTemplate);
+
+		JndiPropertySource ps = new JndiPropertySource(jndiLocator);
+		assertThat((String)ps.getProperty("p1"), equalTo("v1"));
+	}
+
+	@Test
+	public void nameBoundWithPrefix() {
+		final SimpleNamingContext context = new SimpleNamingContext();
+		context.bind("java:comp/env/p1", "v1");
+
+		JndiTemplate jndiTemplate = new JndiTemplate() {
+			@Override
+			protected Context createInitialContext() throws NamingException {
+				return context;
+			}
+		};
+		JndiLocatorDelegate jndiLocator = new JndiLocatorDelegate();
+		jndiLocator.setResourceRef(true);
+		jndiLocator.setJndiTemplate(jndiTemplate);
+
+		JndiPropertySource ps = new JndiPropertySource(jndiLocator);
+		assertThat((String)ps.getProperty("p1"), equalTo("v1"));
+	}
+
+}