craigmcc 01/10/23 10:06:16
Modified: tester/src/tester/org/apache/tester Jndi02.java
tester/web/WEB-INF web.xml
Log:
Add a test for access to a nested environment entry.
Revision Changes Path
1.3 +24 -2
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi02.java
Index: Jndi02.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Jndi02.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Jndi02.java 2001/08/16 00:01:34 1.2
+++ Jndi02.java 2001/10/23 17:06:15 1.3
@@ -79,7 +79,7 @@
* deployment descriptor.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/08/16 00:01:34 $
+ * @version $Revision: 1.3 $ $Date: 2001/10/23 17:06:15 $
*/
public class Jndi02 extends HttpServlet {
@@ -87,7 +87,7 @@
// Names of the known <env-entry> elements
String names[] =
{ "booleanEntry", "byteEntry", "doubleEntry", "floatEntry",
- "integerEntry", "longEntry", "stringEntry" };
+ "integerEntry", "longEntry", "stringEntry", "nested" };
// Reference some application classes for the first time in destroy()
@@ -307,6 +307,28 @@
value = envContext.lookup("stringEntry");
String stringValue = (String) value;
if (!"String Value".equals(stringValue)) {
+ sb.append(" stringValue is ");
+ sb.append(stringValue);
+ sb.append(".");
+ }
+ }
+ } catch (ClassCastException e) {
+ sb.append(" stringValue class is ");
+ sb.append(value.getClass().getName());
+ sb.append(".");
+ } catch (NullPointerException e) {
+ sb.append(" stringValue is missing.");
+ } catch (NamingException e) {
+ log("Get stringValue", e);
+ sb.append(" Cannot get stringValue.");
+ }
+
+ // Validate the nestedEntry environment entry
+ try {
+ if (ok) {
+ value = envContext.lookup("nested/nestedEntry");
+ String stringValue = (String) value;
+ if (!"Nested Value".equals(stringValue)) {
sb.append(" stringValue is ");
sb.append(stringValue);
sb.append(".");
1.53 +5 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- web.xml 2001/10/15 22:39:06 1.52
+++ web.xml 2001/10/23 17:06:15 1.53
@@ -1964,5 +1964,10 @@
<env-entry-type>java.lang.String</env-entry-type>
</env-entry>
+ <env-entry>
+ <env-entry-name>nested/nestedEntry</env-entry-name>
+ <env-entry-value>Nested Value</env-entry-value>
+ <env-entry-type>java.lang.String</env-entry-type>
+ </env-entry>
</web-app>
