* [gentoo-commits] gentoo commit in src/patchsets/resin/4.0.13: mod_caucho-4.0.13-no-jni.patch resin-4.0.13-build.patch resin-4.0.13-classpath.patch
@ 2010-12-12 13:47 Krzysztof Pawlik (nelchael)
0 siblings, 0 replies; only message in thread
From: Krzysztof Pawlik (nelchael) @ 2010-12-12 13:47 UTC (permalink / raw
To: gentoo-commits
nelchael 10/12/12 13:47:48
Added: mod_caucho-4.0.13-no-jni.patch
resin-4.0.13-build.patch
resin-4.0.13-classpath.patch
Log:
Add patches for Resin 4.0.13.
Revision Changes Path
1.1 src/patchsets/resin/4.0.13/mod_caucho-4.0.13-no-jni.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.13/mod_caucho-4.0.13-no-jni.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.13/mod_caucho-4.0.13-no-jni.patch?rev=1.1&content-type=text/plain
Index: mod_caucho-4.0.13-no-jni.patch
===================================================================
diff -Nru resin-4.0.13.vanilla/configure.ac resin-4.0.13/configure.ac
--- resin-4.0.13.vanilla/configure.ac 2010-12-12 12:18:03.216908371 +0100
+++ resin-4.0.13/configure.ac 2010-12-12 12:22:30.367266372 +0100
@@ -1072,11 +1072,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=""
@@ -1091,8 +1086,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.13/resin-4.0.13-build.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.13/resin-4.0.13-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.13/resin-4.0.13-build.patch?rev=1.1&content-type=text/plain
Index: resin-4.0.13-build.patch
===================================================================
diff -Nru resin-4.0.13.vanilla/build-common.xml resin-4.0.13/build-common.xml
--- resin-4.0.13.vanilla/build-common.xml 2010-12-12 12:18:02.197418371 +0100
+++ resin-4.0.13/build-common.xml 2010-12-12 14:05:48.818111131 +0100
@@ -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"/>
@@ -199,6 +196,9 @@
<fileset dir="${maven.lib}">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${basedir}/gentoo-deps">
+ <include name="**/*.jar"/>
+ </fileset>
</classpath>
</javac>
@@ -279,6 +279,9 @@
<fileset dir="${maven.lib}">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${basedir}/gentoo-deps">
+ <include name="**/*.jar"/>
+ </fileset>
</classpath>
</javac>
@@ -440,10 +443,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.13.vanilla/build.xml resin-4.0.13/build.xml
--- resin-4.0.13.vanilla/build.xml 2010-12-12 12:18:03.216908371 +0100
+++ resin-4.0.13/build.xml 2010-12-12 14:06:42.638111132 +0100
@@ -12,7 +12,7 @@
<property name="eclipse.home" value="${user.home}/eclipse"/>
<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>
<!--
@@ -275,7 +275,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"/>
@@ -299,7 +299,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"/>
@@ -347,13 +347,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">
@@ -364,7 +357,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"/>
@@ -463,7 +456,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}"/>
@@ -580,7 +573,7 @@
</copy>
</target>
- <target name="javaee" depends="ejb, jca, jms, jpa, servlet16, jcache, jstl, jta, inject">
+ <target name="javaee" depends="ejb, jca, jms, jpa, jcache, jstl, jta, inject">
<!--
- javaee-16.jar
-->
@@ -625,10 +618,6 @@
</fileset>
-->
- <fileset dir="${resin.modules}/servlet16/classes">
- <exclude name="**/.*"/>
- </fileset>
-
<fileset dir="${resin.modules}/webbeans/classes">
<exclude name="**/.*"/>
</fileset>
@@ -769,20 +758,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}">
@@ -796,7 +777,6 @@
<exclude name="**/.svnignore"/>
</fileset>
</jar>
- -->
</target>
<target name="javadoc" depends="init">
@@ -818,7 +798,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.13/resin-4.0.13-classpath.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.13/resin-4.0.13-classpath.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.13/resin-4.0.13-classpath.patch?rev=1.1&content-type=text/plain
Index: resin-4.0.13-classpath.patch
===================================================================
diff -Nru resin-4.0.13.vanilla/modules/resin/src/boot-manifest resin-4.0.13/modules/resin/src/boot-manifest
--- resin-4.0.13.vanilla/modules/resin/src/boot-manifest 2010-12-12 12:18:02.221406371 +0100
+++ resin-4.0.13/modules/resin/src/boot-manifest 2010-12-12 14:03:29.850111131 +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.13.vanilla/modules/resin/src/manifest resin-4.0.13/modules/resin/src/manifest
--- resin-4.0.13.vanilla/modules/resin/src/manifest 2010-12-12 12:18:02.609212371 +0100
+++ resin-4.0.13/modules/resin/src/manifest 2010-12-12 14:03:29.850111131 +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.13
J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclient.DeploymentFactoryImpl
diff -Nru resin-4.0.13.vanilla/modules/resin/src/manifest.in resin-4.0.13/modules/resin/src/manifest.in
--- resin-4.0.13.vanilla/modules/resin/src/manifest.in 2010-12-12 12:18:02.609212371 +0100
+++ resin-4.0.13/modules/resin/src/manifest.in 2010-12-12 14:03:29.854111131 +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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-12-12 13:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-12 13:47 [gentoo-commits] gentoo commit in src/patchsets/resin/4.0.13: mod_caucho-4.0.13-no-jni.patch resin-4.0.13-build.patch resin-4.0.13-classpath.patch Krzysztof Pawlik (nelchael)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox