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/04/15 15:24:54 UTC
svn commit: r1829212 - in /db/derby/code/trunk: build.xml
java/testing/build.xml java/testing/module-info.java
tools/ant/properties/dirs.properties
Author: rhillegas
Date: Sun Apr 15 15:24:54 2018
New Revision: 1829212
URL: http://svn.apache.org/viewvc?rev=1829212&view=rev
Log:
DERBY-6945: Add module for derby tests; commit derby-6945-28-aa-testingModuleDescriptor.diff.
Added:
db/derby/code/trunk/java/testing/module-info.java (with props)
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/testing/build.xml
db/derby/code/trunk/tools/ant/properties/dirs.properties
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1829212&r1=1829211&r2=1829212&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Sun Apr 15 15:24:54 2018
@@ -623,7 +623,7 @@
<ant dir="${derby.demo.src.dir}" target="compile-vtidemo"/>
</target>
- <target name="testing" depends="buildsource,demo,buildtestinginfo">
+ <target name="testing" depends="buildsource,buildtestinginfo">
<ant dir="${derby.testing.src.dir}"/>
<ant dir="${derby.pptesting.src.dir}"/>
</target>
@@ -1813,8 +1813,7 @@
</antcall>
<zip destfile="${derby.jar.dir}/derbyTesting.jar" filesonly="true" compress="true">
- <fileset dir="${out.demo.dir}" includes="**"/>
- <fileset dir="${out.testing.dir}" includes="org/apache/derbyTesting/**,org/apache/derby/info/tsting/**"/>
+ <fileset dir="${out.testing.dir}" includes="org/apache/derbyTesting/**,toursdb/**,SimpleApp.class,org/apache/derby/info/tsting/**"/>
</zip>
</target>
@@ -2526,7 +2525,6 @@
<pathelement location="${javatools.dir}/junit.jar"/>
<pathelement location="${out.build.dir}"/>
<pathelement location="${out.client.dir}"/>
- <pathelement location="${out.demo.dir}"/>
<pathelement location="${out.drda.dir}"/>
<pathelement location="${out.engine.dir}"/>
<pathelement location="${out.optional.dir}"/>
@@ -2759,7 +2757,6 @@ you should not have to do this.
<report verbosity="verbose" depth="method">
<sourcepath>
<pathelement path="${derby.client.src.dir}" />
- <pathelement path="${derby.demo.src.dir}" />
<pathelement path="${derby.drda.src.dir}" />
<pathelement path="${derby.engine.src.dir}" />
<pathelement path="${derby.shared.src.dir}" />
Modified: db/derby/code/trunk/java/testing/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/build.xml?rev=1829212&r1=1829211&r2=1829212&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/build.xml (original)
+++ db/derby/code/trunk/java/testing/build.xml Sun Apr 15 15:24:54 2018
@@ -66,10 +66,11 @@
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
- srcdir="${derby.testing.src.dir}"
+ srcdir="${derby.testing.src.dir}:${derby.demo.src.dir}:${derby.demo.src.dir}/simple"
+ excludes="nserverdemo/**,scores/**,vtis/**,workingwithderby/**"
destdir="${out.testing.dir}">
<compilerarg value="-Xlint"/>
- <classpath>
+ <modulepath>
<pathelement path="${out.shared.dir}"/>
<pathelement path="${out.engine.dir}"/>
<pathelement path="${out.client.dir}"/>
@@ -78,14 +79,13 @@
<pathelement path="${out.optional.dir}"/>
<pathelement path="${out.run.dir}"/>
<pathelement path="${out.testing.dir}"/>
- <pathelement path="${out.demo.dir}"/>
<pathelement path="${junit}"/>
<pathelement path="${lucene_core}"/>
<pathelement path="${lucene_a_co}"/>
<pathelement path="${lucene_qp}"/>
<pathelement path="${json_simple}"/>
- </classpath>
+ </modulepath>
</javac>
<copy todir="${out.testing.dir}/${derby.testing.functest.dir}/harness">
@@ -250,6 +250,11 @@
includes="**/*.policy"/>
</copy>
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/demo">
+ <fileset dir="${derby.demo.src.dir}/toursdb"
+ includes="*.sql,*.gif"/>
+ </copy>
+
<!-- <antcall target="build-test-jars"/> -->
</target>
Added: db/derby/code/trunk/java/testing/module-info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/module-info.java?rev=1829212&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/module-info.java (added)
+++ db/derby/code/trunk/java/testing/module-info.java Sun Apr 15 15:24:54 2018
@@ -0,0 +1,33 @@
+module org.apache.derby.tests
+{
+ //
+ // MANDATORY IMPORTS
+ //
+ requires java.base;
+ requires java.logging;
+ requires java.management;
+ requires java.naming;
+ requires java.sql;
+ requires java.xml;
+
+ requires org.apache.derby.commons;
+ requires org.apache.derby.engine;
+ requires org.apache.derby.server;
+ requires org.apache.derby.client;
+ requires org.apache.derby.tools;
+ requires org.apache.derby.optionaltools;
+ requires org.apache.derby.runner;
+
+ requires junit;
+
+ //
+ // OPTIONAL IMPORTS
+ //
+ // REQUIRED AT COMPILE-TIME.
+ // OPTIONAL AT RUN-TIME.
+ //
+ requires static json.simple;
+ requires static lucene.analyzers.common;
+ requires static lucene.core;
+ requires static lucene.queryparser;
+}
Propchange: db/derby/code/trunk/java/testing/module-info.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1829212&r1=1829211&r2=1829212&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Sun Apr 15 15:24:54 2018
@@ -61,7 +61,7 @@ out.testing.dir=${out.dir}/testing
out.tools.dir=${out.dir}/tools
out.locales.dir=${out.dir}/locales
-out.all.dir=${out.build.dir}:${out.client.dir}:${out.demo.dir}:${out.drda.dir}:${out.engine.dir}:${out.optional.dir}:${out.run.dir}:${out.shared.dir}:${out.storeless.dir}:${out.stubs.dir}:${out.testing.dir}:${out.tools.dir}:${out.locales.dir}
+out.all.dir=${out.build.dir}:${out.client.dir}:${out.drda.dir}:${out.engine.dir}:${out.optional.dir}:${out.run.dir}:${out.shared.dir}:${out.storeless.dir}:${out.stubs.dir}:${out.testing.dir}:${out.tools.dir}:${out.locales.dir}
metadata.out.dir=${out.engine.dir}/org/apache/derby/impl/jdbc