remm 2004/10/01 02:00:16
Modified: catalina build.xml
Log:
- Move naming-resources to server (it seems to work).
- Merge all the ENC related stuff in a single JAR (I don't think it was useful
keeping all the micro JARs around).
- Comment out copying jk2.properties for now.
Revision Changes Path
1.75 +4 -34 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- build.xml 24 Sep 2004 16:41:12 -0000 1.74
+++ build.xml 1 Oct 2004 09:00:16 -0000 1.75
@@ -697,8 +697,10 @@
<copy tofile="${catalina.deploy}/server/lib/tomcat-ajp.jar"
file="${tomcat-jk2.jar}"/>
-->
+ <!--
<copy todir="${catalina.deploy}/conf"
file="${jk2.properties}"/>
+ -->
</target>
@@ -1017,43 +1019,11 @@
</fileset>
</jar>
- <!-- Naming - Common JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-common.jar"
- index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/naming/*" />
- <include name="org/apache/naming/factory/Constants.class" />
- <include name="org/apache/naming/factory/ResourceLinkFactory.class" />
- <exclude name="org/apache/naming/java/*" />
-<!--
- <exclude name="org/apache/naming/JndiPermission.class" />
--->
-
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
-
- </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" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/naming/java/*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
-
<!-- Naming - Factory JAR File -->
<jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar" index="true">
<fileset dir="${classes.dir}">
+ <include name="org/apache/naming/*" />
<include name="org/apache/naming/factory/**" />
- <exclude name="org/apache/naming/factory/Constants.class" />
- <exclude name="org/apache/naming/factory/ResourceLinkFactory.class" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
@@ -1061,7 +1031,7 @@
</jar>
<!-- Naming - Resources JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar" index="true">
+ <jar jarfile="${catalina.deploy}/server/lib/naming-resources.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/naming/JndiPermission.class" />
<include name="org/apache/naming/NameParserImpl.class" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
