tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject svn commit: r326345 - /tomcat/build/tc5.5.x/build.xml
Date Wed, 19 Oct 2005 02:52:25 GMT
Author: costin
Date: Tue Oct 18 19:52:21 2005
New Revision: 326345

URL: http://svn.apache.org/viewcvs?rev=326345&view=rev
Log:
Remove naming from runtime

Modified:
    tomcat/build/tc5.5.x/build.xml

Modified: tomcat/build/tc5.5.x/build.xml
URL: http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/build.xml?rev=326345&r1=326344&r2=326345&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Oct 18 19:52:21 2005
@@ -1140,7 +1140,7 @@
     <mkdir dir="runtime/deps" />
     <mkdir dir="runtime/classes" />
     <unjar dest="runtime/deps" src="${base.path}/servlet-api-2.4/lib/servlet-api.jar"
/>
-    <!-- unjar dest="runtime/deps" src="${base.path}/commons-logging-1.0.4/commons-logging.jar"/
-->
+    <unjar dest="runtime/deps" src="${base.path}/commons-logging-1.0.4/commons-logging.jar"/>
     <unjar dest="runtime/deps" src="${base.path}/commons-modeler-1.1/commons-modeler.jar"/>
     <unjar dest="runtime/deps" src="${base.path}/jsp-api-2.0/lib/jsp-api.jar"/>
    </target>
@@ -1150,23 +1150,20 @@
            description="Build single jar tomcat">
 
       <javac destdir="runtime/classes" deprecation="false" debug="false"  >
-            <!-- classpath path="${base.path}/commons-beanutils-1.6.1/commons-beanutils.jar"/
-->
-            <!-- classpath path="${base.path}/commons-logging-1.0.4/commons-logging.jar"/
-->
+            <classpath path="runtime/deps" />
+            <!-- classpath path="${base.path}/commons-logging-1.0.4/commons-logging.jar"/>
             <classpath path="${base.path}/commons-modeler-1.1/commons-modeler.jar"/>
             <classpath path="${base.path}/jsp-api-2.0/lib/jsp-api.jar"/>
-            <classpath path="${base.path}/servlet-api-2.4/lib/servlet-api.jar"/>
+            <classpath path="${base.path}/servlet-api-2.4/lib/servlet-api.jar"/ -->
             <classpath path="${base.path}/jmxri-1.2.1.jar"/>
 
             <src>
                 <pathelement path="${jtc.home}/util/java"/>
-                <pathelement path="${jtc.home}/mini/java" />
-                <!-- pathelement path="${jtc.home}/naming/src"/ -->
+                <!-- pathelement path="${jtc.home}/mini/java" /-->
                 <pathelement path="${jtc.home}/coyote/src/java"/>
                 <pathelement path="${jtc.home}/http11/src/java"/>
                 <pathelement path="${catalina.home}/catalina/src/share"/>
             </src>
-            <exclude name="org/apache/naming/*.java"/>
-            <exclude name="org/apache/naming/ant/**"/>
             <exclude name="org/apache/tomcat/util/net/puretls/**"/>
             <exclude name="org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java"/>
             <exclude name="org/apache/tomcat/util/net/jsse/JSSE15Factory.java"/>
@@ -1186,6 +1183,8 @@
             <exclude name="org/apache/catalina/ant/**"/>
             <exclude name="org/apache/catalina/ssi/**"/>
             <exclude name="org/apache/catalina/loader/CatalinaModuleListener.java"/>
+            <exclude name="org/apache/catalina/core/NamingContextListener.java"/>
+            <exclude name="org/apache/naming/**"/>
         </javac>
 
         <copy todir="runtime/classes" >



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message