Return-Path: 
 <derby-commits-return-391-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 82616 invoked from network); 5 Mar 2005 02:24:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 5 Mar 2005 02:24:21 -0000
Received: (qmail 15591 invoked by uid 500); 5 Mar 2005 02:24:21 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 15573 invoked by uid 500); 5 Mar 2005 02:24:21 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 15557 invoked by uid 500); 5 Mar 2005 02:24:20 -0000
Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org
Received: (qmail 15554 invoked by uid 99); 5 Mar 2005 02:24:20 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 04 Mar 2005 18:24:20 -0800
Received: (qmail 82596 invoked by uid 65534); 5 Mar 2005 02:24:19 -0000
Message-ID: <20050305022419.82591.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Sat, 05 Mar 2005 02:24:18 -0000
Subject: svn commit: r156219 - in incubator/derby/code/trunk: build.xml
 java/drda/org/apache/derby/drda/build.xml
 tools/ant/properties/compilepath.properties
 tools/ant/properties/extrapath.properties
 tools/java/geronimo-spec-jta-1.0.1B-rc4.jar
 tools/java/geronimo-spec-servlet-2.4-rc4.jar
To: derby-cvs@incubator.apache.org
From: jboynes@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: jboynes
Date: Fri Mar  4 18:24:16 2005
New Revision: 156219

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D156219
Log:
use spec jars from Geronimo so users don't need downloads from Sun

Added:
    incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar =
  (with props)
    incubator/derby/code/trunk/tools/java/geronimo-spec-servlet-2.4-rc4.jar=
   (with props)
Modified:
    incubator/derby/code/trunk/build.xml
    incubator/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml
    incubator/derby/code/trunk/tools/ant/properties/compilepath.properties
    incubator/derby/code/trunk/tools/ant/properties/extrapath.properties

Modified: incubator/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/build.xml?vie=
w=3Ddiff&r1=3D156218&r2=3D156219
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/derby/code/trunk/build.xml (original)
+++ incubator/derby/code/trunk/build.xml Fri Mar  4 18:24:16 2005
@@ -506,7 +506,7 @@
     </copy>
=20
     <javadoc sourcepath=3D"${out.javadoc.dir}/sourcedir"
-             classpath=3D"${compile.classpath};${osgi};${servlet22};${out.=
dir}"
+             classpath=3D"${compile.classpath};${osgi};${servlet24};${out.=
dir}"
              breakiterator=3D"true"
              destdir=3D"${out.javadoc.dir}/publishedapi"
              packagenames=3D"org.apache.derby.authentication,org.apache.de=
rby.drda,org.apache.derby.jdbc.io,org.apache.derby.jdbc,org.apache.derby.to=
ols"

Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/drda/build.=
xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org=
/apache/derby/drda/build.xml?view=3Ddiff&r1=3D156218&r2=3D156219
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml (o=
riginal)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml Fr=
i Mar  4 18:24:16 2005
@@ -52,7 +52,7 @@
       srcdir=3D"${derby.drda.src.dir}"
       destdir=3D"${out.dir}">
       <classpath>
-	 	<pathelement location=3D"${servlet22}"/>
+	 	<pathelement location=3D"${servlet24}"/>
         <pathelement path=3D"${compile.classpath}"/>
       </classpath>
 	  <include name=3D"${derby.dir}/drda/NetServlet.java"/>
@@ -60,7 +60,7 @@
   </target>
=20
   <target name=3D"checkservletjar">
-    <available property=3D"servletjar.available" file=3D"${servlet22}"/>
+    <available property=3D"servletjar.available" file=3D"${servlet24}"/>
   </target>
=20
 </project>

Modified: incubator/derby/code/trunk/tools/ant/properties/compilepath.prope=
rties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/tools/ant/pro=
perties/compilepath.properties?view=3Ddiff&r1=3D156218&r2=3D156219
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/derby/code/trunk/tools/ant/properties/compilepath.properties =
(original)
+++ incubator/derby/code/trunk/tools/ant/properties/compilepath.properties =
Fri Mar  4 18:24:16 2005
@@ -12,7 +12,7 @@
=20
 java13compile.classpath=3D${j13lib}/rt.jar;${javatools.dir}/jdbc2_0-stdext=
.jar
=20
-jta1_2=3D${javatools.dir}/jta-1_0_1B-classes.zip
+jta1_2=3D${javatools.dir}/geronimo-spec-jta-1.0.1B-rc4.jar
 jce1_2_1=3D${javatools.dir}/jce1_2_2.jar
=20
 # Java2 1.4 paths - for JDBC 3.0/JDK1.4

Modified: incubator/derby/code/trunk/tools/ant/properties/extrapath.propert=
ies
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/tools/ant/pro=
perties/extrapath.properties?view=3Ddiff&r1=3D156218&r2=3D156219
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/derby/code/trunk/tools/ant/properties/extrapath.properties (o=
riginal)
+++ incubator/derby/code/trunk/tools/ant/properties/extrapath.properties Fr=
i Mar  4 18:24:16 2005
@@ -3,7 +3,7 @@
 #
 jndi=3D${javatools.dir}/jndi/jndi.jar;${javatools.dir}/jndi/providerutil.j=
ar;${javatools.dir}/jndi/ldap.jar
 oro=3D${javatools.dir}/jakarta-oro-2.0.8.jar
-servlet22=3D${javatools.dir}/servlet.jar
+servlet24=3D${javatools.dir}/geronimo-spec-servlet-2.4-rc4.jar
 jcc=3D${javatools.dir}/db2jcc.jar
 jcc_l=3D${javatools.dir}/db2jcc_license_c.jar
 osgi=3D${javatools.dir}/osgi.jar
@@ -19,4 +19,4 @@
 #
 # Run-time extras
 #
-jars.extras=3D${jndi};${oro};${servlet22};${jcc};${jcc_l}
+jars.extras=3D${jndi};${oro};${servlet24};${jcc};${jcc_l}

Added: incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.j=
ar
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/tools/java/ge=
ronimo-spec-jta-1.0.1B-rc4.jar?view=3Dauto&rev=3D156219
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.

Propchange: incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-=
rc4.jar
---------------------------------------------------------------------------=
---
    svn:mime-type =3D application/octet-stream

Added: incubator/derby/code/trunk/tools/java/geronimo-spec-servlet-2.4-rc4.=
jar
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/tools/java/ge=
ronimo-spec-servlet-2.4-rc4.jar?view=3Dauto&rev=3D156219
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.

Propchange: incubator/derby/code/trunk/tools/java/geronimo-spec-servlet-2.4=
-rc4.jar
---------------------------------------------------------------------------=
---
    svn:mime-type =3D application/octet-stream