You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2018/06/09 13:09:19 UTC

svn commit: r1833236 - in /db/derby/code/trunk: java/client/ java/drda/ java/engine/ java/optional/ java/org.apache.derby.client/ java/org.apache.derby.commons/ java/org.apache.derby.engine/ java/org.apache.derby.engine/org/apache/derby/iapi/types/ jav...

Author: rhillegas
Date: Sat Jun  9 13:09:18 2018
New Revision: 1833236

URL: http://svn.apache.org/viewvc?rev=1833236&view=rev
Log:
-d

Added:
    db/derby/code/trunk/java/org.apache.derby.client/
      - copied from r1832420, db/derby/code/trunk/java/client/
    db/derby/code/trunk/java/org.apache.derby.commons/
      - copied from r1832420, db/derby/code/trunk/java/shared/
    db/derby/code/trunk/java/org.apache.derby.engine/
      - copied from r1832420, db/derby/code/trunk/java/engine/
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/types/SqlXmlUtil.java
      - copied unchanged from r1832736, db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SqlXmlUtil.java
    db/derby/code/trunk/java/org.apache.derby.optionaltools/
      - copied from r1832420, db/derby/code/trunk/java/optional/
    db/derby/code/trunk/java/org.apache.derby.runner/
      - copied from r1832420, db/derby/code/trunk/java/run/
    db/derby/code/trunk/java/org.apache.derby.server/
      - copied from r1832420, db/derby/code/trunk/java/drda/
    db/derby/code/trunk/java/org.apache.derby.tests/
      - copied from r1832420, db/derby/code/trunk/java/testing/
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
      - copied unchanged from r1832750, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk100.java
      - copied unchanged from r1832750, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk100.java
    db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java
      - copied unchanged from r1832750, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jdk110.java
    db/derby/code/trunk/java/org.apache.derby.tools/
      - copied from r1832420, db/derby/code/trunk/java/tools/
Removed:
    db/derby/code/trunk/java/client/
    db/derby/code/trunk/java/drda/
    db/derby/code/trunk/java/engine/
    db/derby/code/trunk/java/optional/
    db/derby/code/trunk/java/run/
    db/derby/code/trunk/java/shared/
    db/derby/code/trunk/java/testing/
    db/derby/code/trunk/java/tools/
Modified:
    db/derby/code/trunk/java/org.apache.derby.engine/build.xml
    db/derby/code/trunk/java/org.apache.derby.tools/build.xml
    db/derby/code/trunk/tools/ant/properties/dirs.properties

Modified: db/derby/code/trunk/java/org.apache.derby.engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/build.xml?rev=1833236&r1=1832420&r2=1833236&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/build.xml (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/build.xml Sat Jun  9 13:09:18 2018
@@ -95,7 +95,7 @@
     <ant antfile="${src.dir}/build.xml" target="genParser">
       <property name="msg" value="Generating SQL parser..."/>
       <property name="outroot" value="${generated.src.engine.dir}"/>
-      <property name="srcroot" value="engine"/>
+      <property name="srcroot" value="org.apache.derby.engine"/>
       <property name="directory" value="${derby.dir}/impl/sql/compile"/>
       <property name="rmfiles" value="implparser_rm.files"/>
       <property name="jjfile" value="sqlgrammar.jj"/>

Modified: db/derby/code/trunk/java/org.apache.derby.tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/build.xml?rev=1833236&r1=1832420&r2=1833236&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/build.xml (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/build.xml Sat Jun  9 13:09:18 2018
@@ -149,7 +149,7 @@
     <ant antfile="${src.dir}/build.xml" target="genParser">
       <property name="msg" value="Generating ij parser..."/>
       <property name="outroot" value="${generated.src.tools.dir}"/>
-      <property name="srcroot" value="tools"/>
+      <property name="srcroot" value="org.apache.derby.tools"/>
       <property name="directory" value="${derby.dir}/impl/tools/ij"/>
       <property name="rmfiles" value="ijimplparser_rm.files"/>
       <property name="jjfile" value="ij.jj"/>
@@ -159,7 +159,7 @@
     <ant antfile="${src.dir}/build.xml" target="genParser">
       <property name="msg" value="Generating mtGrammar parser..."/>
       <property name="outroot" value="${generated.src.tools.dir}"/>
-      <property name="srcroot" value="tools"/>
+      <property name="srcroot" value="org.apache.derby.tools"/>
       <property name="directory" value="${derby.dir}/impl/tools/ij"/>
       <property name="rmfiles" value="mtparser_rm.files"/>
       <property name="jjfile" value="mtGrammar.jj"/>

Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=1833236&r1=1833235&r2=1833236&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Sat Jun  9 13:09:18 2018
@@ -87,17 +87,16 @@ derbysrc.dir=${basedir}/java
 derby.stubs.dir=${derbysrc.dir}/stubs
 derby.felix.src.dir=${derby.stubs.dir}/felix
 
-derby.engine.src.dir=${derbysrc.dir}/engine
-derby.engine.src.dir=${derbysrc.dir}/engine
-derby.drda.src.dir=${derbysrc.dir}/drda
-derby.client.src.dir=${derbysrc.dir}/client
-derby.shared.src.dir=${derbysrc.dir}/shared
-derby.optional.src.dir=${derbysrc.dir}/optional
-derby.run.src.dir=${derbysrc.dir}/run
-derby.tools.src.dir=${derbysrc.dir}/tools
+derby.engine.src.dir=${derbysrc.dir}/org.apache.derby.engine
+derby.drda.src.dir=${derbysrc.dir}/org.apache.derby.server
+derby.client.src.dir=${derbysrc.dir}/org.apache.derby.client
+derby.shared.src.dir=${derbysrc.dir}/org.apache.derby.commons
+derby.optional.src.dir=${derbysrc.dir}/org.apache.derby.optionaltools
+derby.run.src.dir=${derbysrc.dir}/org.apache.derby.runner
+derby.tools.src.dir=${derbysrc.dir}/org.apache.derby.tools
 derby.build.src.dir=${derbysrc.dir}/build
 derby.demo.src.dir=${derbysrc.dir}/demo
-derby.testing.src.dir=${derbysrc.dir}/testing
+derby.testing.src.dir=${derbysrc.dir}/org.apache.derby.tests
 derby.pptesting.src.dir=${derbysrc.dir}/pptesting
 derby.storeless.src.dir=${derbysrc.dir}/storeless
 derby.metadata.src.dir=${derby.engine.src.dir}/org/apache/derby/impl/jdbc