db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
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
Date Sat, 05 Mar 2005 02:24:18 GMT
Author: jboynes
Date: Fri Mar  4 18:24:16 2005
New Revision: 156219

URL: http://svn.apache.org/viewcvs?view=rev&rev=156219
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?view=diff&r1=156218&r2=156219
==============================================================================
--- 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>
 
     <javadoc sourcepath="${out.javadoc.dir}/sourcedir"
-             classpath="${compile.classpath};${osgi};${servlet22};${out.dir}"
+             classpath="${compile.classpath};${osgi};${servlet24};${out.dir}"
              breakiterator="true"
              destdir="${out.javadoc.dir}/publishedapi"
              packagenames="org.apache.derby.authentication,org.apache.derby.drda,org.apache.derby.jdbc.io,org.apache.derby.jdbc,org.apache.derby.tools"

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=diff&r1=156218&r2=156219
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml Fri Mar  4 18:24:16
2005
@@ -52,7 +52,7 @@
       srcdir="${derby.drda.src.dir}"
       destdir="${out.dir}">
       <classpath>
-	 	<pathelement location="${servlet22}"/>
+	 	<pathelement location="${servlet24}"/>
         <pathelement path="${compile.classpath}"/>
       </classpath>
 	  <include name="${derby.dir}/drda/NetServlet.java"/>
@@ -60,7 +60,7 @@
   </target>
 
   <target name="checkservletjar">
-    <available property="servletjar.available" file="${servlet22}"/>
+    <available property="servletjar.available" file="${servlet24}"/>
   </target>
 
 </project>

Modified: incubator/derby/code/trunk/tools/ant/properties/compilepath.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/tools/ant/properties/compilepath.properties?view=diff&r1=156218&r2=156219
==============================================================================
--- 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 @@
 
 java13compile.classpath=${j13lib}/rt.jar;${javatools.dir}/jdbc2_0-stdext.jar
 
-jta1_2=${javatools.dir}/jta-1_0_1B-classes.zip
+jta1_2=${javatools.dir}/geronimo-spec-jta-1.0.1B-rc4.jar
 jce1_2_1=${javatools.dir}/jce1_2_2.jar
 
 # Java2 1.4 paths - for JDBC 3.0/JDK1.4

Modified: incubator/derby/code/trunk/tools/ant/properties/extrapath.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/tools/ant/properties/extrapath.properties?view=diff&r1=156218&r2=156219
==============================================================================
--- incubator/derby/code/trunk/tools/ant/properties/extrapath.properties (original)
+++ incubator/derby/code/trunk/tools/ant/properties/extrapath.properties Fri Mar  4 18:24:16
2005
@@ -3,7 +3,7 @@
 #
 jndi=${javatools.dir}/jndi/jndi.jar;${javatools.dir}/jndi/providerutil.jar;${javatools.dir}/jndi/ldap.jar
 oro=${javatools.dir}/jakarta-oro-2.0.8.jar
-servlet22=${javatools.dir}/servlet.jar
+servlet24=${javatools.dir}/geronimo-spec-servlet-2.4-rc4.jar
 jcc=${javatools.dir}/db2jcc.jar
 jcc_l=${javatools.dir}/db2jcc_license_c.jar
 osgi=${javatools.dir}/osgi.jar
@@ -19,4 +19,4 @@
 #
 # Run-time extras
 #
-jars.extras=${jndi};${oro};${servlet22};${jcc};${jcc_l}
+jars.extras=${jndi};${oro};${servlet24};${jcc};${jcc_l}

Added: incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar?view=auto&rev=156219
==============================================================================
Binary file - no diff available.

Propchange: incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar
------------------------------------------------------------------------------
    svn:mime-type = 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/geronimo-spec-servlet-2.4-rc4.jar?view=auto&rev=156219
==============================================================================
Binary file - no diff available.

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



Mime
View raw message