[gentoo-commits] gentoo commit in src/patchsets/resin/4.0.25: mod_caucho-4.0.25-no-jni.patch resin-4.0.25-build.patch resin-4.0.25-classpath.patch

[Krzysztof Pawlik (nelchael)]

nelchael    12/02/11 18:44:14

  Added:                mod_caucho-4.0.25-no-jni.patch
                        resin-4.0.25-build.patch
                        resin-4.0.25-classpath.patch
  Log:
  Add patches for Resin 4.0.25.

Revision  Changes    Path
1.1                  src/patchsets/resin/4.0.25/mod_caucho-4.0.25-no-jni.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.25/mod_caucho-4.0.25-no-jni.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.25/mod_caucho-4.0.25-no-jni.patch?rev=1.1&content-type=text/plain

Index: mod_caucho-4.0.25-no-jni.patch
===================================================================
diff -Nru resin-4.0.25.vanilla/configure.ac resin-4.0.25/configure.ac
--- resin-4.0.25.vanilla/configure.ac	2012-02-11 19:37:27.161005340 +0100
+++ resin-4.0.25/configure.ac	2012-02-11 19:37:52.037162930 +0100
@@ -1122,11 +1122,6 @@
     echo "checking for JNI in $JAVA_HOME/include ... found"
   else
     JNI=""
-    AC_MSG_ERROR([
-
-    *** Can't find JNI directory in JAVA_HOME=${JAVA_HOME}
-    *** JNI is expected in ${JAVA_HOME}/include/$jni_os
-  ])
   fi
 
   HAS_JVMTI=""
@@ -1141,8 +1136,6 @@
     echo "Using JVMTI for class reloading"
     
     CFLAGS="$CFLAGS -DHAS_JVMTI"
-  else
-    AC_MSG_ERROR([Can't find JVMTI directory ${JNI_INCLUDE_DIR}/jvmti.h])
   fi
 fi
 



1.1                  src/patchsets/resin/4.0.25/resin-4.0.25-build.patch

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

Index: resin-4.0.25-build.patch
===================================================================
diff -Nru resin-4.0.25.vanilla/build-common.xml resin-4.0.25/build-common.xml
--- resin-4.0.25.vanilla/build-common.xml	2012-02-11 19:37:27.157005309 +0100
+++ resin-4.0.25/build-common.xml	2012-02-11 19:38:42.341481619 +0100
@@ -37,15 +37,12 @@
   <property name="resin.dist" location="${resindir}/dist"/>
 
   <property name="javac.verbose" value="off"/>
-  <property name="javac.debug" value="on"/>
-  <property name="javac.optimize" value="off"/>
+  <property name="javac.debug" value="off"/>
+  <property name="javac.optimize" value="on"/>
   <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"/>
@@ -292,6 +289,12 @@
         <fileset dir="${maven.lib}">
           <include name="**/*.jar"/>
         </fileset>
+		<fileset dir="${basedir}/gentoo-deps">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset dir="${basedir}/gentoo-deps">
+			<include name="**/*.jar"/>
+		</fileset>
       </classpath>
     </javac>
 
@@ -498,10 +501,6 @@
 
     <property file="${artifact.src}/module.properties"/>
 
-    <mkdir dir="${dist.build}/project-jars"/>
-
-    <copy tofile="${dist.build}/project-jars/resin-${artifact.name}-${version}.jar"
-          file="${artifact.dist}/${artifact.jar}"/>
   </target>
 	  
   <target name="resin.dist.jar"
diff -Nru resin-4.0.25.vanilla/build.xml resin-4.0.25/build.xml
--- resin-4.0.25.vanilla/build.xml	2012-02-11 19:37:27.157005309 +0100
+++ resin-4.0.25/build.xml	2012-02-11 19:38:42.381481879 +0100
@@ -12,7 +12,7 @@
   <property name="eclipse.home" value="${user.home}/eclipse"/>
 
   <target name="compile" 
-          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management,   resin-eclipselink">
+          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus, resin, ecmascript, cdi, webutil, conf, j2ee-management,   resin-eclipselink">
   </target>
 
   <!--
@@ -156,7 +156,7 @@
     </antcall>
   </target>
 
-  <target name="hessian" depends="init, servlet16">
+  <target name="hessian" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="hessian"/>
       <param name="module.jar" value="hessian.jar"/>
@@ -180,7 +180,7 @@
     </antcall>
   </target>
 
-  <target name="jaxrpc" depends="init,saaj,servlet16">
+  <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"/>
@@ -228,13 +228,6 @@
     </antcall>
   </target>
 
-  <target name="servlet16" depends="init">
-    <antcall target="module" inheritRefs="true">
-      <param name="module.name" value="servlet16"/>
-      <param name="module.jar" value="servlet-16.jar"/>
-    </antcall>
-  </target>
-
   <!--
     We now ship Sun's jsf-api.jar and jsf-impl.jar in modules/ext/
   <target name="jsf" depends="init">
@@ -245,7 +238,7 @@
     </antcall>
   </target-->
 
-  <target name="jstl" depends="init, servlet16">
+  <target name="jstl" depends="init">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="jstl"/>
       <param name="module.jar" value="jstl-11.jar"/>
@@ -344,7 +337,7 @@
     </antcall>
   </target>
   
-  <target name="resin-kernel" depends="init, cdi, servlet16, version">
+  <target name="resin-kernel" depends="init, cdi, version">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="kernel"/>
       <param name="module.dist" value="${lib}"/>
@@ -483,7 +476,7 @@
     </copy>
   </target>
 
-  <target name="javaee" depends="ejb, jca, jms, jpa, servlet16, cdi, jcache, jstl, jta">
+  <target name="javaee" depends="ejb, jca, jms, jpa, cdi, jcache, jstl, jta">
     <!--
        - javaee-16.jar
       -->
@@ -528,10 +521,6 @@
       </fileset>
       -->
       
-      <fileset dir="${resin.modules}/servlet16/classes">
-        <exclude name="**/.*"/>
-      </fileset>
-      
       <fileset dir="${resin.modules}/webbeans/classes">
         <exclude name="**/.*"/>
       </fileset>
@@ -672,20 +661,12 @@
     </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>
 
   <target name="doc" depends="init">
     <mkdir dir="${install}/webapps"/>
 
-    <!--
     <jar jarfile="${install}/webapps/resin-doc.war"
          compress="true" index="${jar.index}" update="${jar.update}">
 
@@ -699,7 +680,6 @@
         <exclude name="**/.svnignore"/>
       </fileset>
     </jar>
-    -->
   </target>
 
   <target name="javadoc" depends="init">
@@ -721,7 +701,6 @@
 
       <packageset dir="${modules}/ejb/src"/>
       <packageset dir="${modules}/hessian/src"/>
-      <packageset dir="${modules}/servlet16/src"/>
       <packageset dir="${modules}/jcache/src"/>
       <packageset dir="${modules}/jpa/src"/>
       <packageset dir="${modules}/jaxstream/src"/>



1.1                  src/patchsets/resin/4.0.25/resin-4.0.25-classpath.patch

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

Index: resin-4.0.25-classpath.patch
===================================================================
diff -Nru resin-4.0.25.vanilla/modules/resin/src/boot-manifest resin-4.0.25/modules/resin/src/boot-manifest
--- resin-4.0.25.vanilla/modules/resin/src/boot-manifest	2012-02-11 19:37:26.168999053 +0100
+++ resin-4.0.25/modules/resin/src/boot-manifest	2012-02-11 19:39:25.761756699 +0100
@@ -1,5 +1,5 @@
 Main-Class: com.caucho.server.bootstrap.ResinBoot
-Class-Path: resin.jar jta-101.jar isorelax.jar jsdk-24.jar jmx-12.jar jca-15.jar jstl-11.jar
+Class-Path: resin.jar jta-101.jar isorelax.jar resin-servlet-api.jar jmx-12.jar jca-15.jar jstl-11.jar
 Extension-Name: com.caucho.server.bootstrap
 Implementation-Vendor: Caucho Technology, Inc.
 Implementation-Version: 3.0.1
diff -Nru resin-4.0.25.vanilla/modules/resin/src/manifest resin-4.0.25/modules/resin/src/manifest
--- resin-4.0.25.vanilla/modules/resin/src/manifest	2012-02-11 19:37:26.777002897 +0100
+++ resin-4.0.25/modules/resin/src/manifest	2012-02-11 19:39:25.761756699 +0100
@@ -1,4 +1,4 @@
-Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar
+Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar resin-servlet-api.jar
 Implementation-Vendor: Caucho Technology, Inc.
 Implementation-Version: 4.0.25
 J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclient.DeploymentFactoryImpl
diff -Nru resin-4.0.25.vanilla/modules/resin/src/manifest.in resin-4.0.25/modules/resin/src/manifest.in
--- resin-4.0.25.vanilla/modules/resin/src/manifest.in	2012-02-11 19:37:26.773002881 +0100
+++ resin-4.0.25/modules/resin/src/manifest.in	2012-02-11 19:39:25.813757034 +0100
@@ -1,4 +1,4 @@
-Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar
+Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar resin-servlet-api.jar
 Implementation-Vendor: Caucho Technology, Inc.
 Implementation-Version: @VERSION@
 J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclient.DeploymentFactoryImpl