[gentoo-commits] gentoo commit in src/patchsets/resin/4.0.9: resin-4.0.9-Makefile.patch resin-4.0.9-build.patch resin-4.0.9-classpath.patch

[Krzysztof Pawlik (nelchael)]

nelchael    10/08/19 15:56:13

  Added:                resin-4.0.9-Makefile.patch resin-4.0.9-build.patch
                        resin-4.0.9-classpath.patch
  Log:
  Add patches for Resin 4.0.9.

Revision  Changes    Path
1.1                  src/patchsets/resin/4.0.9/resin-4.0.9-Makefile.patch

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

Index: resin-4.0.9-Makefile.patch
===================================================================
diff -Nru resin-4.0.9.vanilla/Makefile.am resin-4.0.9/Makefile.am
--- resin-4.0.9.vanilla/Makefile.am	2010-08-19 17:44:20.150963763 +0200
+++ resin-4.0.9/Makefile.am	2010-08-19 17:47:36.938963766 +0200
@@ -20,34 +20,31 @@
 	- rm -r $(LIBEXEC)
 
 install	:
-	if test "$(resin_home)" != $(abs_builddir); then \
-	  mkdir -p $(resin_home)/bin; \
-	  mkdir -p $(resin_home)/keys; \
-	  mkdir -p $(resin_home)/licenses; \
-	  mkdir -p $(resin_home)/lib; \
-	  mkdir -p $(resin_home)/$(LIBEXEC); \
-	  cp bin/* $(resin_home)/bin; \
-	  cp lib/*.jar $(resin_home)/lib; \
+	if test "$(DESTDIR)/$(resin_home)" != $(abs_builddir); then \
+	  mkdir -p $(DESTDIR)/$(resin_home)/bin; \
+	  mkdir -p $(DESTDIR)/$(resin_home)/keys; \
+	  mkdir -p $(DESTDIR)/$(resin_home)/licenses; \
+	  mkdir -p $(DESTDIR)/$(resin_home)/lib; \
+	  mkdir -p $(DESTDIR)/$(resin_home)/$(LIBEXEC); \
+	  cp bin/* $(DESTDIR)/$(resin_home)/bin; \
+	  cp lib/*.jar $(DESTDIR)/$(resin_home)/lib; \
 	fi
-	if test "$(resin_root)" != $(abs_builddir); then \
-	  mkdir -p $(resin_root)/webapps; \
-	  cp -r $(CP_U_FLAG) webapps/* $(resin_root)/webapps; \
-	  mkdir -p $(resin_root)/doc; \
-	  cp -r $(CP_U_FLAG) doc/* $(resin_root)/doc; \
-	  mkdir -p $(resin_root)/project-jars; \
-	  cp -r $(CP_U_FLAG) project-jars/* $(resin_root)/project-jars; \
-	  mkdir -p $(resin_log); \
+	if test "$(DESTDIR)/$(resin_root)" != $(abs_builddir); then \
+	  mkdir -p $(DESTDIR)/$(resin_root)/webapps; \
+	  cp -r $(CP_U_FLAG) webapps/* $(DESTDIR)/$(resin_root)/webapps; \
+	  mkdir -p $(DESTDIR)/$(resin_root)/doc; \
+	  cp -r $(CP_U_FLAG) doc/* $(DESTDIR)/$(resin_root)/doc; \
+	  mkdir -p $(DESTDIR)/$(resin_root)/project-jars; \
+	  cp -r $(CP_U_FLAG) project-jars/* $(DESTDIR)/$(resin_root)/project-jars; \
+	  mkdir -p $(DESTDIR)/$(resin_log); \
 	fi
-	if test "$(resin_conf)" != $(abs_builddir)/conf; then \
-	  mkdir -p $(resin_conf); \
-	  cp $(CP_U_FLAG) conf/app-default.xml $(resin_conf)/app-default.xml; \
-	  cp $(CP_U_FLAG) conf/resin.xml $(resin_conf)/resin.xml; \
+	if test "$(DESTDIR)/$(resin_conf)" != $(abs_builddir)/conf; then \
+	  mkdir -p $(DESTDIR)/$(resin_conf); \
+	  cp $(CP_U_FLAG) conf/app-default.xml $(DESTDIR)/$(resin_conf)/app-default.xml; \
+	  cp $(CP_U_FLAG) conf/resin.xml $(DESTDIR)/$(resin_conf)/resin.xml; \
 	fi
 	(cd modules/c/src; $(MAKE) install)
-	if test -r $(resin_pro)/modules/c/src/Makefile; then \
-		(cd $(resin_pro)/modules/c/src; $(MAKE) install) \
-	fi
-	@ if test -n "$(resin_init_d)" -a "$(resin_home)" != $(abs_builddir); then \
+	@ if false && test -n "$(resin_init_d)" -a "$(resin_home)" != $(abs_builddir); then \
 		if test -f "${resin_init_d}"; then\
 			if test \( -w "${resin_init_d}" \) -o \( -w `dirname ${resin_init_d}` \); then \
 				cp $(CP_U_FLAG) $(abs_builddir)/init.d/resin $(resin_init_d); \
diff -Nru resin-4.0.9.vanilla/modules/c/src/resin_os/Makefile.in resin-4.0.9/modules/c/src/resin_os/Makefile.in
--- resin-4.0.9.vanilla/modules/c/src/resin_os/Makefile.in	2010-08-19 17:44:19.566963762 +0200
+++ resin-4.0.9/modules/c/src/resin_os/Makefile.in	2010-08-19 17:45:06.686963763 +0200
@@ -39,8 +39,8 @@
 
 install	: libresin_os.$(SO)
 #	cp resin $(resin_home)/bin
-	- mkdir -p $(resin_home)/$(LIBEXEC)
-	cp libresin_os.$(SO) $(resin_home)/$(LIBEXEC)
+	- mkdir -p $(DESTDIR)/$(resin_home)/$(LIBEXEC)
+	cp libresin_os.$(SO) $(DESTDIR)/$(resin_home)/$(LIBEXEC)
 
 
 



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

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

Index: resin-4.0.9-build.patch
===================================================================
diff -Nru resin-4.0.9.vanilla/build-common.xml resin-4.0.9/build-common.xml
--- resin-4.0.9.vanilla/build-common.xml	2010-08-19 17:44:18.786963764 +0200
+++ resin-4.0.9/build-common.xml	2010-08-19 17:48:47.450963763 +0200
@@ -37,15 +37,12 @@
   <property name="resin.dist" location="${resin.install}/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"/>
@@ -193,6 +190,9 @@
         <fileset dir="${maven.lib}">
           <include name="**/*.jar"/>
         </fileset>
+		<fileset dir="${basedir}/gentoo-deps">
+			<include name="**/*.jar"/>
+		</fileset>
       </classpath>
     </javac>
 
@@ -273,6 +273,9 @@
         <fileset dir="${maven.lib}">
           <include name="**/*.jar"/>
         </fileset>
+		<fileset dir="${basedir}/gentoo-deps">
+			<include name="**/*.jar"/>
+		</fileset>
       </classpath>
     </javac>
 
@@ -434,10 +437,6 @@
 
     <property file="${artifact.src}/module.properties"/>
 
-    <mkdir dir="${resin.dist}/${dist.name}/project-jars"/>
-    
-    <copy tofile="${resin.dist}/${dist.name}/project-jars/resin-${artifact.name}-${version}.jar"
-          file="${artifact.dist}/${artifact.jar}"/>
   </target>
 	  
   <target name="resin.dist.jar"
diff -Nru resin-4.0.9.vanilla/build.xml resin-4.0.9/build.xml
--- resin-4.0.9.vanilla/build.xml	2010-08-19 17:44:20.150963763 +0200
+++ resin-4.0.9/build.xml	2010-08-19 17:48:47.450963763 +0200
@@ -10,7 +10,7 @@
   <property name="debian.component" value="universe"/>
 
   <target name="compile" 
-          depends="init, hessian, javaee, jaxstream, jcache, portlet, script, resin-kernel, quercus, resin, ecmascript, inject, webutil, conf, ext, j2ee-management, j2ee-deploy">
+          depends="init, hessian, javaee, jaxstream, jcache, portlet, script, resin-kernel, quercus, resin, ecmascript, inject, webutil, conf, j2ee-management, j2ee-deploy">
   </target>
 
   <!--
@@ -197,7 +197,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"/>
@@ -221,7 +221,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"/>
@@ -268,13 +268,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">
@@ -285,7 +278,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"/>
@@ -384,7 +377,7 @@
     </antcall>
   </target>
   
-  <target name="resin-kernel" depends="init, inject, servlet16, version">
+  <target name="resin-kernel" depends="init, inject, version">
     <antcall target="module" inheritRefs="true">
       <param name="module.name" value="kernel"/>
       <param name="module.dist" value="${lib}"/>
@@ -496,7 +489,7 @@
     </copy>
   </target>
 
-  <target name="javaee" depends="ejb, jca, jms, jpa, servlet16, jcache, jstl, jta, jws, inject">
+  <target name="javaee" depends="ejb, jca, jms, jpa, jcache, jstl, jta, jws, inject">
     <!--
        - javaee-16.jar
       -->
@@ -539,10 +532,6 @@
         <exclude name="**/.*"/>
       </fileset>
       
-      <fileset dir="${resin.modules}/servlet16/classes">
-        <exclude name="**/.*"/>
-      </fileset>
-      
       <fileset dir="${resin.modules}/webbeans/classes">
         <exclude name="**/.*"/>
       </fileset>
@@ -683,20 +672,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}">
 
@@ -710,7 +691,6 @@
         <exclude name="**/.svnignore"/>
       </fileset>
     </jar>
-    -->
   </target>
 
   <target name="javadoc" depends="init">
@@ -732,7 +712,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.9/resin-4.0.9-classpath.patch

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

Index: resin-4.0.9-classpath.patch
===================================================================
diff -Nru resin-4.0.9.vanilla/modules/resin/src/boot-manifest resin-4.0.9/modules/resin/src/boot-manifest
--- resin-4.0.9.vanilla/modules/resin/src/boot-manifest	2010-08-19 17:44:18.810963762 +0200
+++ resin-4.0.9/modules/resin/src/boot-manifest	2010-08-19 17:50:04.030963761 +0200
@@ -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.9.vanilla/modules/resin/src/manifest resin-4.0.9/modules/resin/src/manifest
--- resin-4.0.9.vanilla/modules/resin/src/manifest	2010-08-19 17:44:19.522963762 +0200
+++ resin-4.0.9/modules/resin/src/manifest	2010-08-19 17:50:04.030963761 +0200
@@ -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.9
 J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclient.DeploymentFactoryImpl
diff -Nru resin-4.0.9.vanilla/modules/resin/src/manifest.in resin-4.0.9/modules/resin/src/manifest.in
--- resin-4.0.9.vanilla/modules/resin/src/manifest.in	2010-08-19 17:44:19.522963762 +0200
+++ resin-4.0.9/modules/resin/src/manifest.in	2010-08-19 17:50:04.030963762 +0200
@@ -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