svn commit: r588375 - in /db/derby/code/trunk: BUILDING.txt tools/ant/properties/extrapath.properties tools/java/felix.jar

[rh...@apache.org]

Author: rhillegas
Date: Thu Oct 25 15:27:24 2007
New Revision: 588375

URL: http://svn.apache.org/viewvc?rev=588375&view=rev
Log:
DERBY-1670: Check in Felix jar file so that osgi support is always built.

Added:
    db/derby/code/trunk/tools/java/felix.jar   (with props)
Modified:
    db/derby/code/trunk/BUILDING.txt
    db/derby/code/trunk/tools/ant/properties/extrapath.properties

Modified: db/derby/code/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/BUILDING.txt?rev=588375&r1=588374&r2=588375&view=diff
==============================================================================
--- db/derby/code/trunk/BUILDING.txt (original)
+++ db/derby/code/trunk/BUILDING.txt Thu Oct 25 15:27:24 2007
@@ -32,8 +32,7 @@
 2.2.4 section removed - no longer applies
 2.2.5 Download and install JUnit 3.8.*
 2.2.6 Download Java 6 Development Kit (Optional)
-2.2.7 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
-2.2.8 Download J2ME/CDC/Foundation 1.0 and JSR169 jars (Optional)
+2.2.7 Download J2ME/CDC/Foundation 1.0 and JSR169 jars (Optional)
 
 3     Build instructions
 3.1   Set required environmental variables
@@ -217,29 +216,7 @@
     referred to as ${jdk16.dir} in the rest of this document.
 
 
-
-2.2.7 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 
-class org.apache.derby.osgi.EmbeddedActivator. This class 
-and jar file manifest entries created in derby.jar allow 
-that jar file to be an OSGi bundle. If osgi.jar is not 
-present EmbeddedActivator will not be build and derby.jar 
-will not contain the manifest entries to be an OSGi bundle.
-
-OSGi Service Platform release 3 (osgi.jar) can be downloaded from: 
-   http://osgi.org
-
-Note: You will need to register to download OSGi Service Platform 
-      release 3.
-
-The downloaded file should be copied to directory
-   ${derby.source}/tools/java 
-
-
-
-2.2.8 Download J2ME/CDC/Foundation and JSR 169 jars
+2.2.7 Download J2ME/CDC/Foundation and JSR 169 jars
 
 This is an optional section.
 
@@ -259,7 +236,7 @@
 
 
 
-Note: After following the steps in sections 2.2.4-2.2.8 of this
+Note: After following the steps in sections 2.2.4-2.2.7 of this
 document, you should have the following:
 
 ${derby.source}/tools/java/empty.jar
@@ -267,7 +244,7 @@
 ${derby.source}/tools/java/jakarta-oro-2.0.8.jar
 ${derby.source}/tools/java/javacc.jar
 ${derby.source}/tools/java/junit.jar
-${derby.source}/tools/java/osgi.jar
+${derby.source}/tools/java/felix.jar
 ${derby.source}/tools/java/xercesImpl.jar
 ${derby.source}/tools/java/xml-apis.jar
 

Modified: db/derby/code/trunk/tools/ant/properties/extrapath.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/extrapath.properties?rev=588375&r1=588374&r2=588375&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/extrapath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/extrapath.properties Thu Oct 25 15:27:24 2007
@@ -20,7 +20,7 @@
 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
+osgi=${javatools.dir}/felix.jar
 xercesImpl=${javatools.dir}/xercesImpl.jar
 xml-apis=${javatools.dir}/xml-apis.jar
 xalan=${javatools.dir}/xslt4j-2_5_0/xalan.jar

Added: db/derby/code/trunk/tools/java/felix.jar
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/java/felix.jar?rev=588375&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/code/trunk/tools/java/felix.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream