From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-299757-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1PRmHN-0002za-VO
	for garchives@archives.gentoo.org; Sun, 12 Dec 2010 13:47:58 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 17DD4E0716;
	Sun, 12 Dec 2010 13:47:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id BC040E0716
	for <gentoo-commits@lists.gentoo.org>; Sun, 12 Dec 2010 13:47:50 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id EAA2A1B4016
	for <gentoo-commits@lists.gentoo.org>; Sun, 12 Dec 2010 13:47:49 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 996)
	id 71E4F20054; Sun, 12 Dec 2010 13:47:48 +0000 (UTC)
From: "Krzysztof Pawlik (nelchael)" <nelchael@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, nelchael@gentoo.org
Subject: [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
X-VCS-Repository: gentoo
X-VCS-Files: mod_caucho-4.0.13-no-jni.patch resin-4.0.13-build.patch resin-4.0.13-classpath.patch
X-VCS-Directories: src/patchsets/resin/4.0.13
X-VCS-Committer: nelchael
X-VCS-Committer-Name: Krzysztof Pawlik
Content-Type: text/plain; charset=utf8
Message-Id: <20101212134748.71E4F20054@flycatcher.gentoo.org>
Date: Sun, 12 Dec 2010 13:47:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: e5db7984-cb77-4108-9383-726f6f26e82c
X-Archives-Hash: 044cf8afa9b76d5d54a7c9763503f845

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=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.=
0.13/mod_caucho-4.0.13-no-jni.patch?rev=3D1.1&content-type=3Dtext/plain

Index: mod_caucho-4.0.13-no-jni.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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=3D""
-    AC_MSG_ERROR([
-
-    *** Can't find JNI directory in JAVA_HOME=3D${JAVA_HOME}
-    *** JNI is expected in ${JAVA_HOME}/include/$jni_os
-  ])
   fi
=20
   HAS_JVMTI=3D""
@@ -1091,8 +1086,6 @@
     echo "Using JVMTI for class reloading"
    =20
     CFLAGS=3D"$CFLAGS -DHAS_JVMTI"
-  else
-    AC_MSG_ERROR([Can't find JVMTI directory ${JNI_INCLUDE_DIR}/jvmti.h]=
)
   fi
 fi
=20



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=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.=
0.13/resin-4.0.13-build.patch?rev=3D1.1&content-type=3Dtext/plain

Index: resin-4.0.13-build.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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=3D"resin.dist" location=3D"${resin.install}/dist"/>
=20
   <property name=3D"javac.verbose" value=3D"off"/>
-  <property name=3D"javac.debug" value=3D"on"/>
-  <property name=3D"javac.optimize" value=3D"off"/>
+  <property name=3D"javac.debug" value=3D"off"/>
+  <property name=3D"javac.optimize" value=3D"on"/>
   <property name=3D"javac.deprecation" value=3D"off"/>
   <property name=3D"javac.nowarn" value=3D"on"/>
   <property name=3D"javac.memoryMaximumSize" value=3D"512m"/>
=20
-  <property name=3D"javac.source" value=3D"1.5"/>
-  <property name=3D"javac.target" value=3D"1.5"/>
-
   <property name=3D"jar.compress" value=3D"false"/>
   <!--
   <property name=3D"jar.index" value=3D"true"/>
@@ -199,6 +196,9 @@
         <fileset dir=3D"${maven.lib}">
           <include name=3D"**/*.jar"/>
         </fileset>
+		<fileset dir=3D"${basedir}/gentoo-deps">
+			<include name=3D"**/*.jar"/>
+		</fileset>
       </classpath>
     </javac>
=20
@@ -279,6 +279,9 @@
         <fileset dir=3D"${maven.lib}">
           <include name=3D"**/*.jar"/>
         </fileset>
+		<fileset dir=3D"${basedir}/gentoo-deps">
+			<include name=3D"**/*.jar"/>
+		</fileset>
       </classpath>
     </javac>
=20
@@ -440,10 +443,6 @@
=20
     <property file=3D"${artifact.src}/module.properties"/>
=20
-    <mkdir dir=3D"${resin.dist}/${dist.name}/project-jars"/>
-   =20
-    <copy tofile=3D"${resin.dist}/${dist.name}/project-jars/resin-${arti=
fact.name}-${version}.jar"
-          file=3D"${artifact.dist}/${artifact.jar}"/>
   </target>
 	 =20
   <target name=3D"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=3D"eclipse.home" value=3D"${user.home}/eclipse"/>
=20
   <target name=3D"compile"=20
-          depends=3D"init, hessian, javaee, jaxstream, jcache, portlet, =
script, resin-kernel, quercus, resin, ecmascript, inject, webutil, conf, =
ext, j2ee-management, j2ee-deploy">
+          depends=3D"init, hessian, javaee, jaxstream, jcache, portlet, =
script, resin-kernel, quercus, resin, ecmascript, inject, webutil, conf, =
j2ee-management, j2ee-deploy">
   </target>
=20
   <!--
@@ -275,7 +275,7 @@
     </antcall>
   </target>
=20
-  <target name=3D"hessian" depends=3D"init, servlet16">
+  <target name=3D"hessian" depends=3D"init">
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"hessian"/>
       <param name=3D"module.jar" value=3D"hessian.jar"/>
@@ -299,7 +299,7 @@
     </antcall>
   </target>
=20
-  <target name=3D"jaxrpc" depends=3D"init,saaj,servlet16">
+  <target name=3D"jaxrpc" depends=3D"init,saaj">
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"jaxrpc"/>
       <param name=3D"module.jar" value=3D"jaxrpc-15.jar"/>
@@ -347,13 +347,6 @@
     </antcall>
   </target>
=20
-  <target name=3D"servlet16" depends=3D"init">
-    <antcall target=3D"module" inheritRefs=3D"true">
-      <param name=3D"module.name" value=3D"servlet16"/>
-      <param name=3D"module.jar" value=3D"servlet-16.jar"/>
-    </antcall>
-  </target>
-
   <!--
     We now ship Sun's jsf-api.jar and jsf-impl.jar in modules/ext/
   <target name=3D"jsf" depends=3D"init">
@@ -364,7 +357,7 @@
     </antcall>
   </target-->
=20
-  <target name=3D"jstl" depends=3D"init, servlet16">
+  <target name=3D"jstl" depends=3D"init">
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"jstl"/>
       <param name=3D"module.jar" value=3D"jstl-11.jar"/>
@@ -463,7 +456,7 @@
     </antcall>
   </target>
  =20
-  <target name=3D"resin-kernel" depends=3D"init, inject, servlet16, vers=
ion">
+  <target name=3D"resin-kernel" depends=3D"init, inject, version">
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"kernel"/>
       <param name=3D"module.dist" value=3D"${lib}"/>
@@ -580,7 +573,7 @@
     </copy>
   </target>
=20
-  <target name=3D"javaee" depends=3D"ejb, jca, jms, jpa, servlet16, jcac=
he, jstl, jta, inject">
+  <target name=3D"javaee" depends=3D"ejb, jca, jms, jpa, jcache, jstl, j=
ta, inject">
     <!--
        - javaee-16.jar
       -->
@@ -625,10 +618,6 @@
       </fileset>
       -->
      =20
-      <fileset dir=3D"${resin.modules}/servlet16/classes">
-        <exclude name=3D"**/.*"/>
-      </fileset>
-     =20
       <fileset dir=3D"${resin.modules}/webbeans/classes">
         <exclude name=3D"**/.*"/>
       </fileset>
@@ -769,20 +758,12 @@
     </copy>
   </target>
=20
-  <target name=3D"ext" depends=3D"init, resin">
-    <copy todir=3D"${install}/lib" preservelastmodified=3D"true">
-      <fileset dir=3D"${ext}">
-      </fileset>
-    </copy>
-  </target>
-
   <target name=3D"webapps" depends=3D"init, doc, quercus">
   </target>
=20
   <target name=3D"doc" depends=3D"init">
     <mkdir dir=3D"${install}/webapps"/>
=20
-    <!--
     <jar jarfile=3D"${install}/webapps/resin-doc.war"
          compress=3D"true" index=3D"${jar.index}" update=3D"${jar.update=
}">
=20
@@ -796,7 +777,6 @@
         <exclude name=3D"**/.svnignore"/>
       </fileset>
     </jar>
-    -->
   </target>
=20
   <target name=3D"javadoc" depends=3D"init">
@@ -818,7 +798,6 @@
=20
       <packageset dir=3D"${modules}/ejb/src"/>
       <packageset dir=3D"${modules}/hessian/src"/>
-      <packageset dir=3D"${modules}/servlet16/src"/>
       <packageset dir=3D"${modules}/jcache/src"/>
       <packageset dir=3D"${modules}/jpa/src"/>
       <packageset dir=3D"${modules}/jaxstream/src"/>



1.1                  src/patchsets/resin/4.0.13/resin-4.0.13-classpath.pa=
tch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.=
0.13/resin-4.0.13-classpath.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.=
0.13/resin-4.0.13-classpath.patch?rev=3D1.1&content-type=3Dtext/plain

Index: resin-4.0.13-classpath.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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.8501=
11131 +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 jc=
a-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/mo=
dules/resin/src/manifest
--- resin-4.0.13.vanilla/modules/resin/src/manifest	2010-12-12 12:18:02.6=
09212371 +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-serv=
let-api.jar
 Implementation-Vendor: Caucho Technology, Inc.
 Implementation-Version: 4.0.13
 J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclien=
t.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:0=
2.609212371 +0100
+++ resin-4.0.13/modules/resin/src/manifest.in	2010-12-12 14:03:29.854111=
131 +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-serv=
let-api.jar
 Implementation-Vendor: Caucho Technology, Inc.
 Implementation-Version: @VERSION@
 J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclien=
t.DeploymentFactoryImpl