db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r164295 - in /incubator/derby/code/branches/10.0: ./ java/drda/org/apache/derby/drda/ tools/ant/properties/ tools/java/
Date Fri, 22 Apr 2005 22:55:57 GMT
Author: fuzzylogic
Date: Fri Apr 22 15:55:55 2005
New Revision: 164295

URL: http://svn.apache.org/viewcvs?rev=164295&view=rev
Log:
Add spec jars and javacc/jakarta-oro so that users do not need to download them.
Merges revisions 156215, 156219, 156228, 157009 to 10.0

Also, applies patch for DERBY-196 from John Sisson <sissonj@insession.com>

Added:
    incubator/derby/code/branches/10.0/tools/java/empty.jar   (props changed)
      - copied unchanged from r156234, incubator/derby/code/trunk/tools/java/empty.jar
    incubator/derby/code/branches/10.0/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar   (props
changed)
      - copied unchanged from r156219, incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar
    incubator/derby/code/branches/10.0/tools/java/geronimo-spec-servlet-2.4-rc4.jar   (props
changed)
      - copied unchanged from r156219, incubator/derby/code/trunk/tools/java/geronimo-spec-servlet-2.4-rc4.jar
    incubator/derby/code/branches/10.0/tools/java/jakarta-oro-2.0.8.jar   (props changed)
      - copied unchanged from r156215, incubator/derby/code/trunk/tools/java/jakarta-oro-2.0.8.jar
    incubator/derby/code/branches/10.0/tools/java/javacc.jar   (props changed)
      - copied unchanged from r156215, incubator/derby/code/trunk/tools/java/javacc.jar
Modified:
    incubator/derby/code/branches/10.0/BUILDING.txt
    incubator/derby/code/branches/10.0/build.xml
    incubator/derby/code/branches/10.0/java/drda/org/apache/derby/drda/build.xml
    incubator/derby/code/branches/10.0/tools/ant/properties/compilepath.properties
    incubator/derby/code/branches/10.0/tools/ant/properties/extrapath.properties
    incubator/derby/code/branches/10.0/tools/java/   (props changed)

Modified: incubator/derby/code/branches/10.0/BUILDING.txt
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/BUILDING.txt?rev=164295&r1=164294&r2=164295&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/BUILDING.txt (original)
+++ incubator/derby/code/branches/10.0/BUILDING.txt Fri Apr 22 15:55:55 2005
@@ -15,11 +15,8 @@
 2.2.2 Download and install Java Development Kit release 1.4.x
 2.2.3 Download and install Java Development Kit release 1.3.x
 2.2.4 Download extensions for Java Development Kit release 1.3.x
-2.2.5 Download Java Compiler Compiler (JavaCC) version 3.1
-2.2.6 Download jakarta-servlet API 4 (Servlet 2.4)
-2.2.7 Download Jakarta-ORO 2.0.8
-2.2.8 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
-2.2.9 Download Jikes 1.14 (Optional)
+2.2.5 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+2.2.6 Download Jikes 1.14 (Optional)
 
 3     Build instructions
 3.1   Set required environmental variables
@@ -173,17 +170,7 @@
       ${derby.source}/tools/java 
 
 
-(2) Java Transaction API (JTA) 1.0.1B
-
-    Download JTA 1.0.1B (jta-1_0_1B-classes.zip) from:
-      http://java.sun.com/products/jta/ 
-    by selecting "Class files".
-
-    Save jta-1_0_1B-classes.zip file in directory
-      ${derby.source}/tools/java 
-
-
-(3) Java Cryptography Extension (JCE) version 1.2.2
+(2) Java Cryptography Extension (JCE) version 1.2.2
 
     Download JCE 1.2.2 (jce-1_2_2.zip) from:
       http://java.sun.com/products/jce/index-122.html
@@ -198,59 +185,7 @@
 
 
 
-2.2.5 Download Java Compiler Compiler (JavaCC) version 3.1
-
-JavaCC 3.1 (javacc-3.1.zip or javacc-3.1.tar.gz) can be 
-downloaded from:
-    https://javacc.dev.java.net/
-
-Note: The latest available version of JavaCC is 3.2.
-However, JavaCC 3.1 is the requirement for Derby build
-environment.
-
-The downloaded file (javacc-3.1.zip or javacc-3.1.tar.gz) 
-contains documentation and other files. After downloading 
-the zip or tar file, unzip or untar the file and copy only 
-javacc-3.1/bin/lib/javacc.jar file to directory 
-   ${derby.source}/tools/java 
-
-
-
-2.2.6 Download jakarta-servlet API 4 (Servlet 2.4)
-
-jakarta-servlet API 4 (jakarta-servletapi-4-yyyymmdd.zip or
-jakarta-servletapi-4-yyyymmdd.tar.gz) can be downloaded from:
-   http://cvs.apache.org/builds/jakarta-servletapi-4/nightly/
-
-Note: There is zip and tar file for nightly build for every day.
-Download the zip or tar file for latest day.
- 
-The downloaded file (jakarta-servletapi-4-yyyymmdd.zip or
-jakarta-servletapi-4-yyyymmdd.tar.gz) contains documentation and 
-other files. After downloading the zip or tar file, unzip or 
-untar the file and copy only jakarta-servletapi-4/lib/servlet.jar 
-file to directory 
-   ${derby.source}/tools/java 
-
-
-
-2.2.7 Download Jakarta-ORO 2.0.8
-
-The Derby tests require the Jakarta-ORO classes for text processing.
-Jakarta-ORO 2.0.8 can be downloaded from:
-
-http://www.signal42.com/mirrors/apache/jakarta/oro/source/jakarta-oro-2.0.8.zip
-or
-http://www.signal42.com/mirrors/apache/jakarta/oro/source/jakarta-oro-2.0.8.tar.gz
-
-The downloaded file contains documentation and other files. After downloading
-the zip or tar file, unzip or untar the file and copy only the 
-jakarta-oro-2.0.8.jar file to the directory
-   ${derby.source}/tools/java
-
-
-
-2.2.8 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+2.2.5 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
 
 This is an optional section.
 The reason is that osgi.jar is required to only build the 
@@ -278,13 +213,13 @@
 ${derby.source}/tools/java/jakarta-oro-2.0.8.jar
 ${derby.source}/tools/java/jce1_2_2.jar 
 ${derby.source}/tools/java/jdbc2_0-stdext.jar
-${derby.source}/tools/java/jta-1_0_1B-classes.zip 
-${derby.source}/tools/java/servlet.jar
+${derby.source}/tools/java/geronimo-spec-jta-1.0.1B-rc4.zip 
+${derby.source}/tools/java/geronimo-spec-servlet-2.4-rc4.jar
 ${derby.source}/tools/java/osgi.jar
 
 
 
-2.2.9 Download and Install Jikes 1.14 (Optional)
+2.2.6 Download and Install Jikes 1.14 (Optional)
 
 This is an optional section.
 
@@ -294,7 +229,7 @@
 Jikes 1.14 is the required version for derby builds.
 
 Jikes 1.14 can be downloaded from:
-    http://www.ibm.com/developerworks/oss/jikes/
+    http://jikes.sourceforge.net/
      
 Install Jikes 1.14 in any directory. This directory will be 
 referred to as the ${jikes.dir} directory in the rest of this 

Modified: incubator/derby/code/branches/10.0/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/build.xml?rev=164295&r1=164294&r2=164295&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/build.xml (original)
+++ incubator/derby/code/branches/10.0/build.xml Fri Apr 22 15:55:55 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/branches/10.0/java/drda/org/apache/derby/drda/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/java/drda/org/apache/derby/drda/build.xml?rev=164295&r1=164294&r2=164295&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/java/drda/org/apache/derby/drda/build.xml (original)
+++ incubator/derby/code/branches/10.0/java/drda/org/apache/derby/drda/build.xml Fri Apr 22
15:55:55 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/branches/10.0/tools/ant/properties/compilepath.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/ant/properties/compilepath.properties?rev=164295&r1=164294&r2=164295&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/tools/ant/properties/compilepath.properties (original)
+++ incubator/derby/code/branches/10.0/tools/ant/properties/compilepath.properties Fri Apr
22 15:55:55 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/branches/10.0/tools/ant/properties/extrapath.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/ant/properties/extrapath.properties?rev=164295&r1=164294&r2=164295&view=diff
==============================================================================
--- incubator/derby/code/branches/10.0/tools/ant/properties/extrapath.properties (original)
+++ incubator/derby/code/branches/10.0/tools/ant/properties/extrapath.properties Fri Apr 22
15:55:55 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}

Propchange: incubator/derby/code/branches/10.0/tools/java/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 22 15:55:55 2005
@@ -1,9 +1,5 @@
 jce1_2_2.jar
-servlet.jar
 db2jcc.jar
-javacc.jar
 db2jcc_license_c.jar
 jdbc2_0-stdext.jar
-jakarta-oro-2.0.8.jar
-jta-1_0_1B-classes.zip
 osgi.jar

Copied: incubator/derby/code/branches/10.0/tools/java/empty.jar (from r156234, incubator/derby/code/trunk/tools/java/empty.jar)
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/java/empty.jar?p2=incubator/derby/code/branches/10.0/tools/java/empty.jar&p1=incubator/derby/code/trunk/tools/java/empty.jar&r1=156234&r2=164295&rev=164295&view=diff
==============================================================================
Binary files - no diff available.

Propchange: incubator/derby/code/branches/10.0/tools/java/empty.jar
------------------------------------------------------------------------------
    svn:executable = 

Propchange: incubator/derby/code/branches/10.0/tools/java/empty.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Copied: incubator/derby/code/branches/10.0/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar (from
r156219, incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar)
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar?p2=incubator/derby/code/branches/10.0/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar&p1=incubator/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar&r1=156219&r2=164295&rev=164295&view=diff
==============================================================================
Binary files - no diff available.

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

Copied: incubator/derby/code/branches/10.0/tools/java/geronimo-spec-servlet-2.4-rc4.jar (from
r156219, incubator/derby/code/trunk/tools/java/geronimo-spec-servlet-2.4-rc4.jar)
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/java/geronimo-spec-servlet-2.4-rc4.jar?p2=incubator/derby/code/branches/10.0/tools/java/geronimo-spec-servlet-2.4-rc4.jar&p1=incubator/derby/code/trunk/tools/java/geronimo-spec-servlet-2.4-rc4.jar&r1=156219&r2=164295&rev=164295&view=diff
==============================================================================
Binary files - no diff available.

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

Copied: incubator/derby/code/branches/10.0/tools/java/jakarta-oro-2.0.8.jar (from r156215,
incubator/derby/code/trunk/tools/java/jakarta-oro-2.0.8.jar)
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/java/jakarta-oro-2.0.8.jar?p2=incubator/derby/code/branches/10.0/tools/java/jakarta-oro-2.0.8.jar&p1=incubator/derby/code/trunk/tools/java/jakarta-oro-2.0.8.jar&r1=156215&r2=164295&rev=164295&view=diff
==============================================================================
Binary files - no diff available.

Propchange: incubator/derby/code/branches/10.0/tools/java/jakarta-oro-2.0.8.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Copied: incubator/derby/code/branches/10.0/tools/java/javacc.jar (from r156215, incubator/derby/code/trunk/tools/java/javacc.jar)
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/tools/java/javacc.jar?p2=incubator/derby/code/branches/10.0/tools/java/javacc.jar&p1=incubator/derby/code/trunk/tools/java/javacc.jar&r1=156215&r2=164295&rev=164295&view=diff
==============================================================================
Binary files - no diff available.

Propchange: incubator/derby/code/branches/10.0/tools/java/javacc.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message