You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2005/11/13 08:19:14 UTC
svn commit: r332927 - in /tomcat/build/tc5.5.x: build.properties.default
build.xml
Author: costin
Date: Sat Nov 12 23:19:12 2005
New Revision: 332927
URL: http://svn.apache.org/viewcvs?rev=332927&view=rev
Log:
Removed ( moved to sandbox ) the single-jar option.
Added download for rhino.
Modified:
tomcat/build/tc5.5.x/build.properties.default
tomcat/build/tc5.5.x/build.xml
Modified: tomcat/build/tc5.5.x/build.properties.default
URL: http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/build.properties.default?rev=332927&r1=332926&r2=332927&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Sat Nov 12 23:19:12 2005
@@ -204,6 +204,11 @@
junit.loc=${base-sf.loc}/junit/junit3.8.1.zip
+# ----- Rhino ------
+rhino.home=${base.path}/rhino1_6R2
+rhino.jar=${rhino.home}/js.jar
+rhino.loc=http://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R2.zip
+
# ----- NSIS, version 2.0 or later -----
nsis.home=${base.path}/nsis-2.0
nsis.exe=${nsis.home}/makensis.exe
Modified: tomcat/build/tc5.5.x/build.xml
URL: http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/build.xml?rev=332927&r1=332926&r2=332927&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Sat Nov 12 23:19:12 2005
@@ -1159,134 +1159,6 @@
</ant>
</target>
- <!-- ======================= Single-jar tomcat =========== -->
- <target name="prepare-runtime-once"
- description="Do once before single jar tomcat">
- <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-modeler-1.1/commons-modeler.jar"/>
- <unjar dest="runtime/deps" src="${base.path}/jsp-api-2.0/lib/jsp-api.jar"/>
- </target>
-
-
- <target name="compile-runtime"
- description="Build single jar tomcat">
-
- <javac destdir="runtime/classes" deprecation="false" debug="false" >
- <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}/jmxri-1.2.1.jar"/>
-
- <src>
- <pathelement path="${jtc.home}/util/java"/>
- <!-- 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/tomcat/util/net/puretls/**"/>
- <exclude name="org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java"/>
- <exclude name="org/apache/tomcat/util/net/jsse/JSSE15Factory.java"/>
- <exclude name="org/apache/tomcat/util/net/AprEndpoint.java"/>
- <exclude name="org/apache/coyote/tomcat3/**"/>
- <exclude name="org/apache/coyote/tomcat4/**"/>
- <exclude name="org/apache/coyote/memory/**"/>
- <exclude name="org/apache/coyote/standalone/**"/>
- <exclude name="org/apache/coyote/http11/Http11AprProcessor.java"/>
- <exclude name="org/apache/coyote/http11/Http11AprProtocol.java"/>
- <exclude name="org/apache/coyote/http11/InternalAprInputBuffer.java"/>
- <exclude name="org/apache/coyote/http11/InternalAprOutputBuffer.java"/>
- <exclude name="**/CatalinaLaunchFilter.java"/>
- <exclude name="**/MailSessionFactory.java"/>
- <exclude name="**/SendMailFactory.java"/>
- <exclude name="**/SemaphoreValve.java"/>
- <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" >
- <fileset dir="${jtc.home}/util/java" includes="**/*.properties **/*.xml"/>
- <fileset dir="${jtc.home}/naming/src" includes="**/*.properties **/*.xml"/>
- <fileset dir="${jtc.home}/coyote/src/java" includes="**/*.properties **/*.xml" >
- <exclude name="org/apache/coyote/tomcat4/**"/>
- </fileset>
- <fileset dir="${jtc.home}/http11/src/java" includes="**/*.properties **/*.xml"/>
- <fileset dir="${catalina.home}/catalina/src/share" includes="**/*.properties **/*.xml"/>
- </copy>
-
- <jar jarfile="runtime/tomcat-runtime.jar" manifest="resources/runtime.MF">
- <fileset dir="runtime/classes" includes="**" />
- <fileset dir="runtime/deps" includes="**" >
-
- <exclude name="META-INF/**" />
- <exclude name="**/*.html" />
- <exclude name="org/apache/commons/modeler/ant/**" />
- <exclude name="org/apache/catalina/ant/**" />
-
- </fileset>
- <fileset dir="resources" >
- <include name="server-embed.xml"/>
- <include name="web-embed.xml"/>
- </fileset>
- </jar>
-
- </target>
-
- <target name="runtime" depends="prepare-runtime-once,compile-runtime"/>
-
- <!-- ======================= Coyote standalone =========== -->
- <!--
- This is only the http connector, for testing/experimental purposes.
- -->
-
- <target name="tomcat-http11" >
- <mkdir dir="runtime/http11"/>
- <javac destdir="runtime/http11" debug="false" >
- <src>
- <pathelement path="${jtc.home}/util/java"/>
- <pathelement path="${jtc.home}/util/loader"/>
- <pathelement path="${jtc.home}/mini/java"/>
- <pathelement path="${jtc.home}/coyote/src/java"/>
- <pathelement path="${jtc.home}/http11/src/java"/>
- </src>
- <exclude name="org/apache/coyote/http11/Http11Protocol.java"/>
- <exclude name="org/apache/coyote/http11/Http11AprProcessor.java"/>
- <exclude name="org/apache/coyote/http11/Http11AprProtocol.java"/>
- <exclude name="org/apache/coyote/http11/InternalAprInputBuffer.java"/>
- <exclude name="org/apache/coyote/http11/InternalAprOutputBuffer.java"/>
- <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"/>
- <exclude name="org/apache/tomcat/util/net/AprEndpoint.java"/>
- <exclude name="org/apache/tomcat/util/digester/**"/>
- <exclude name="org/apache/tomcat/util/compat/**"/>
- <exclude name="org/apache/tomcat/util/jmx/**"/>
- <exclude name="org/apache/tomcat/util/log/**"/>
- <exclude name="org/apache/tomcat/util/IntrospectionUtils.java"/>
- <exclude name="org/apache/coyote/tomcat3/**"/>
- <exclude name="org/apache/coyote/tomcat4/**"/>
- <exclude name="org/apache/coyote/memory/**"/>
- </javac>
- <copy todir="runtime/http11" >
- <fileset dir="${jtc.home}/http11/src/java" includes="**/*.properties **/*.xml"/>
- <fileset dir="${jtc.home}/util/java" includes="**/*.properties **/*.xml"/>
- </copy>
-
- <jar jarfile="runtime/tomcat-http11.jar" manifest="resources/coyote-http11.MF"
- basedir="runtime/http11"
- includes="**" />
-
- </target>
-
-
<!-- ======================= TESTER: Run Catalina Tester Tests=========== -->
<target name="dist-tester"
@@ -1983,6 +1855,12 @@
<param name="destfile" value="${junit.jar}"/>
<param name="destdir" value="${base.path}"/>
</antcall>
+
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${rhino.loc}"/>
+ <param name="destfile" value="${rhino.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-launcher.loc}"/>
@@ -2069,6 +1947,7 @@
<unzip src="${base.path}/file.zip" dest="${destdir}"/>
<delete file="${base.path}/file.zip"/>
</target>
+
<target name="downloadfile" unless="exist" depends="setproxy,testexist">
<!-- Download extract the file -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r332927 - in /tomcat/build/tc5.5.x: build.properties.default build.xml
Posted by Bill Barker <wb...@wilshire.com>.
----- Original Message -----
From: <co...@apache.org>
To: <to...@jakarta.apache.org>
Sent: Saturday, November 12, 2005 11:19 PM
Subject: svn commit: r332927 - in /tomcat/build/tc5.5.x:
build.properties.default build.xml
> Author: costin
> Date: Sat Nov 12 23:19:12 2005
> New Revision: 332927
>
> URL: http://svn.apache.org/viewcvs?rev=332927&view=rev
> Log:
> Removed ( moved to sandbox ) the single-jar option.
> Added download for rhino.
>
Huge -1. Rhino isn't needed for Tomcat, so it shouldn't be downloaded in
the Tomcat build.xml. If you need it for your toy, download it in the
sandbox build.xml file.
This message is intended only for the use of the person(s) listed above as the intended recipient(s), and may contain information that is PRIVILEGED and CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or distribute this message or any attachment. If you received this communication in error, please notify us immediately by e-mail and then delete all copies of this message and any attachments.
In addition you should be aware that ordinary (unencrypted) e-mail sent through the Internet is not secure. Do not send confidential or sensitive information, such as social security numbers, account numbers, personal identification numbers and passwords, to us via ordinary (unencrypted) e-mail.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org