costin 2002/11/19 16:16:26 Modified: catalina build.xml Log: Build the factory for the java: context in a separate jar ( naming-java.jar ). This allows a more friendly integration of tomcat in other applications that use their own java: namespace. ( i.e. just remove catalina java: ns ) Revision Changes Path 1.31 +10 -1 jakarta-tomcat-catalina/catalina/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- build.xml 13 Nov 2002 00:27:43 -0000 1.30 +++ build.xml 20 Nov 2002 00:16:26 -0000 1.31 @@ -891,10 +891,19 @@ <include name="org/apache/naming/*" /> <include name="org/apache/naming/factory/Constants.class" /> <include name="org/apache/naming/factory/ResourceLinkFactory.class" /> - <include name="org/apache/naming/java/*" /> + <exclude name="org/apache/naming/java/*" /> <exclude name="org/apache/naming/JndiPermission.class" /> </fileset> </jar> + + <!-- Naming - Java: namespace. It shouldn't be included if tomcat is used inside a different + container that provides this ns --> + <jar jarfile="${catalina.deploy}/common/lib/naming-java.jar"> + <fileset dir="${classes.dir}"> + <include name="org/apache/naming/java/*" /> + </fileset> + </jar> + <!-- Naming - Factory JAR File --> <jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar">
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>