From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-72405-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1K6BEH-0000lX-R4
	for garchives@archives.gentoo.org; Tue, 10 Jun 2008 21:18:10 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 74D48E04ED;
	Tue, 10 Jun 2008 21:18:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id ED662E04EB
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Jun 2008 21:18:08 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 623D56663B
	for <gentoo-commits@lists.gentoo.org>; Tue, 10 Jun 2008 21:18:08 +0000 (UTC)
Received: from nelchael by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <nelchael@gentoo.org>)
	id 1K6BEA-0002li-VL
	for gentoo-commits@lists.gentoo.org; Tue, 10 Jun 2008 21:18:03 +0000
From: "Krzysiek 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/3.1.4: mod_caucho-3.1.4-gentoo.patch mod_caucho-3.1.4-java.patch mod_caucho-3.1.4-ssl.patch resin-3.1.4-Makefile.in.patch resin-3.1.4-build.xml.patch
X-VCS-Repository: gentoo
X-VCS-Files: mod_caucho-3.1.4-gentoo.patch mod_caucho-3.1.4-java.patch mod_caucho-3.1.4-ssl.patch resin-3.1.4-Makefile.in.patch resin-3.1.4-build.xml.patch
X-VCS-Directories: src/patchsets/resin/3.1.4
X-VCS-Committer: nelchael
X-VCS-Committer-Name: Krzysiek Pawlik
Content-Type: text/plain; charset=utf8
Message-Id: <E1K6BEA-0002li-VL@stork.gentoo.org>
Sender: Krzysiek Pawlik <nelchael@stork.gentoo.org>
Date: Tue, 10 Jun 2008 21:18:02 +0000
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: a9e392e1-66c8-4202-98cd-594210593c73
X-Archives-Hash: 5c5e975132cf16fc6715b015b4c83339

nelchael    08/06/10 21:18:02

  Added:                mod_caucho-3.1.4-gentoo.patch
                        mod_caucho-3.1.4-java.patch
                        mod_caucho-3.1.4-ssl.patch
                        resin-3.1.4-Makefile.in.patch
                        resin-3.1.4-build.xml.patch
  Log:
  Add patches for resin.

Revision  Changes    Path
1.1                  src/patchsets/resin/3.1.4/mod_caucho-3.1.4-gentoo.pa=
tch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/mod_caucho-3.1.4-gentoo.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/mod_caucho-3.1.4-gentoo.patch?rev=3D1.1&content-type=3Dtext/plain

Index: mod_caucho-3.1.4-gentoo.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-3.1.1.vanilla/modules/c/src/apache2/Makefile.in resin-3.1=
.1/modules/c/src/apache2/Makefile.in
--- resin-3.1.1.vanilla/modules/c/src/apache2/Makefile.in	2006-12-26 02:4=
4:02.000000000 +0100
+++ resin-3.1.1/modules/c/src/apache2/Makefile.in	2006-12-26 02:46:14.000=
000000 +0100
@@ -36,11 +36,8 @@
 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
=20
 install	: mod_caucho.la
-	$(LIBTOOL) --mode=3Dinstall $(CP) mod_caucho.la $(apache_libexec)
-	- rm -f $(apache_libexec)/mod_caucho.la
-	- rm -f $(apache_libexec)/mod_caucho.a
-	sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
-	   -resin_home $(resin_home)
+	mkdir -p $(DESTDIR)$(apache_libexec)
+	$(LIBTOOL) --mode=3Dinstall $(CP) mod_caucho.la $(DESTDIR)$(apache_libe=
xec)
=20
 clean	:
 	- rm -r *.o *.lo *.la *.so .libs



1.1                  src/patchsets/resin/3.1.4/mod_caucho-3.1.4-java.patc=
h

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/mod_caucho-3.1.4-java.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/mod_caucho-3.1.4-java.patch?rev=3D1.1&content-type=3Dtext/plain

Index: mod_caucho-3.1.4-java.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-3.1.2.vanilla/configure.in resin-3.1.2/configure.in
--- resin-3.1.2.vanilla/configure.in	2007-08-17 10:14:28.000000000 +0200
+++ resin-3.1.2/configure.in	2007-08-17 10:14:59.000000000 +0200
@@ -442,54 +442,6 @@
   fi
 fi
 #
-# --with-java-home
-#
-AC_ARG_WITH(java-home,
-[  --with-java-home=3DDIR  java home
-], [
-JAVA_HOME=3D${withval}
-])
-
-if test -z "$JAVA_HOME"; then
-  java=3D`which java 2>/dev/null`
-  if test $? =3D "0"; then
-    while test -h "$java"
-    do
-      head=3D`dirname $java`
-      tail=3D`/bin/ls -l $java | awk '{ print $NF; }'`
-      if test -f "$tail"; then
-        java=3D$tail
-      else
-        java=3D$head/$tail
-      fi
-    done
-
-    javabin=3D`dirname $java`
-    JAVA_HOME=3D`cd $javabin/..; pwd`
-
-    # we're in $JAVA_HOME/jre
-    if test -f "$JAVA_HOME/lib/rt.jar"; then
-      JAVA_HOME=3D`cd $JAVA_HOME/..; pwd`
-    elif test -d "/usr/java"; then
-      JAVA_HOME=3D/usr/java
-    elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
-      JAVA_HOME=3D"/System/Library/Frameworks/JavaVM.framework"
-    fi
-  elif test -d "/usr/java"; then
-    JAVA_HOME=3D/usr/java
-  elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
-    JAVA_HOME=3D"/System/Library/Frameworks/JavaVM.framework"
-  fi
-fi
-
-echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
-
-if test ! -d "$JAVA_HOME"; then
-  AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}])
-fi
-
-AC_SUBST(JAVA_HOME)
-#
 # Resin home
 #
 resin_home=3D`pwd`
@@ -814,72 +766,6 @@
 AC_SUBST(SSL_LIBS)
=20
 #
-# --with-jni-include
-#
-AC_ARG_WITH(jni-include,
-[  --with-jni-include=3D"-Idir -Idir"  jni include string
-], [
-JNI_INCLUDE=3D${withval}
-JNI=3D"yes"
-])
-
-#
-# --enable-jni
-#
-AC_ARG_ENABLE(jni,
-[  --enable-jni    Turn on jni],
-[case "${enableval}" in
- yes) JNI=3Dtrue ;;
- no)  JNI=3D"" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;;
- esac],[JNI=3D""])
-
-if test -n "$JNI_INCLUDE"; then
-  JNI=3Dyes
-elif test -r "$JAVA_HOME/include/jni_md.h"; then
-  JNI_INCLUDE=3D"-I$JAVA_HOME/include"
-  JNI=3Dyes
-  echo "checking for JNI in $JAVA_HOME/include ... found"
-elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
-  JNI_INCLUDE=3D"-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
-  JNI=3Dyes
-  echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
-elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md=
.h"; then
-  # Darwin
-  echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/=
Headers ... found"
-  JNI_INCLUDE=3D"-I/System/Library/Frameworks/JavaVM.framework/Headers"
-  JNI=3Dyes
-elif test -r "$JAVA_HOME/include/jni.h"; then
-  JNI_INCLUDE=3D"-I$JAVA_HOME/include"
-  JNI=3Dyes
-  echo "checking for JNI in $JAVA_HOME/include ... found"
-else
-  JNI=3D""
-  AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os])
-fi
-
-if test -r "$JAVA_HOME/include/jvmti.h"; then
-  echo "Using JVMTI for class reloading"
- =20
-  CFLAGS=3D"$CFLAGS -DHAS_JVMTI"
-fi
-
-if test -r "$JAVA_HOME/include/jvmdi.h"; then
-  echo "Using JVMDI for class reloading"
- =20
-  CFLAGS=3D"$CFLAGS -DHAS_JVMDI"
-fi
-=09
-if test -n "$JNI"; then
-  plugins=3D"$plugins $resin_plugin resin_os"
-else =20
-  echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
-fi
-
-AC_SUBST(JNI)
-AC_SUBST(JNI_INCLUDE)
-=09
-#
 # --enable-ssl
 #
 AC_ARG_ENABLE(ssl,



1.1                  src/patchsets/resin/3.1.4/mod_caucho-3.1.4-ssl.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/mod_caucho-3.1.4-ssl.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/mod_caucho-3.1.4-ssl.patch?rev=3D1.1&content-type=3Dtext/plain

Index: mod_caucho-3.1.4-ssl.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-3.1.1.vanilla/modules/c/src/apache2/mod_caucho.c resin-3.=
1.1/modules/c/src/apache2/mod_caucho.c
--- resin-3.1.1.vanilla/modules/c/src/apache2/mod_caucho.c	2007-04-13 15:=
41:18.000000000 +0200
+++ resin-3.1.1/modules/c/src/apache2/mod_caucho.c	2007-04-13 16:00:24.00=
0000000 +0200
@@ -582,6 +582,16 @@
     }
   }
 #endif =20
+  /* Add SSL Client certificate: (requires SSLOptions +StdEnvVars) */
+  {
+    int i;
+    char **env =3D (char **)ap_create_environment(r->pool, r->subprocess=
_env);
+    for (i =3D 0; env[i]; ++i) {
+      char *name =3D strsep(&(env[i]), "=3D");
+	  if (strncmp(name, "SSL_CLIENT_CERT", 16) =3D=3D 0)
+		  cse_write_string(s, CSE_CLIENT_CERT, env[i]);
+    }
+  }
 }
=20
 /**



1.1                  src/patchsets/resin/3.1.4/resin-3.1.4-Makefile.in.pa=
tch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/resin-3.1.4-Makefile.in.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/resin-3.1.4-Makefile.in.patch?rev=3D1.1&content-type=3Dtext/plain

Index: resin-3.1.4-Makefile.in.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-3.1.4.vanilla/Makefile.in resin-3.1.3/Makefile.in
--- resin-3.1.4.vanilla/Makefile.in	2007-11-09 14:59:07.000000000 +0100
+++ resin-3.1.4/Makefile.in	2007-11-09 15:00:28.000000000 +0100
@@ -9,20 +9,20 @@
=20
 install	:
 	(cd modules/c/src; $(MAKE) install)
-	if test $(PREFIX) !=3D `pwd`; then \
-	  mkdir -p $(PREFIX)/lib; \
-	  mkdir -p $(PREFIX)/$(LIBEXEC); \
-	  cp -r $(LIBEXEC)/* $(PREFIX)/$(LIBEXEC); \
-	  cp lib/*.jar $(PREFIX)/lib; \
-	  mkdir -p $(PREFIX)/bin; \
-	  cp bin/* $(PREFIX)/bin; \
-	  mkdir -p $(PREFIX)/webapps; \
-	  cp -r webapps/* $(PREFIX)/webapps; \
-	  mkdir -p $(PREFIX)/conf; \
-	  cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
-	  cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
-	  if test ! -r $(PREFIX)/conf/resin.conf; then \
-	    cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
-	    cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
+	if test $(DESTDIR)/$(PREFIX) !=3D `pwd`; then \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/lib; \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/$(LIBEXEC); \
+	  cp -r $(LIBEXEC)/* $(DESTDIR)/$(PREFIX)/$(LIBEXEC); \
+	  cp lib/*.jar $(DESTDIR)/$(PREFIX)/lib; \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/bin; \
+	  cp bin/* $(DESTDIR)/$(PREFIX)/bin; \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/webapps; \
+	  cp -r webapps/* $(DESTDIR)/$(PREFIX)/webapps; \
+	  mkdir -p $(DESTDIR)/$(PREFIX)/conf; \
+	  cp conf/resin.conf $(DESTDIR)/$(PREFIX)/conf/resin.conf.orig; \
+	  cp conf/app-default.xml $(DESTDIR)/$(PREFIX)/conf/app-default.xml.ori=
g; \
+	  if test ! -r $(DESTDIR)/$(PREFIX)/conf/resin.conf; then \
+	    cp conf/resin.conf $(DESTDIR)/$(PREFIX)/conf/resin.conf; \
+	    cp conf/app-default.xml $(DESTDIR)/$(PREFIX)/conf/app-default.xml; =
\
 	  fi; \
 	fi



1.1                  src/patchsets/resin/3.1.4/resin-3.1.4-build.xml.patc=
h

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/resin-3.1.4-build.xml.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.=
1.4/resin-3.1.4-build.xml.patch?rev=3D1.1&content-type=3Dtext/plain

Index: resin-3.1.4-build.xml.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-3.1.4.vanilla/build.xml resin-3.1.4/build.xml
--- resin-3.1.4.vanilla/build.xml	2007-12-14 17:02:33.000000000 +0100
+++ resin-3.1.4/build.xml	2007-12-14 17:03:03.000000000 +0100
@@ -7,7 +7,6 @@
=20
   <property name=3D"modules" location=3D"${basedir}/modules"/>
   <property name=3D"src" location=3D"${basedir}/src"/>
-  <property name=3D"ext" location=3D"${basedir}/modules/ext"/>
   <property name=3D"doc" location=3D"${basedir}/doc"/>
=20
   <property name=3D"build" location=3D"${install}/build"/>
@@ -17,14 +16,12 @@
=20
=20
   <property name=3D"javac.verbose" value=3D"off"/>
-  <property name=3D"javac.debug" value=3D"on"/>
+  <property name=3D"javac.debug" value=3D"off"/>
   <property name=3D"javac.optimize" value=3D"off"/>
   <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"jar.compress" value=3D"false"/>
   <!--
   <property name=3D"jar.index" value=3D"true"/>
@@ -83,14 +80,13 @@
   </target>
=20
   <target name=3D"compile"=20
-          depends=3D"init, hessian, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-=
management, jca, jms, jsdk, jstl, jsf, jta, portlet, script, resin-util, =
quercus, resin, ecmascript, webbeans, webutil, deploy, conf, ext">
+          depends=3D"init, hessian, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-=
management, jca, jms, jstl, jsf, jta, portlet, script, resin-util, quercu=
s, resin, ecmascript, webbeans, webutil, deploy, conf">
   </target>
=20
   <target name=3D"ant" depends=3D"init">
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"ant"/>
       <param name=3D"module.jar" value=3D"resin-ant.jar"/>
-      <param name=3D"javac.source" value=3D"1.5"/>
     </antcall>
   </target>
=20
@@ -98,7 +94,6 @@
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"ejb"/>
       <param name=3D"module.jar" value=3D"ejb-15.jar"/>
-      <param name=3D"javac.source" value=3D"1.5"/>
     </antcall>
   </target>
=20
@@ -106,11 +101,10 @@
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"jpa"/>
       <param name=3D"module.jar" value=3D"jpa-15.jar"/>
-      <param name=3D"javac.source" value=3D"1.5"/>
     </antcall>
   </target>
=20
-  <target name=3D"hessian" depends=3D"init, jsdk">
+  <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"/>
@@ -132,11 +126,10 @@
     </antcall>
   </target>
=20
-  <target name=3D"jaxrpc" depends=3D"init,saaj,jsdk">
+  <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"/>
-      <param name=3D"javac.source" value=3D"1.5"/>
     </antcall>
   </target>
=20
@@ -175,7 +168,7 @@
     </antcall>
   </target>
=20
-  <target name=3D"jstl" depends=3D"init, jsdk">
+  <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"/>
@@ -267,13 +260,12 @@
     </copy>
   </target>
=20
-  <target name=3D"resin-dev" depends=3D"init, ejb, hessian, jca, jcr, jm=
s, jsdk, jstl, jsf, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, port=
let, script, resin-util, webbeans, version">
+  <target name=3D"resin-dev" depends=3D"init, ejb, hessian, jca, jcr, jm=
s, jstl, jsf, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, s=
cript, resin-util, webbeans, version">
=20
     <!-- build module -->
=20
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"resin"/>
-      <param name=3D"javac.source" value=3D"1.5"/>
     </antcall>
   </target>
  =20
@@ -298,14 +290,12 @@
   <target name=3D"webutil" depends=3D"init, resin">
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"webutil"/>
-      <param name=3D"javac.source" value=3D"1.5"/>
     </antcall>
   </target>
=20
   <target name=3D"quercus-dev" depends=3D"init">
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"quercus"/>
-      <param name=3D"javac.source" value=3D"1.5"/>
     </antcall>
   </target>
=20
@@ -314,7 +304,6 @@
   <target name=3D"ecmascript" depends=3D"init">
     <antcall target=3D"module" inheritRefs=3D"true">
       <param name=3D"module.name" value=3D"ecmascript"/>
-      <param name=3D"javac.source" value=3D"1.5"/>
     </antcall>
   </target>
=20
@@ -347,16 +336,15 @@
            verbose=3D"${javac.verbose}"=20
            debug=3D"${javac.debug}" optimize=3D"${javac.optimize}"
            deprecation=3D"${javac.deprecation}" nowarn=3D"${javac.nowarn=
}"
-           source=3D"${javac.source}"
            excludes=3D"**/.svn/**"
            memoryMaximumSize=3D"${javac.memoryMaximumSize}">
       <classpath>
         <dirset dir=3D"${modules}">
           <include name=3D"*/classes"/>
        </dirset>
-        <fileset dir=3D"${ext}">
-          <include name=3D"**/*.jar"/>
-        </fileset>
+       <fileset dir=3D"lib/">
+           <include name=3D"*.jar"/>
+       </fileset>
       </classpath>
     </javac>
=20
@@ -450,13 +438,6 @@
     </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
@@ -559,9 +540,6 @@
           <dirset dir=3D"${modules}">
             <include name=3D"*/classes"/>
           </dirset>
-          <fileset dir=3D"${modules}/ext">
-            <include name=3D"**/*.jar"/>
-          </fileset>
         </classpath>
       </java>
=20
@@ -695,7 +673,6 @@
         <include name=3D"lib/j2ee-management-10.jar"/>
         <include name=3D"lib/jca-15.jar"/>
         <include name=3D"lib/jms-11.jar"/>
-        <include name=3D"lib/jsdk-15.jar"/>
         <include name=3D"lib/jsf-12.jar"/>
         <include name=3D"lib/jstl-11.jar"/>
         <include name=3D"lib/jta-101.jar"/>



--=20
gentoo-commits@lists.gentoo.org mailing list