SOURCES: apache-tomcat-skip-jdt.patch, apache-tomcat-no-connectors...

[glen]

Author: glen                         Date: Thu Apr 19 20:13:18 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- still some connectors needed

---- Files affected:
SOURCES:
   apache-tomcat-skip-jdt.patch (1.3 -> 1.4) , apache-tomcat-no-connectors.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/apache-tomcat-skip-jdt.patch
diff -u SOURCES/apache-tomcat-skip-jdt.patch:1.3 SOURCES/apache-tomcat-skip-jdt.patch:1.4
--- SOURCES/apache-tomcat-skip-jdt.patch:1.3	Thu Apr 12 01:33:23 2007
+++ SOURCES/apache-tomcat-skip-jdt.patch	Thu Apr 19 22:13:12 2007
@@ -1,63 +1,16 @@
---- apache-tomcat-5.5.23-src/build/build.xml	2007-04-12 02:31:55.729662406 +0300
-+++ apache-tomcat-5.5.23-src/build/build.xml	2007-04-12 02:32:54.410985008 +0300
-@@ -62,9 +62,9 @@
-   <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" />
-   <property name="tomcat-dbcp.jar"
-        value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
--  <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
-+   <!--<property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
-   <property name="jasper-compiler-jdt.jar"
--       value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
-+	  value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>-->
- 
-   <!-- Some compilers will disable debugging if true. And it doesn't do anything
-        in most cases -->
-@@ -154,7 +154,7 @@
- 
-     <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
-     <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
--    <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
-+	<!--<copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>-->
-   </target>
- 
-   <!-- ====================== Build all components =================== -->
-@@ -660,12 +660,14 @@
+--- apache-tomcat-5.5.23-src/build/build.xml~	2007-04-19 23:08:15.507438570 +0300
++++ apache-tomcat-5.5.23-src/build/build.xml	2007-04-19 23:08:49.088179972 +0300
+@@ -660,11 +660,13 @@
  
      <antcall target="build-tomcat-dbcp" />
  
-+	<!--
++ 	<!--
      <antcall target="downloadzip">
        <param name="sourcefile" value="${jdt.loc}"/>
        <param name="destfile" value="${jdt.jar}"/>
        <param name="destdir" value="${base.path}"/>
      </antcall>
--    <antcall target="build-jasper-compiler-jdt" />
-+	<antcall target="build-jasper-compiler-jdt" />
-+	-->
++ 	-->
+     <antcall target="build-jasper-compiler-jdt" />
    </target>
- 
-   <target name="build-tomcat-dbcp">
-@@ -725,12 +727,14 @@
-     </jar>
-   </target>
- 
-+  <!--
-       <target name="build-jasper-compiler-jdt">
-        <mkdir dir="${jasper-compiler-jdt.home}"/>
-        <antcall target="-build-jasper-compiler-jdt">
-           <param name="basedir" value="${jasper-compiler-jdt.home}" />
-        </antcall>
-       </target>
-+	-->
- 
-       <target name="-build-jasper-compiler-jdt">
-         <unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
-@@ -944,7 +948,7 @@
-     <copy todir="embed/lib">
-       <fileset dir="build/common/lib">
-         <include name="jasper-compiler.jar"/>
--        <include name="jasper-compiler-jdt.jar"/>
-+		<!--<include name="jasper-compiler-jdt.jar"/>-->
-       </fileset>
-     </copy>
  

================================================================
Index: SOURCES/apache-tomcat-no-connectors.patch
diff -u SOURCES/apache-tomcat-no-connectors.patch:1.2 SOURCES/apache-tomcat-no-connectors.patch:1.3
--- SOURCES/apache-tomcat-no-connectors.patch:1.2	Thu Apr 19 21:15:54 2007
+++ SOURCES/apache-tomcat-no-connectors.patch	Thu Apr 19 22:13:12 2007
@@ -11,29 +11,7 @@
  
      <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
      <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
-@@ -570,10 +571,12 @@
-   <target name="build" depends="init"
-           description="Builds all components">
- 
-+<!--
-     <antcall target="build-tomcatapr"/>
-     <antcall target="build-tomcatutil"/>
-     <antcall target="build-tomcatcoyote"/>
-     <antcall target="build-tomcathttp11"/>
-+-->
- 
-     <antcall target="build-catalina"/>
- 
-@@ -1369,7 +1372,7 @@
-     <mkdir  dir="${tomcat.dist}/src/${api.project}"/>
-     <mkdir  dir="${tomcat.dist}/src/${tomcat.project}"/>
-     <mkdir  dir="${tomcat.dist}/src/${catalina.project}"/>
--    <mkdir  dir="${tomcat.dist}/src/${jtc.project}"/>
-+    <!--<mkdir  dir="${tomcat.dist}/src/${jtc.project}"/>-->
-     <mkdir  dir="${tomcat.dist}/src/${jasper.project}"/>
- 
-     <!-- Main build file -->
-@@ -1420,6 +1423,7 @@
+@@ -1420,6 +1421,7 @@
      </copy>
  
      <!-- tomcat connectors source -->
@@ -41,7 +19,7 @@
      <copy todir="${tomcat.dist}/src/${jtc.project}">
        <fileset dir="${jtc.home}">
          <exclude name="coyote/build/**"/>
-@@ -1431,6 +1435,7 @@
+@@ -1431,6 +1433,7 @@
          <exclude name="build.properties"/>
        </fileset>
      </copy>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache-tomcat-skip-jdt.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/apache-tomcat-no-connectors.patch?r1=1.2&r2=1.3&f=u