[gentoo-commits] gentoo commit in src/patchsets/resin/3.1.12: resin-3.1.12-build.xml.patch

[Krzysztof Pawlik (nelchael)]

nelchael    11/09/06 16:24:59

  Added:                resin-3.1.12-build.xml.patch
  Log:
  Add patch for Resin 3.1.12.

Revision  Changes    Path
1.1                  src/patchsets/resin/3.1.12/resin-3.1.12-build.xml.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/3.1.12/resin-3.1.12-build.xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/3.1.12/resin-3.1.12-build.xml.patch?rev=1.1&content-type=text/plain

Index: resin-3.1.12-build.xml.patch
===================================================================
diff -Nru resin-3.1.12.vanilla/build.xml resin-3.1.12/build.xml
--- resin-3.1.12.vanilla/build.xml	2011-09-06 18:19:42.449441607 +0200
+++ resin-3.1.12/build.xml	2011-09-06 18:19:55.277526546 +0200
@@ -9,7 +9,6 @@
 
   <property name="modules" location="${basedir}/modules"/>
   <property name="src" location="${basedir}/src"/>
-  <property name="ext" location="${basedir}/modules/ext"/>
   <property name="ivy.lib" location="${basedir}/ivy-lib"/>
   <property name="doc" location="${basedir}/doc"/>
 
@@ -19,15 +18,12 @@
   <property name="dist" location="${install}/dist"/>
 
   <property name="javac.verbose" value="off"/>
-  <property name="javac.debug" value="on"/>
+  <property name="javac.debug" value="off"/>
   <property name="javac.optimize" value="off"/>
   <property name="javac.deprecation" value="off"/>
   <property name="javac.nowarn" value="on"/>
   <property name="javac.memoryMaximumSize" value="512m"/>
 
-  <property name="javac.source" value="1.5"/>
-  <property name="javac.target" value="1.5"/>
-
   <property name="jar.compress" value="false"/>
   <!--
   <property name="jar.index" value="true"/>
@@ -41,7 +37,7 @@
 
   <target name="update">
     <mkdir dir="${ivy.lib}"/>
-    <ivy:retrieve pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+	<!-- <ivy:retrieve pattern="${ivy.lib}/[artifact]-[revision].[ext]"/> -->
   </target>
 
   <target name="tstamp">
@@ -92,14 +88,13 @@
   </target>
 
   <target name="compile" 
-          depends="init, hessian, jws, ejb, jpa, j2ee-management, jca, jms, jsdk, jstl, jsf, jta, portlet, script, resin-util, resin-deploy, quercus, resin, ecmascript, webbeans, webutil, deploy, conf, ext">
+          depends="init, hessian, jws, ejb, jpa, j2ee-management, jca, jms, jstl, jsf, jta, portlet, script, resin-util, resin-deploy, quercus, resin, ecmascript, webbeans, webutil, deploy, conf">
   </target>
 
   <target name="ant" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="ant"/>
       <param name="module.jar" value="resin-ant.jar"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
   
@@ -114,7 +109,6 @@
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="ejb"/>
       <param name="module.jar" value="ejb-15.jar"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -122,11 +116,10 @@
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="jpa"/>
       <param name="module.jar" value="jpa-15.jar"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
-  <target name="hessian" depends="init, jsdk">
+  <target name="hessian" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="hessian"/>
       <param name="module.jar" value="hessian.jar"/>
@@ -148,11 +141,10 @@
     </antcall>
   </target>
 
-  <target name="jaxrpc" depends="init,saaj,jsdk">
+  <target name="jaxrpc" depends="init,saaj">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="jaxrpc"/>
       <param name="module.jar" value="jaxrpc-15.jar"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -199,7 +191,7 @@
     </antcall>
   </target>
 
-  <target name="jstl" depends="init, jsdk">
+  <target name="jstl" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="jstl"/>
       <param name="module.jar" value="jstl-11.jar"/>
@@ -354,13 +346,12 @@
     </copy>
   </target>
 
-  <target name="resin-dev" depends="init, compat, ejb, hessian, jca, jms, jsdk, jstl, jsf, jta, j2ee-management, portlet, script, resin-deploy, resin-util, webbeans, version">
+  <target name="resin-dev" depends="init, compat, ejb, hessian, jca, jms, jstl, jsf, jta, j2ee-management, portlet, script, resin-deploy, resin-util, webbeans, version">
 
     <!-- build module -->
 
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="resin"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
   
@@ -385,14 +376,12 @@
   <target name="webutil" depends="init, resin">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="webutil"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
   <target name="quercus-dev" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="quercus"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -401,7 +390,6 @@
   <target name="ecmascript" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="ecmascript"/>
-      <param name="javac.source" value="1.5"/>
     </antcall>
   </target>
 
@@ -434,20 +422,15 @@
            verbose="${javac.verbose}" 
            debug="${javac.debug}" optimize="${javac.optimize}"
            deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
-           source="${javac.source}"
-           target="${javac.target}"
            excludes="**/.svn/**"
            memoryMaximumSize="${javac.memoryMaximumSize}">
       <classpath>
         <dirset dir="${modules}">
           <include name="*/classes"/>
        </dirset>
-        <fileset dir="${ext}">
-          <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${ivy.lib}">
-          <include name="**/*.jar"/>
-        </fileset>
+       <fileset dir="lib/">
+           <include name="*.jar"/>
+       </fileset>
       </classpath>
     </javac>
 
@@ -553,13 +536,6 @@
     </copy>
   </target>
 
-  <target name="ext" depends="init, resin">
-    <copy todir="${install}/lib" preservelastmodified="true">
-      <fileset dir="${ext}">
-      </fileset>
-    </copy>
-  </target>
-
   <target name="webapps" depends="init, doc, quercus">
   </target>
 
@@ -664,9 +640,6 @@
           <dirset dir="${modules}">
             <include name="*/classes"/>
           </dirset>
-          <fileset dir="${modules}/ext">
-            <include name="**/*.jar"/>
-          </fileset>
         </classpath>
       </java>
 
@@ -812,7 +785,6 @@
         <include name="lib/j2ee-management-10.jar"/>
         <include name="lib/jca-15.jar"/>
         <include name="lib/jms-11.jar"/>
-        <include name="lib/jsdk-15.jar"/>
         <include name="lib/jsr88.jar"/>
         <include name="lib/jsf-12.jar"/>
         <include name="lib/jstl-11.jar"/>