Author: markt
Date: Fri May 11 06:33:48 2018
New Revision: 1831386
URL: http://svn.apache.org/viewvc?rev=1831386&view=rev
Log:
Follow-up to r1831352
Add additions to web.xml missed in original backport
Correct web-app path for 7.0.x
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java
tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
Modified: tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java?rev=1831386&r1=1831385&r2=1831386&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java Fri May 11
06:33:48 2018
@@ -93,7 +93,7 @@ public class TestEnvEntry extends Tomcat
private void doTestJndiLookup(String jndiName, String expected) throws
Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-fragments");
+ File appDir = new File("test/webapp-3.0-fragments");
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.enableNaming();
@@ -114,7 +114,7 @@ public class TestEnvEntry extends Tomcat
private void doTestJndiInjection(String injectionName, String expected)
throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir = new File("test/webapp-fragments");
+ File appDir = new File("test/webapp-3.0-fragments");
Context context = tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
Tomcat.addServlet(context, "InjectionServlet",
"org.apache.naming.TesterInjectionServlet");
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1831386&r1=1831385&r2=1831386&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Fri May 11
06:33:48 2018
@@ -86,4 +86,94 @@
<env-entry-type>java.lang.Integer</env-entry-type>
<env-entry-value>66</env-entry-value>
</env-entry>
+
+ <servlet>
+ <servlet-name>injection</servlet-name>
+ <servlet-class>org.apache.naming.TesterInjectionServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>injection</servlet-name>
+ <url-pattern>/injection</url-pattern>
+ </servlet-mapping>
+
+ <env-entry>
+ <env-entry-name>env-entry/basic</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>basic-value</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/valid</env-entry-name>
+ <env-entry-type>org.apache.naming.TesterEnvEntry</env-entry-type>
+ <env-entry-value>valid</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/invalid</env-entry-name>
+ <env-entry-type>org.apache.naming.TesterEnvEntry</env-entry-type>
+ <env-entry-value>invalid</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/injectField</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>inject-value-1</env-entry-value>
+ <injection-target>
+
<injection-target-class>org.apache.naming.TesterInjectionServlet</injection-target-class>
+ <injection-target-name>property1</injection-target-name>
+ </injection-target>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/injectProperty</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>inject-value-2</env-entry-value>
+ <injection-target>
+
<injection-target-class>org.apache.naming.TesterInjectionServlet</injection-target-class>
+ <injection-target-name>property2</injection-target-name>
+ </injection-target>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/injectFieldNoType</env-entry-name>
+ <env-entry-value>inject-value-3</env-entry-value>
+ <injection-target>
+
<injection-target-class>org.apache.naming.TesterInjectionServlet</injection-target-class>
+ <injection-target-name>property3</injection-target-name>
+ </injection-target>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/injectNoValue</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <injection-target>
+
<injection-target-class>org.apache.naming.TesterInjectionServlet</injection-target-class>
+ <injection-target-name>property4</injection-target-name>
+ </injection-target>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/lookup</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <lookup-name>java:comp/env/env-entry/basic</lookup-name>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/circular1</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <lookup-name>java:comp/env/env-entry/circular2</lookup-name>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/circular2</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <lookup-name>java:comp/env/env-entry/circular1</lookup-name>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>env-entry/lookup-invalid</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <lookup-name>java:comp/env/env-entry/basic</lookup-name>
+ </env-entry>
+
</web-app>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
