Author: costin
Date: Tue Mar 25 20:53:53 2008
New Revision: 641134
URL: http://svn.apache.org/viewvc?rev=641134&view=rev
Log:
Fix build file (still missing lots of files), remove old
Added:
tomcat/sandbox/tomcat-lite/resources/coyote-lite.MF (with props)
Removed:
tomcat/sandbox/tomcat-lite/external/jasper.jar
tomcat/sandbox/tomcat-lite/external/javax.annotation.jar
tomcat/sandbox/tomcat-lite/external/javax.servlet.jar
tomcat/sandbox/tomcat-lite/resources/deploy.MF
Modified:
tomcat/sandbox/tomcat-lite/build.xml
tomcat/sandbox/tomcat-lite/resources/tomcat-lite.MF
Modified: tomcat/sandbox/tomcat-lite/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/build.xml?rev=641134&r1=641133&r2=641134&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-lite/build.xml (original)
+++ tomcat/sandbox/tomcat-lite/build.xml Tue Mar 25 20:53:53 2008
@@ -9,117 +9,157 @@
<property file="../build/build.properties.default"/>
<!-- Source dependencies -->
- <property name="target.vm" value="1.4"/>
- <property name="source.vm" value="1.4"/>
+ <property name="target.vm" value="1.6"/>
+ <property name="source.vm" value="1.6"/>
- <property name="compile.optimize" value="false"/>
+ <property name="compile.optimize" value="true"/>
<property name="compile.debug" value="false" />
<property name="compile.deprecation" value="false" />
- <property name="compile.source" value="1.4" />
+
+ <property name="compile.source" value="1.6" />
<!-- Used for 'download', to pack the dependent jars -->
<property name="tc.base" location="../.." />
<property name="tc6.home" value="${tc.base}/tomcat6"/>
<property name="tc6.classes" location="${tc6.home}/output/classes"/>
-
- <path id="runtime-deps" >
+ <property name="classes" location="output/classes"/>
+
+ <path id="runtime-deps" >
+ <pathelement location="external/servlet-api.jar"/>
+ <pathelement location="external/annotations-api.jar"/>
</path>
<target name="compile" >
- <mkdir dir="classes" />
- <javac destdir="classes" source="${source.vm}"
+ <mkdir dir="${classes}" />
+ <!-- Extension API and utils -->
+ <javac destdir="${classes}" source="${source.vm}"
target="${target.vm}"
includeJavaRuntime="false"
deprecation="false"
+ classpathref="runtime-deps"
+ debug="false" >
+ <src path="java" />
+ <include name ="org/apache/tomcat/servlets/addon/**" />
+ <include name ="org/apache/tomcat/servlets/util/**" />
+ </javac>
+
+ <!-- Coyote common -->
+ <javac destdir="${classes}" source="${source.vm}"
+ target="${target.vm}"
+ classpathref="runtime-deps"
+ includeJavaRuntime="false"
+ deprecation="false"
+ debug="false" >
+ <src path="tomcat-coyote" />
+ <include name ="**" />
+ </javac>
+ <copy todir="${classes}" >
+ <fileset dir="tomcat-coyote"
+ includes="**/*.properties **/*.xml"/>
+ </copy>
+
+ <!-- Engine-independent extensions ( they depend only on tomcat-util ) -->
+ <javac destdir="${classes}" source="${source.vm}"
+ target="${target.vm}"
+ includeJavaRuntime="false"
+ classpathref="runtime-deps"
+ deprecation="false"
debug="false" >
<src path="java" />
- <include name="javax/servlet/**"/>
- <include name="org/apache/commons/logging/**"/>
- <include name ="org/apache/tomcat/lite/**" />
<include name ="org/apache/tomcat/servlets/config/**" />
- <include name ="org/apache/tomcat/servlets/deploy/**" />
- <exclude name="**/WebAnnotation.java"/>
<include name ="org/apache/tomcat/servlets/file/**" />
- <exclude name="**/Webdav2Servlet.java"/>
<include name ="org/apache/tomcat/servlets/log/**" />
<include name ="org/apache/tomcat/servlets/sec/**" />
<include name ="org/apache/tomcat/servlets/session/**" />
- <include name ="org/apache/tomcat/servlets/util/**" />
- <include name ="org/apache/tomcat/util/*" />
- <include name ="org/apache/tomcat/util/buf/**" />
- <include name ="org/apache/tomcat/util/collections/**" />
- <include name ="org/apache/tomcat/util/http/**" />
- <include name ="org/apache/tomcat/util/net/**" />
- <include name ="org/apache/tomcat/util/res/**" />
</javac>
- <copy todir="classes" >
- <fileset dir="java"
+ <!-- Http11 nio -->
+ <javac destdir="${classes}" source="${source.vm}"
+ classpathref="runtime-deps"
+ target="${target.vm}"
+ includeJavaRuntime="false"
+ deprecation="false"
+ debug="false" >
+ <src path="coyote-nio" />
+ <include name ="**" />
+ </javac>
+ <copy todir="${classes}" >
+ <fileset dir="coyote-nio"
+ includes="**/*.properties **/*.xml"/>
+ </copy>
+
+
+ <!-- Http11 apr - not needed in minimal/standalone, can be moved to
+ addon
+ <javac destdir="${classes}" source="${source.vm}"
+ target="${target.vm}"
+ classpathref="runtime-deps"
+ includeJavaRuntime="false"
+ deprecation="false"
+ debug="false" >
+ <src path="coyote-apr" />
+ <include name ="**" />
+ </javac>
+ <copy todir="${classes}" >
+ <fileset dir="coyote-apr"
includes="**/*.properties **/*.xml"/>
</copy>
- </target>
-
- <target name="compile-extra" >
- <mkdir dir="classes" />
- <javac destdir="classes" source="${source.vm}"
+ -->
+
+ <!-- Coyote extra -->
+ <javac destdir="${classes}" source="${source.vm}"
target="${target.vm}"
+ classpathref="runtime-deps"
+ includeJavaRuntime="false"
+ deprecation="false"
+ debug="false" >
+ <src path="coyote-extensions" />
+ <exclude name="**/SelectorThreadApr.java" />
+ <include name ="**" />
+ </javac>
+
+ <!-- Tomcat-lite -->
+ <javac destdir="${classes}" source="${source.vm}"
+ target="${target.vm}"
+ classpathref="runtime-deps"
includeJavaRuntime="false"
deprecation="false"
debug="false" >
<src path="java" />
- <classpath>
- <path refid="runtime-deps" />
- <pathelement location="${tc6.classes}"/>
- </classpath>
+ <include name ="org/apache/tomcat/lite/**" />
</javac>
-
- <copy todir="classes" >
+ <copy todir="${classes}" >
<fileset dir="java"
includes="**/*.properties **/*.xml"/>
</copy>
</target>
-
+
<target name="clean">
- <delete dir="classes" includes="**"/>
+ <delete dir="${classes}" includes="**"/>
</target>
<target name="tomcat-lite.jar" depends="compile,pack_tomcat-lite.jar"/>
<target name="pack_tomcat-lite.jar" >
- <jar destfile="tomcat-lite.jar" manifest="resources/tomcat-lite.MF">
- <fileset dir="classes" >
- <include name="org/apache/commons/logging/**"/>
+ <jar destfile="output/tomcat-lite.jar" manifest="resources/tomcat-lite.MF">
+ <fileset dir="${classes}" >
<include name ="org/apache/tomcat/lite/**" />
- <include name ="org/apache/tomcat/servlets/config/**" />
- <include name ="org/apache/tomcat/servlets/deploy/**" />
- <exclude name="**/WebAnnotation.java"/>
- <include name ="org/apache/tomcat/servlets/file/**" />
- <exclude name="**/Webdav2Servlet.java"/>
- <include name ="org/apache/tomcat/servlets/log/**" />
- <include name ="org/apache/tomcat/servlets/sec/**" />
- <include name ="org/apache/tomcat/servlets/session/**" />
- <include name ="org/apache/tomcat/servlets/util/**" />
- <include name ="org/apache/tomcat/util/*" />
- <include name ="org/apache/tomcat/util/buf/**" />
- <include name ="org/apache/tomcat/util/collections/**" />
- <include name ="org/apache/tomcat/util/http/**" />
- <include name ="org/apache/tomcat/util/net/**" />
- <include name ="org/apache/tomcat/util/res/**" />
+ <include name ="org/apache/tomcat/**" />
+ <include name ="org/apache/coyote/**" />
+ <include name ="org/apache/juli/**" />
</fileset>
-
- <zipfileset src ="external/javax.servlet.jar"/>
+ <zipfileset src="external/servlet-api.jar"/>
+ <zipfileset src="external/annotations-api.jar"/>
</jar>
-
- <!--mkdir dir="webapps/__x_deploy/WEB-INF/lib"/>
- <jar destfile="webapps/__x_deploy/WEB-INF/lib/deploy.jar"
- manifest="resources/deploy.MF">
- <fileset dir="classes" >
- <include name="org/apache/tomcat/servlets/deploy/**"/>
+ <jar destfile="output/coyote-standalone.jar"
manifest="resources/coyote-lite.MF">
+ <fileset dir="${classes}" >
+ <include name ="org/apache/tomcat/util/**" />
+ <include name ="org/apache/coyote/**" />
+ <include name ="org/apache/juli/**" />
</fileset>
- </jar-->
-
+ </jar>
</target>
<target name="all" depends="tomcat-lite.jar" />
Added: tomcat/sandbox/tomcat-lite/resources/coyote-lite.MF
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/resources/coyote-lite.MF?rev=641134&view=auto
==============================================================================
--- tomcat/sandbox/tomcat-lite/resources/coyote-lite.MF (added)
+++ tomcat/sandbox/tomcat-lite/resources/coyote-lite.MF Tue Mar 25 20:53:53 2008
@@ -0,0 +1,2 @@
+Manifest-version: 1.0
+Main-Class: org.apache.coyote.adapters.CoyoteMain
Propchange: tomcat/sandbox/tomcat-lite/resources/coyote-lite.MF
------------------------------------------------------------------------------
svn:executable = *
Modified: tomcat/sandbox/tomcat-lite/resources/tomcat-lite.MF
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/resources/tomcat-lite.MF?rev=641134&r1=641133&r2=641134&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-lite/resources/tomcat-lite.MF (original)
+++ tomcat/sandbox/tomcat-lite/resources/tomcat-lite.MF Tue Mar 25 20:53:53 2008
@@ -1,2 +1,2 @@
Manifest-version: 1.0
-Main-Class: org.apache.tomcat.lite.TomcatLite
+Main-Class: org.apache.tomcat.lite.TomcatLiteMain
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
