Return-Path: 
 <derby-commits-return-950-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 44052 invoked from network); 7 Jun 2005 17:16:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 Jun 2005 17:16:11 -0000
Received: (qmail 98071 invoked by uid 500); 7 Jun 2005 17:16:11 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 98009 invoked by uid 500); 7 Jun 2005 17:16:10 -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>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 97996 invoked by uid 500); 7 Jun 2005 17:16:10 -0000
Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org
Received: (qmail 97991 invoked by uid 99); 7 Jun 2005 17:16:10 -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; Tue, 07 Jun 2005 10:16:09 -0700
Received: (qmail 44032 invoked by uid 65534); 7 Jun 2005 17:16:02 -0000
Message-ID: <20050607171602.44031.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r188823 - in /incubator/derby/code/trunk: BUILDING.txt
 java/engine/build.xml java/engine/org/apache/derby/modules.properties
Date: Tue, 07 Jun 2005 17:16:02 -0000
To: derby-cvs@incubator.apache.org
From: djd@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: djd
Date: Tue Jun  7 10:16:01 2005
New Revision: 188823

URL: http://svn.apache.org/viewcvs?rev=3D188823&view=3Drev
Log:
Add automatic build of J2ME/JSR169 optional targets if
jsr169compile.classpath is set.
Include instructions on this in BUILDING.txt

Modified:
    incubator/derby/code/trunk/BUILDING.txt
    incubator/derby/code/trunk/java/engine/build.xml
    incubator/derby/code/trunk/java/engine/org/apache/derby/modules.propert=
ies

Modified: incubator/derby/code/trunk/BUILDING.txt
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/BUILDING.txt?=
rev=3D188823&r1=3D188822&r2=3D188823&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/BUILDING.txt (original)
+++ incubator/derby/code/trunk/BUILDING.txt Tue Jun  7 10:16:01 2005
@@ -17,6 +17,7 @@
 2.2.4 Download extensions for Java Development Kit release 1.3.x
 2.2.5 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
 2.2.6 Download Jikes 1.14 (Optional)
+2.2.7 Download J2ME/CDC/FOundation 1.0 and JSR169 jars (Optional)
=20
 3     Build instructions
 3.1   Set required environmental variables
@@ -240,6 +241,23 @@
 referred to as the ${jikes.dir} directory in the rest of this=20
 document.=20
=20
+2.2.7 Download J2ME/CDC/Foundation and JSR 169 jars
+
+This is an optional section.
+
+Derby's embeded engine supports J2ME/CDC/Foundation 1.0 using the JDBC
+sub-set defined in JSR 169. In order to build Derby to
+support this platform, jars are needed for the Foundation 1.0
+profile and the JSR169 JDBC subset. There is no standard place
+for these jars yet, possible downloads are:
+
+java.sun.com/j2me
+IBM's WCTME 5.7
+
+Once you have obtained these jars and set the jsr169compile.classpath
+(see section 3.2) the regulat Derby builds will include the JSR169 code
+for the embedded engine. The resulting jar file (derby.jar) can be used
+on J2ME, or J2SE, write once run anywhere.
=20
=20
 ---------------------------------------------------------------
@@ -274,7 +292,6 @@
      set JAVA_HOME=3D${jdk14.dir}    -- On Windows
=20
=20
-
 3.2   Create property file
=20
 You will need to create a property file to specify
@@ -364,6 +381,17 @@
=20
       Typically applications embedding Derby would use jar files=20
       built with sane=3Dfalse.
+
+    - Optional - jsr169compile.classpath
+
+      If you downloaded the J2ME jar files (section 2.2.7) then
+      setting this property will enable the optional JSR169 targets
+      for the top-level default, engine or all targets.
+      The compile classpath needs to include the Foundation 1.0
+      and JSR169 environments, see any documentation for your
+      source of J2ME libraries. Here is an example foe IBM's WCTME 5.7
+=20
+      jsr169compile.classpath=3DC:/wctme5.7/ive/lib/jclFoundation10/classe=
s=2Ezip;C:/wctme5.7/ive/lib/jdbc.jar
=20
 3.3   Run Derby build
=20

Modified: incubator/derby/code/trunk/java/engine/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/b=
uild.xml?rev=3D188823&r1=3D188822&r2=3D188823&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/engine/build.xml (original)
+++ incubator/derby/code/trunk/java/engine/build.xml Tue Jun  7 10:16:01 20=
05
@@ -34,9 +34,11 @@
=20
 <!--             =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Begin Targets =3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D                -->
 =20
-  <target name=3D"engine" depends=3D"engine_169"
+  <target name=3D"engine" depends=3D"engine_j2se,engine_169,engine_169_opt"
           description=3D"Build Derby engine">
-
+	</target>
+    <target name=3D"engine_j2se" depends=3D"engine_169"
+            description=3D"Build Derby engine">
     <ant dir=3D"${derby.engine.dir}/iapi"/>
     <ant dir=3D"${derby.engine.dir}/impl"/>
     <ant dir=3D"${derby.engine.dir}/jdbc"/>
@@ -44,12 +46,11 @@
     <ant dir=3D"${derby.engine.dir}/catalog"/>
     <ant dir=3D"${derby.engine.dir}/diag"/>
     <ant dir=3D"${derby.engine.dir}/vti"/>
-
-    <copy todir=3D"${out.dir}/${derby.dir}">
-      <fileset dir=3D"${derby.engine.dir}">
-        <include name=3D"modules.properties"/>
-      </fileset>
-    </copy>
+      	<copy todir=3D"${out.dir}/${derby.dir}">
+          <fileset dir=3D"${derby.engine.dir}">
+            <include name=3D"modules.properties"/>
+          </fileset>
+        </copy>
   </target>
  =20
   <target name=3D"engine_169"
@@ -60,17 +61,38 @@
      <ant dir=3D"${derby.engine.dir}/iapi" target=3D"compile_iapi_error_js=
r169"/>
      <ant dir=3D"${derby.engine.dir}/database"/>
      <ant dir=3D"${derby.engine.dir}/impl" target=3D"compile_impl_169"/>
- </target>
+
+
+  </target>
 =09
 	<!-- optional JSR169 classes - optional because it requires a=20
 	J2ME/CDC/Foundation/JSR169 build jar files.
 	jsr169compile.classpath
 	-->
-	  <target name=3D"engine_169_opt"  depends=3D"engine_169"
-	          description=3D"Build optional JSR169 elements of Derby engine">
+	  <target name=3D"engine_169_opt"  depends=3D"engine_j2se,J2ME_modules_ed=
it"
+	          description=3D"Build optional JSR169 elements of Derby engine"
+	  	      if=3D"jsr169compile.classpath">
 	 <ant dir=3D"${derby.engine.dir}/impl/jdbc" target=3D"compile_jsr169_opt"=
/>
      <ant dir=3D"${derby.engine.dir}/jdbc" target=3D"compile_jsr169_opt"/>
+	=20
 	 </target>
+=09
+	<target name=3D"J2ME_modules_edit"  depends=3D"checkJ2MEmoduleprops"
+		unless=3D"modulesJ2ME.uptodate" if=3D"jsr169compile.classpath">
+
+		<replaceregexp file=3D"${out.dir}/${derby.dir}/modules.properties"
+		              match=3D"^#J2ME_optional_(.*)"
+		              replace=3D"\1"
+		              byline=3D"true" />
+	<touch file=3D"${out.dir}/${derby.dir}/modulesJ2ME.done"/>
+
+	</target> =09
+=09
+	<target name=3D"checkJ2MEmoduleprops">
+	  <condition property=3D"modulesJ2ME.uptodate">
+	    <available file=3D"${out.dir}/${derby.dir}/modulesJ2ME.done"/>
+	  </condition>
+	</target>=20
 =09
 <!--             =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D End Targets =3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D                -->
=20

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/modules.p=
roperties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/o=
rg/apache/derby/modules.properties?rev=3D188823&r1=3D188822&r2=3D188823&vie=
w=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/engine/org/apache/derby/modules.propert=
ies (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/modules.propert=
ies Tue Jun  7 10:16:01 2005
@@ -130,6 +130,7 @@
 #
 derby.module.cryptographyJ2=3Dorg.apache.derby.impl.services.jce.JCECipher=
Factory
 derby.env.jdk.cryptographyJ2=3D2
+derby.env.classes.cryptographyJ2=3Djavax.crypto.SecretKey
 cloudscape.config.cryptographyJ2=3Dderby
=20
 ######################
@@ -293,3 +294,12 @@
 derby.env.dvfJ2=3D2
 derby.env.classes.dvfJ2=3Djava.math.BigDecimal
 cloudscape.config.dvfJ2=3Dderby
+
+# J2ME optional elements, the J2ME_optional_ lead in
+# is removed if the optional target is built.
+
+#J2ME_optional_derby.module.dvfCDC=3Dorg.apache.derby.iapi.types.CDCDataVa=
lueFactory
+#J2ME_optional_cloudscape.config.dvfCDC=3Dderby
+#J2ME_optional_derby.module.jdbc169=3Dorg.apache.derby.jdbc.Driver169
+#J2ME_optional_derby.env.classes.jdbc169=3Djavax.sql.DataSource
+#J2ME_optional_cloudscape.config.jdbc169=3Dderby