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/03/10 16:24:01 UTC
svn commit: r1826417 [1/3] - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/
java/build/org/apache/derbyBuild/lastgoodjarcontents/
java/build/org/apache/derbyPreBuild/ java/client/ java/demo/
java/demo/toursdb/ java/drda/ java/engine/ jav...
Author: rhillegas
Date: Sat Mar 10 16:24:00 2018
New Revision: 1826417
URL: http://svn.apache.org/viewvc?rev=1826417&view=rev
Log:
DERBY-6945: Split generated class directory into separate subdirectories for generated shared, engine, and tools classes; commit derby-6945-22-af-isolateClassesByArtifact.diff.
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java
db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml
db/derby/code/trunk/java/client/build.xml
db/derby/code/trunk/java/demo/build.xml
db/derby/code/trunk/java/demo/toursdb/build.xml
db/derby/code/trunk/java/drda/build.xml
db/derby/code/trunk/java/engine/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml
db/derby/code/trunk/java/optional/build.xml
db/derby/code/trunk/java/run/build.xml
db/derby/code/trunk/java/shared/build.xml
db/derby/code/trunk/java/storeless/build.xml
db/derby/code/trunk/java/testing/build.xml
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/noDeregisterPermission.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/noAbortPermission.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPTests.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.initial.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.modified.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.unreloadable.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/no_derby_internals.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/resultSetReader.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withPerm.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.withoutPerm.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby3980DeadlockTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/unit/fillLog.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/useprocessfalse.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest1.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest1.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest2.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy
db/derby/code/trunk/java/tools/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=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Sat Mar 10 16:24:00 2018
@@ -48,7 +48,7 @@
<target
name="buildsource"
- depends="checkCompilerLevel,init,prebuild,setCompilerProperties,felixStubs,shared,engine,storeless,client,tools,drda,optional,runner,build,versioninfo,localeinfo,binscripts"
+ depends="checkCompilerLevel,init,prebuild,setCompilerProperties,felixStubs,shared,client,engine,storeless,tools,drda,optional,runner,build,versioninfo,localeinfo,binscripts"
description="Compile the product source (does not build the tests)."
/>
<target
@@ -61,9 +61,8 @@
<!-- Initialize targets -->
<!-- ==================================================================== -->
- <target name="init" unless="init.done" depends="install_junit,setCompilerProperties">
+ <target name="init" unless="init.done" depends="makeOutDirs,install_junit,setCompilerProperties">
<tstamp/>
- <mkdir dir="${out.dir}"/>
<antcall target="make-generated-dirs"/>
<antcall target="make-release-dirs"/>
@@ -81,11 +80,32 @@
<property name="init.done" value="true"/>
</target>
+ <target name="makeOutDirs">
+ <mkdir dir="${out.dir}"/>
+
+ <mkdir dir="${out.build.dir}"/>
+ <mkdir dir="${out.client.dir}"/>
+ <mkdir dir="${out.demo.dir}"/>
+ <mkdir dir="${out.drda.dir}"/>
+ <mkdir dir="${out.engine.dir}"/>
+ <mkdir dir="${out.optional.dir}"/>
+ <mkdir dir="${out.run.dir}"/>
+ <mkdir dir="${out.shared.dir}"/>
+ <mkdir dir="${out.storeless.dir}"/>
+ <mkdir dir="${out.stubs.dir}"/>
+ <mkdir dir="${out.testing.dir}"/>
+ <mkdir dir="${out.tools.dir}"/>
+ <mkdir dir="${out.locales.dir}"/>
+ </target>
+
<target name="make-generated-dirs">
<mkdir dir="${generated.dir}"/>
<mkdir dir="${generated.bin.dir}"/>
<mkdir dir="${generated.src.dir}"/>
+ <mkdir dir="${generated.src.engine.dir}"/>
+ <mkdir dir="${generated.src.shared.dir}"/>
+ <mkdir dir="${generated.src.tools.dir}"/>
<mkdir dir="${generated.sanity.dir}"/>
<mkdir dir="${generated.ij.dir}"/>
<mkdir dir="${generated.sql.dir}"/>
@@ -196,69 +216,79 @@
<target name="ckversioninfo">
<condition property="versioninfo.available">
<and>
- <available file="${out.dir}/org/apache/derby/info/engine/info.properties"/>
- <available file="${out.dir}/org/apache/derby/info/tools/info.properties"/>
- <available file="${out.dir}/org/apache/derby/info/net/info.properties"/>
- <available file="${out.dir}/org/apache/derby/info/client/info.properties"/>
- <available file="${out.dir}/org/apache/derby/info/shared/info.properties"/>
- <available file="${out.dir}/org/apache/derby/info/tsting/info.properties"/>
+ <available file="${out.engine.dir}/org/apache/derby/info/engine/info.properties"/>
+ <available file="${out.tools.dir}/org/apache/derby/info/tools/info.properties"/>
+ <available file="${out.drda.dir}/org/apache/derby/info/net/info.properties"/>
+ <available file="${out.client.dir}/org/apache/derby/info/client/info.properties"/>
+ <available file="${out.shared.dir}/org/apache/derby/info/shared/info.properties"/>
+ <available file="${out.testing.dir}/org/apache/derby/info/tsting/info.properties"/>
</and>
</condition>
</target>
<target name="writeversioninfo" unless="versioninfo.available">
- <mkdir dir="${out.dir}/org/apache/derby/info/"/>
- <mkdir dir="${out.dir}/org/apache/derby/info/engine"/>
- <mkdir dir="${out.dir}/org/apache/derby/info/tools"/>
- <mkdir dir="${out.dir}/org/apache/derby/info/net"/>
- <mkdir dir="${out.dir}/org/apache/derby/info/client"/>
- <mkdir dir="${out.dir}/org/apache/derby/info/shared"/>
- <mkdir dir="${out.dir}/org/apache/derby/info/tsting"/>
+ <mkdir dir="${out.engine.dir}/org/apache/derby/info/"/>
+ <mkdir dir="${out.engine.dir}/org/apache/derby/info/engine"/>
+
+ <mkdir dir="${out.tools.dir}/org/apache/derby/info"/>
+ <mkdir dir="${out.tools.dir}/org/apache/derby/info/tools"/>
+
+ <mkdir dir="${out.drda.dir}/org/apache/derby/info"/>
+ <mkdir dir="${out.drda.dir}/org/apache/derby/info/net"/>
+
+ <mkdir dir="${out.client.dir}/org/apache/derby/info"/>
+ <mkdir dir="${out.client.dir}/org/apache/derby/info/client"/>
+
+ <mkdir dir="${out.shared.dir}/org/apache/derby/info"/>
+ <mkdir dir="${out.shared.dir}/org/apache/derby/info/shared"/>
+
+ <mkdir dir="${out.testing.dir}/org/apache/derby/info"/>
+ <mkdir dir="${out.testing.dir}/org/apache/derby/info/tsting"/>
<antcall target="infowriter">
<param name="info.buildnumber" value="1"/>
<param name="info.iname" value="Apache Derby Embedded Engine"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="codeline"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/engine/info.properties"/>
+ <param name="info.file" value="${out.engine.dir}/org/apache/derby/info/engine/info.properties"/>
</antcall>
<antcall target="infowriter">
<param name="info.buildnumber" value="1"/>
<param name="info.iname" value="Apache Derby Tools"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="codeline"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/tools/info.properties"/>
+ <param name="info.file" value="${out.tools.dir}/org/apache/derby/info/tools/info.properties"/>
</antcall>
<antcall target="infowriter">
<param name="info.buildnumber" value="1"/>
<param name="info.iname" value="Apache Derby Network Server"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="codeline"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/net/info.properties"/>
+ <param name="info.file" value="${out.drda.dir}/org/apache/derby/info/net/info.properties"/>
</antcall>
<antcall target="infowriter">
<param name="info.buildnumber" value="1"/>
<param name="info.iname" value="Apache Derby Network Client"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="codeline"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/client/info.properties"/>
+ <param name="info.file" value="${out.client.dir}/org/apache/derby/info/client/info.properties"/>
</antcall>
<antcall target="infowriter">
<param name="info.buildnumber" value="1"/>
<param name="info.iname" value="Apache Derby Shared Utilities"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="codeline"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/shared/info.properties"/>
+ <param name="info.file" value="${out.shared.dir}/org/apache/derby/info/shared/info.properties"/>
</antcall>
</target>
<target name="cleanversion">
- <delete file="${out.dir}/org/apache/derby/info/engine/info.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/tools/info.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/net/info.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/client/info.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/shared/info.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/tsting/info.properties"/>
+ <delete file="${out.engine.dir}/org/apache/derby/info/engine/info.properties"/>
+ <delete file="${out.tools.dir}/org/apache/derby/info/tools/info.properties"/>
+ <delete file="${out.drda.dir}/org/apache/derby/info/net/info.properties"/>
+ <delete file="${out.client.dir}/org/apache/derby/info/client/info.properties"/>
+ <delete file="${out.shared.dir}/org/apache/derby/info/shared/info.properties"/>
+ <delete file="${out.testing.dir}/org/apache/derby/info/tsting/info.properties"/>
</target>
<!-- Set the ant variables which identify the compiler classpaths. -->
@@ -326,7 +356,7 @@
<taskdef
name="writeAndCheckinReleaseProperties"
classname="org.apache.derbyPreBuild.ReleaseProperties"
- classpath="${out.dir}"
+ classpath="${out.build.dir}"
/>
<property name="releasePropertyFile" value="${properties.dir}/release.properties"/>
@@ -355,12 +385,12 @@
<param name="info.buildnumber" value="1"/>
<param name="info.iname" value="_${locale.iname}"/>
<param name="info.ename" value="${locale.ename}"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/locale_${locale.iname}/info.properties"/>
+ <param name="info.file" value="${out.locales.dir}/org/apache/derby/info/locale_${locale.iname}/info.properties"/>
</antcall>
</target>
<target name="localeinfowriter">
- <mkdir dir="${out.dir}/org/apache/derby/info/locale_${locale.iname}"/>
+ <mkdir dir="${out.locales.dir}/org/apache/derby/info/locale_${locale.iname}"/>
<propertyfile file="${info.file}" comment="${copyright.comment}">
<entry key="derby.locale.version.major" value="${major}"/>
<entry key="derby.locale.version.minor" value="${minor}"/>
@@ -466,46 +496,46 @@
<target name="checklocaleinfo">
<condition property="localeinfo.available">
<and>
- <available file="${out.dir}/org/apache/derby/info/locale_cs.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_de_DE.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_es.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_fr.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_hu.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_it.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_ja_JP.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_ko_KR.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_pl.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_pt_BR.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_ru.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_zh_CN.properties"/>
- <available file="${out.dir}/org/apache/derby/info/locale_zh_TW.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_cs.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_de_DE.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_es.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_fr.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_hu.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_it.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_ja_JP.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_ko_KR.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_pl.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_pt_BR.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_ru.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_zh_CN.properties"/>
+ <available file="${out.locales.dir}/org/apache/derby/info/locale_zh_TW.properties"/>
</and>
</condition>
</target>
<target name="cleanlocale">
- <delete file="${out.dir}/org/apache/derby/info/locale_cs.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_de_DE.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_es.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_fr.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_hu.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_it.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_ja_JP.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_ko_KR.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_pl.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_pt_BR.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_ru.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_zh_CN.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/locale_zh_TW.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_cs.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_de_DE.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_es.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_fr.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_hu.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_it.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_ja_JP.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_ko_KR.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_pl.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_pt_BR.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_ru.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_zh_CN.properties"/>
+ <delete file="${out.locales.dir}/org/apache/derby/info/locale_zh_TW.properties"/>
</target>
<target name="checkmessages" depends="checkmessages-done"
unless="checkmessages.done">
<java classname="org.apache.derbyBuild.MessageVetter"
- classpath="${out.dir}"
+ classpath="${out.build.dir}"
failonerror="true">
- <arg file="${out.dir}/org/apache/derby/loc"/>
- <arg file="${out.dir}/org/apache/derby/loc/drda"/>
+ <arg file="${out.engine.dir}/org/apache/derby/loc"/>
+ <arg file="${out.drda.dir}/org/apache/derby/loc/drda"/>
</java>
<touch file="${generated.dir}/checkmessages.done"/>
</target>
@@ -514,9 +544,9 @@
<uptodate property="checkmessages.done"
targetfile="${generated.dir}/checkmessages.done">
<srcresources>
- <fileset dir="${out.dir}/org/apache/derby/loc"
+ <fileset dir="${out.engine.dir}/org/apache/derby/loc"
includes="*.properties"/>
- <fileset dir="${out.dir}/org/apache/derby/loc/drda"
+ <fileset dir="${out.drda.dir}/org/apache/derby/loc/drda"
includes="*.properties"/>
</srcresources>
</uptodate>
@@ -560,11 +590,11 @@
<ant dir="${derby.drda.src.dir}"/>
</target>
- <target name="client" depends="engine,shared">
+ <target name="client" depends="shared">
<ant dir="${derby.client.src.dir}"/>
</target>
- <target name="prebuild">
+ <target name="prebuild" depends="makeOutDirs">
<mkdir dir="${out.dir}"/>
<ant dir="${derby.build.src.dir}/org/apache/derbyPreBuild"/>
</target>
@@ -596,7 +626,7 @@
<java fork="true"
classname="org.apache.derbyBuild.MessageBundleTest"
failonerror="true"
- classpath="${out.dir}"
+ classpath="${out.build.dir}:${out.shared.dir}:${out.engine.dir}"
/>
</target>
@@ -607,7 +637,7 @@
fork="true"
classname="org.apache.derbyBuild.JarDriftTest"
failonerror="true"
- classpath="${out.dir}">
+ classpath="${out.build.dir}">
<arg value="refresh"/>
</java>
</target>
@@ -619,7 +649,7 @@
fork="true"
classname="org.apache.derbyBuild.JarDriftTest"
failonerror="true"
- classpath="${out.dir}"
+ classpath="${out.build.dir}"
/>
</target>
@@ -707,25 +737,25 @@
<target name="genParser" depends="chkparser" unless="parser.done">
<echo level="info" message=" ${msg}"/>
<delete>
- <fileset dir="${generated.src.dir}/${directory}" includes="${rmfiles}"/>
+ <fileset dir="${outroot}/${directory}" includes="${rmfiles}"/>
</delete>
<java classname="javacc"
classpath="${javacc}"
dir="${derbysrc.dir}/${srcroot}/${directory}"
fork="yes"
failonerror="true">
- <arg value="-OUTPUT_DIRECTORY=${generated.src.dir}/${directory}"/>
+ <arg value="-OUTPUT_DIRECTORY=${outroot}/${directory}"/>
<arg value="${jjfile}"/>
</java>
<!-- Qualify reference to tokenImage to fix issue with inheritence -->
<!-- IBM JDK 1.3.1. See DERBY-1078 -->
- <replaceregexp file="${generated.src.dir}/${directory}/${chkfile}" match="tokenImage"
+ <replaceregexp file="${outroot}/${directory}/${chkfile}" match="tokenImage"
replace="${constantsfile}.tokenImage"/>
</target>
<target name="chkparser">
<uptodate property="parser.done"
- targetfile="${generated.src.dir}/${directory}/${chkfile}" >
+ targetfile="${outroot}/${directory}/${chkfile}" >
<srcfiles dir="${derbysrc.dir}/${srcroot}/${directory}" includes="${jjfile}" />
</uptodate>
</target>
@@ -836,10 +866,10 @@
fork="yes"
failonerror="yes">
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.build.dir}:${out.engine.dir}"/>
</classpath>
<jvmarg value="-DWS=${workspace}"/>
- <jvmarg value="-DclassDir=${out.dir}"/>
+ <jvmarg value="-DclassDir=${out.engine.dir}"/>
<jvmarg value="-Dout=${generated.cache.dir}/ClassSizeCatalogImpl.java"/>
<jvmarg value="-Dprefix.1=org.apache.derby.iapi.types"/>
<jvmarg value="-Dprefix.2=org.apache.derby.impl"/>
@@ -864,9 +894,13 @@
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
- srcdir="${generated.src.dir}"
- destdir="${out.dir}">
+ srcdir="${generated.src.engine.dir}"
+ destdir="${out.engine.dir}">
<include name="${derby.dir}/iapi/services/cache/ClassSizeCatalogImpl.java"/>
+ <classpath>
+ <pathelement location="${out.shared.dir}"/>
+ <pathelement location="${out.engine.dir}"/>
+ </classpath>
</javac>
</target>
@@ -875,14 +909,14 @@
<condition property="csc.uptodate">
<and>
<uptodate srcfile="${derby.engine.dir}/iapi/types/DataValueDescriptor.java"
- targetfile="${out.dir}/org/apache/derby/iapi/types/DataValueDescriptor.class"/>
+ targetfile="${out.engine.dir}/org/apache/derby/iapi/types/DataValueDescriptor.class"/>
<uptodate srcfile="${derby.engine.dir}/impl/store/raw/data/RecordId.java"
- targetfile="${out.dir}/org/apache/derby/impl/store/raw/data/RecordId.class"/>
+ targetfile="${out.engine.dir}/org/apache/derby/impl/store/raw/data/RecordId.class"/>
<uptodate srcfile="${derby.engine.dir}/iapi/store/raw/ContainerKey.java"
- targetfile="${out.dir}/org/apache/derby/iapi/store/raw/ContainerKey.class"/>
+ targetfile="${out.engine.dir}/org/apache/derby/iapi/store/raw/ContainerKey.class"/>
<uptodate srcfile="${derby.engine.dir}/iapi/services/cache/SizedCacheable.java"
- targetfile="${out.dir}/org/apache/derby/iapi/services/cache/SizedCacheable.class"/>
- <available file="${generated.src.dir}/${derby.dir}/iapi/services/cache/ClassSizeCatalogImpl.java"/>
+ targetfile="${out.engine.dir}/org/apache/derby/iapi/services/cache/SizedCacheable.class"/>
+ <available file="${generated.src.engine.dir}/${derby.dir}/iapi/services/cache/ClassSizeCatalogImpl.java"/>
</and>
</condition>
</target>
@@ -1005,7 +1039,7 @@
</antcall>
<javadoc bootclasspath="${bootClasspath}"
- classpath="${bootClasspath};${osgi};${servlet24};${out.dir};${jars.javadoc}"
+ classpath="${bootClasspath};${osgi};${servlet24};${out.all.dir};${jars.javadoc}"
sourcepath="${derby.engine.src.dir}:${derby.client.src.dir}:${derby.drda.src.dir}:${derby.shared.src.dir}:${derby.optional.src.dir}:${derby.tools.src.dir}"
excludepackagenames="org.apache.derby.*"
breakiterator="true"
@@ -1067,7 +1101,7 @@
access="private"
breakiterator="yes"
useexternalfile="yes"
- classpath="${out.dir};${jars.javadoc}"
+ classpath="${out.all.dir};${jars.javadoc}"
destdir="${out.javadoc.dir}/engine"
windowtitle="Apache Derby V${major}.${minor} Internals"
doctitle="Apache Derby V${major}.${minor} Internals"
@@ -1158,7 +1192,7 @@
access="private"
breakiterator="yes"
useexternalfile="yes"
- classpath="${out.dir}"
+ classpath="${out.all.dir};"
destdir="${out.javadoc.dir}/demo"
windowtitle="Apache Derby Demos"
doctitle="Apache Derby Demos"
@@ -1205,7 +1239,7 @@
access="private"
breakiterator="yes"
useexternalfile="yes"
- classpath="${out.dir};${jars.javadoc};${junit}"
+ classpath="${out.all.dir};${jars.javadoc};${junit}"
destdir="${out.javadoc.dir}/testing"
windowtitle="Apache Derby V${major}.${minor} Test Javadoc"
doctitle="Apache Derby V${major}.${minor} Test Javadoc"
@@ -1245,7 +1279,7 @@
<java classname="org.apache.derbyBuild.eclipse.DerbyEclipsePlugin">
<arg value="${derby.jar.dir}/${plugin.tmp.dir}"/>
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.build.dir}"/>
</classpath>
</java>
@@ -1312,11 +1346,11 @@
<mkdir dir="${derby.jar.dir}/lists/org/apache/derby"/>
<java classname="org.apache.derbyBuild.propertyconfig" fork="yes">
- <arg value="${out.dir}/org/apache/derby/modules.properties"/>
+ <arg value="${out.engine.dir}/org/apache/derby/modules.properties"/>
<arg value="derby"/>
<arg value="${derby.jar.dir}/lists/org/apache/derby/modules.properties"/>
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.build.dir}"/>
</classpath>
</java>
@@ -1331,7 +1365,7 @@
<param name="info.ename" value="Apache Derby"/>
<param name="info.buildnumber" value="${changenumber}"/>
<param name="info.productfile" value="derby.jar"/>
- <param name="info.file" value="${out.dir}//org/apache/derby/info/engine/info.properties"/>
+ <param name="info.file" value="${out.engine.dir}/org/apache/derby/info/engine/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1356,40 +1390,8 @@
</manifest>
<jar destfile="${derby.jar.dir}/derby.jar"
- basedir="${out.dir}"
- includes="org/apache/derby/agg/**,
- org/apache/derby/authentication/**,
- org/apache/derby/catalog/**,
- org/apache/derby/database/**,
- org/apache/derby/diag/**,
- org/apache/derby/io/**,
- org/apache/derby/jdbc/load/**,
- org/apache/derby/mbeans/*.class,
- org/apache/derby/osgi/**,
- org/apache/derby/security/**,
- org/apache/derby/vti/**,
- org/apache/derby/iapi/db/**,
- org/apache/derby/iapi/jdbc/**,
- org/apache/derby/iapi/security/**,
- org/apache/derby/iapi/services/**,
- org/apache/derby/iapi/sql/**,
- org/apache/derby/iapi/store/**,
- org/apache/derby/iapi/types/**,
- org/apache/derby/iapi/transaction/**,
- org/apache/derby/iapi/util/**,
- org/apache/derby/impl/db/**,
- org/apache/derby/impl/io/**,
- org/apache/derby/impl/jdbc/**,
- org/apache/derby/impl/load/**,
- org/apache/derby/impl/optional/**,
- org/apache/derby/impl/services/**,
- org/apache/derby/impl/sql/**,
- org/apache/derby/impl/store/**,
- org/apache/derby/loc/m?_en.properties,
- org/apache/derby/loc/m??_en.properties,
- org/apache/derby/impl/sql/catalog/metadata_net.properties,
- org/apache/derby/info/engine/info.properties"
- excludes="**/D_*,**/odbcmeta.done,**/*Test.class,**/_Suite.class"
+ basedir="${out.engine.dir}"
+ excludes="**/D_*,**/*.done,**/*Test.class,**/_Suite.class"
compress="true"
filesonly="true"
manifest="${derby.jar.dir}/lists/smf.mf">
@@ -1444,7 +1446,7 @@
<param name="info.iname" value="Apache Derby Tools"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="derbytools.jar"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/tools/info.properties"/>
+ <param name="info.file" value="${out.tools.dir}/org/apache/derby/info/tools/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1460,14 +1462,7 @@
<delete file="${derby.jar.dir}/derbytools.jar"/>
<jar destfile="${derby.jar.dir}/derbytools.jar"
- basedir="${out.dir}"
- includes="org/apache/derby/tools/**,
- org/apache/derby/iapi/tools/**,
- org/apache/derby/impl/tools/**,
- org/apache/derby/jdbc/**,
- org/apache/derby/loc/sysinfoMessages.properties,
- org/apache/derby/loc/toolsmessages.properties,
- org/apache/derby/info/tools/info.properties"
+ basedir="${out.tools.dir}"
excludes="org/apache/derby/impl/tools/ij/SimpleCharStream.class,
org/apache/derby/impl/tools/ij/mt*.class"
manifest="${derby.jar.dir}/lists/smftools.mf"
@@ -1497,7 +1492,7 @@
<param name="info.iname" value="Apache Derby Optional Tools"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="derbyoptionaltools.jar"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/optional/info.properties"/>
+ <param name="info.file" value="${out.optional.dir}/org/apache/derby/optional/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1517,8 +1512,7 @@
<delete file="${derby.jar.dir}/derbyoptionaltools.jar"/>
<jar destfile="${derby.jar.dir}/derbyoptionaltools.jar"
- basedir="${out.dir}"
- includes="org/apache/derby/optional/**"
+ basedir="${out.optional.dir}"
manifest="${derby.jar.dir}/lists/smfoptionaltools.mf"
compress="true"
filesonly="true">
@@ -1544,7 +1538,7 @@
<param name="info.iname" value="Apache Derby Network Server"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="derbynet.jar"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/net/info.properties"/>
+ <param name="info.file" value="${out.drda.dir}/org/apache/derby/info/net/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1558,12 +1552,7 @@
<delete file="${derby.jar.dir}/derbynet.jar"/>
<jar destfile="${derby.jar.dir}/derbynet.jar"
- basedir="${out.dir}"
- includes="org/apache/derby/drda/**,
- org/apache/derby/impl/drda/**,
- org/apache/derby/loc/drda/**,
- org/apache/derby/mbeans/drda/**,
- org/apache/derby/info/net/info.properties"
+ basedir="${out.drda.dir}"
compress="true"
filesonly="true"
manifest="${derby.jar.dir}/lists/smfnet.mf">
@@ -1584,13 +1573,13 @@
<fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
</delete>
- <mkdir dir="${out.dir}/org/apache/derby/info/"/>
+ <mkdir dir="${out.client.dir}/org/apache/derby/info/"/>
<antcall target="infowriter">
<param name="info.buildnumber" value="${changenumber}"/>
<param name="info.iname" value="Apache Derby Network Client"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="codeline"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/client/info.properties"/>
+ <param name="info.file" value="${out.client.dir}/org/apache/derby/info/client/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1615,13 +1604,10 @@
<delete file="${derby.jar.dir}/derbyclient.jar"/>
<jar destfile="${derby.jar.dir}/derbyclient.jar"
- basedir="${out.dir}"
+ basedir="${out.client.dir}"
compress="true"
filesonly="true"
update="true"
- includes="org/apache/derby/client/**,
- org/apache/derby/info/client/info.properties,
- org/apache/derby/loc/clientmessages*.properties"
excludes="org/apache/derby/loc/clientmessages_qq_PP_testOnly.properties,
**/*Test.class,
**/_Suite.class"
@@ -1649,7 +1635,7 @@
<param name="info.iname" value="Apache Derby Shared Utilities"/>
<param name="info.ename" value="Apache Derby"/>
<param name="info.productfile" value="derbyshared.jar"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/shared/info.properties"/>
+ <param name="info.file" value="${out.shared.dir}/org/apache/derby/info/shared/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1661,9 +1647,7 @@
<delete file="${derby.jar.dir}/derbyshared.jar"/>
<jar destfile="${derby.jar.dir}/derbyshared.jar"
- basedir="${out.dir}"
- includes="org/apache/derby/shared/common/**,
- org/apache/derby/info/shared/info.properties"
+ basedir="${out.shared.dir}"
compress="true"
filesonly="true"
manifest="${derby.jar.dir}/lists/smfshared.mf"/>
@@ -1690,12 +1674,11 @@
</manifest>
<jar destfile="${derby.jar.dir}/derbyrun.jar"
+ basedir="${out.run.dir}"
compress="true"
filesonly="true"
update="true"
manifest="${derby.jar.dir}/lists/smfcmd.mf">
- <fileset dir="${out.dir}"
- includes="org/apache/derby/run/run.class"/>
<fileset dir="${derby.jar.dir}/lists"
includes="META-INF/LICENSE,META-INF/NOTICE"/>
</jar>
@@ -1788,13 +1771,13 @@
<param name="info.iname" value="_${locale.iname}"/>
<param name="info.ename" value="${locale.ename}"/>
<param name="info.productfile" value="derbyLocale_${locale.iname}.jar"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/locale_${locale.iname}/info.properties"/>
+ <param name="info.file" value="${out.locales.dir}/org/apache/derby/info/locale_${locale.iname}/info.properties"/>
</antcall>
<jar destfile="${derby.jar.dir}/derbyLocale_${locale.iname}.jar"
compress="true"
filesonly="true">
- <fileset dir="${out.dir}"
+ <fileset dir="${out.locales.dir}"
includes="org/apache/derby/info/*_${locale.iname}/info.properties,
org/apache/derby/loc/*_${locale.iname}.properties"
excludes="org/apache/derby/loc/clientmessages_${locale.iname}.properties"
@@ -1812,16 +1795,17 @@
<param name="info.buildnumber" value="${changenumber}"/>
<param name="info.iname" value="tsting"/>
<param name="info.productfile" value="derbyTesting.jar"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/tsting/info.properties"/>
+ <param name="info.file" value="${out.testing.dir}/org/apache/derby/info/tsting/info.properties"/>
</antcall>
<zip destfile="${derby.jar.dir}/derbyTesting.jar" filesonly="true" compress="true">
- <fileset dir="${out.dir}" includes="org/apache/derbyTesting/**,SimpleApp*,org/apache/derby/impl/tools/ij/mt*.class,org/apache/derby/impl/tools/ij/SimpleCharStream.class,org/apache/derby/impl/drda/TestProto.class,org/apache/derby/impl/store/access/conglomerate/QualifierUtil.class,org/apache/derby/loc/m*_qq_PP_testOnly*,toursdb/*,org/apache/derby/info/tsting/info.properties"/>
+ <fileset dir="${out.demo.dir}" includes="**"/>
+ <fileset dir="${out.testing.dir}" includes="org/apache/derbyTesting/**,org/apache/derby/info/tsting/**"/>
</zip>
</target>
<target name="ckderbytesting">
- <available file="${out.dir}/org/apache/derbyTesting"
+ <available file="${out.testing.dir}/org/apache/derbyTesting"
property="derbyTesting.available"/>
</target>
@@ -1830,7 +1814,7 @@
<param name="info.buildnumber" value="1"/>
<param name="info.iname" value="tsting"/>
<param name="info.productfile" value="derbyTesting.jar"/>
- <param name="info.file" value="${out.dir}/org/apache/derby/info/tsting/info.properties"/>
+ <param name="info.file" value="${out.testing.dir}/org/apache/derby/info/tsting/info.properties"/>
</antcall>
</target>
@@ -2136,8 +2120,8 @@
<antcall target="publishedapi"/>
<java classname="org.apache.derbyBuild.maintversion2props">
- <classpath path="${out.dir}"/>
- <arg value="${out.dir}/org/apache/derby/info/DBMS.properties"/>
+ <classpath path="${out.build.dir}"/>
+ <arg value="${out.engine.dir}/org/apache/derby/info/DBMS.properties"/>
<arg value="${snapshot.dir}/maintversion.properties"/>
</java>
<property file="${snapshot.dir}/maintversion.properties"/>
@@ -2240,7 +2224,7 @@
</condition>
<!-- Use classes-directory if not using jars and not overriden by user -->
- <condition property="derby.junit.classpath" value="${basedir}/classes">
+ <condition property="derby.junit.classpath" value="${out.all.dir}">
<not>
<or>
<isset property="derby.junit.classpath"/>
@@ -2284,7 +2268,7 @@
<target name="junit-sysinfo" depends="junit-init">
<java classname="org.apache.derby.tools.sysinfo"
output="junit_${derby.junit.timestamp}/sysinfo.txt">
- <classpath path="${out.dir}"/>
+ <classpath path="${out.all.dir}"/>
</java>
</target>
@@ -2525,8 +2509,18 @@
<classpath>
<pathelement location="${out.pptesting.dir}"/>
- <pathelement location="${out.dir}"/>
<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}"/>
+ <pathelement location="${out.run.dir}"/>
+ <pathelement location="${out.shared.dir}"/>
+ <pathelement location="${out.testing.dir}"/>
+ <pathelement location="${out.tools.dir}"/>
+ <pathelement location="${out.locales.dir}"/>
</classpath>
</junit>
</target>
@@ -2950,7 +2944,7 @@ you should not have to do this.
<taskdef
name="promptForProperty"
classname="org.apache.derbyPreBuild.PropertyPrompt"
- classpath="${out.dir}"
+ classpath="${out.build.dir}"
/>
</target>
@@ -3227,7 +3221,7 @@ you should not have to do this.
<taskdef
name="transformReleaseNotes"
classname="org.apache.derbyBuild.ReleaseNotesTransformer"
- classpath="${out.dir}"
+ classpath="${out.build.dir}"
/>
<transformReleaseNotes
inputFileName="${relnotes.src}"
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/JarDriftTest.java Sat Mar 10 16:24:00 2018
@@ -179,7 +179,7 @@ public class JarDriftTest {
// sanity=[false|true] except for some header/timestamp info).
String fs = File.separator;
String sanityFileName =
- topOfTree + fs + "generated" + fs + "java" + fs + "org" + fs +
+ topOfTree + fs + "generated" + fs + "java" + fs + "shared" + fs + "org" + fs +
"apache" + fs + "derby" + fs + "shared" + fs + "common" + fs +
"sanity" + fs + "state.properties";
File sanityFile = new File(sanityFileName);
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml Sat Mar 10 16:24:00 2018
@@ -36,7 +36,7 @@
<target name="build" depends="compile"/>
<target name="compile">
- <copy file="${derby.build.src.dir}/org/apache/derbyBuild/odbcgen_fragments.properties" tofile="${out.dir}/org/apache/derbyBuild/odbcgen_fragments.properties"/>
+ <copy file="${derby.build.src.dir}/org/apache/derbyBuild/odbcgen_fragments.properties" tofile="${out.build.dir}/org/apache/derbyBuild/odbcgen_fragments.properties"/>
<javac
source="${min.version}"
@@ -49,10 +49,12 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.build.src.dir}"
- destdir="${out.dir}">
+ destdir="${out.build.dir}">
<classpath>
<pathelement path="${java.home}/../lib/tools.jar"/>
<pathelement path="${ant.core.lib}"/>
+ <pathelement path="${out.shared.dir}"/>
+ <pathelement path="${out.engine.dir}"/>
</classpath>
<include name="org/apache/derbyBuild/**"/>
<compilerarg value="-Xlint:unchecked"/>
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyTesting.jar.lastcontents Sat Mar 10 16:24:00 2018
@@ -1,12 +1,14 @@
SimpleApp.class
-org.apache.derby.impl.tools.ij.SimpleCharStream.class
-org.apache.derby.impl.tools.ij.mtGrammar.class
-org.apache.derby.impl.tools.ij.mtGrammarConstants.class
-org.apache.derby.impl.tools.ij.mtGrammarTokenManager.class
-org.apache.derby.impl.tools.ij.mtTestCase.class
-org.apache.derby.impl.tools.ij.mtTestSuite.class
-org.apache.derby.impl.tools.ij.mtTester.class
-org.apache.derby.impl.tools.ij.mtTime.class
+WwdClientExample.class
+WwdEmbedded.class
+WwdUtils.class
+org.apache.derbyDemo.vtis.core.FlatFileVTI.class
+org.apache.derbyDemo.vtis.example.ApacheServerLogVTI.class
+org.apache.derbyDemo.vtis.example.DerbyJiraReportVTI.class
+org.apache.derbyDemo.vtis.example.LineListVTI.class
+org.apache.derbyDemo.vtis.example.PropertyFileVTI.class
+org.apache.derbyDemo.vtis.example.SubversionLogVTI.class
+toursdb.insertMaps.class
org.apache.derbyTesting.functionTests.harness.BackgroundStreamDrainer.class
org.apache.derbyTesting.functionTests.harness.BackgroundStreamSaver.class
org.apache.derbyTesting.functionTests.harness.CopySuppFiles.class
@@ -1035,4 +1037,3 @@ org.apache.derbyTesting.unitTests.store.
org.apache.derbyTesting.unitTests.store.commit_method.class
org.apache.derbyTesting.unitTests.util.BitUtil.class
org.apache.derbyTesting.unitTests.util.MsgTrace.class
-toursdb.insertMaps.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java Sat Mar 10 16:24:00 2018
@@ -125,13 +125,15 @@ public class splitmessages {
public static void main(String[] args) throws Exception {
Properties p = new Properties();
+ int idx = 0;
- File dir = new File(args[0]);
-
- File source = new File(args[1]);
+ File engineClassesDir = new File(args[idx++]);
+ File clientClassesDir = new File(args[idx++]);
+ File localesDir = new File(args[idx++]);
+ File source = new File(args[idx++]);
String s = source.getName();
- // loose the suffix
+ // lose the suffix
s = s.substring(0, s.lastIndexOf('.'));
// now get the locale
String locale = s.substring(s.indexOf('_'));
@@ -170,7 +172,7 @@ public class splitmessages {
if (c[i].size() == 0)
continue;
OutputStream fos = new BufferedOutputStream(
- new FileOutputStream(new File(dir, "m"+i+locale+".properties")), 16 * 1024);
+ new FileOutputStream(new File(localesDir, "m"+i+locale+".properties")), 16 * 1024);
c[i].store(fos, (String) null);
@@ -180,7 +182,7 @@ public class splitmessages {
if (addBase) {
// add duplicate english file as the base
fos = new BufferedOutputStream(
- new FileOutputStream(new File(dir, "m"+i+".properties")), 16 * 1024);
+ new FileOutputStream(new File(engineClassesDir, "m"+i+"_en.properties")), 16 * 1024);
c[i].store(fos, (String) null);
fos.flush();
fos.close();
@@ -195,7 +197,7 @@ public class splitmessages {
// there and what we added from the engine properties file) into
// the Derby locales directory
OutputStream clientOutStream = new BufferedOutputStream(
- new FileOutputStream(new File(dir, clientPropsFileName)),
+ new FileOutputStream(new File(clientClassesDir, clientPropsFileName)),
16 * 1024);
clientProps.store(clientOutStream, (String)null);
@@ -206,7 +208,7 @@ public class splitmessages {
{
// Save the English messages as the base
clientOutStream = new BufferedOutputStream(
- new FileOutputStream(new File(dir, "clientmessages.properties")),
+ new FileOutputStream(new File(clientClassesDir, "clientmessages.properties")),
16 * 1024);
clientProps.store(clientOutStream, (String)null);
Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/build.xml Sat Mar 10 16:24:00 2018
@@ -43,7 +43,7 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.build.src.dir}"
- destdir="${out.dir}"
+ destdir="${out.build.dir}"
includeantruntime="false">
<include name="org/apache/derbyPreBuild/** ../engine/org/apache/derby/iapi/services/info/PropertyNames.java"/>
<classpath>
Modified: db/derby/code/trunk/java/client/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/build.xml (original)
+++ db/derby/code/trunk/java/client/build.xml Sat Mar 10 16:24:00 2018
@@ -60,8 +60,11 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.client.src.dir}"
- destdir="${out.dir}">
+ destdir="${out.client.dir}">
<compilerarg value="-Xlint"/>
+ <classpath>
+ <pathelement location="${out.shared.dir}"/>
+ </classpath>
</javac>
</target>
Modified: db/derby/code/trunk/java/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Sat Mar 10 16:24:00 2018
@@ -45,11 +45,18 @@
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
- srcdir="nserverdemo"
- destdir="${out.dir}"
- includes="Simple*">
+ destdir="${out.demo.dir}"
+ srcdir="${derby.demo.src.dir}/nserverdemo"
+ includes="nserverdemo/**"
+ excludes="nserverdemo/Simple*">
<compilerarg value="-Xlint:unchecked"/>
<compilerarg value="-Xlint:deprecation"/>
+ <classpath>
+ <pathelement location="${out.shared.dir}"/>
+ <pathelement location="${out.drda.dir}"/>
+ <pathelement location="${out.engine.dir}"/>
+ <pathelement location="${out.tools.dir}"/>
+ </classpath>
</javac>
<javac
source="${min.version}"
@@ -61,12 +68,17 @@
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
- srcdir="."
- destdir="${out.dir}"
- includes="nserverdemo/**"
- excludes="nserverdemo/Simple*">
+ destdir="${out.demo.dir}"
+ srcdir="${derby.demo.src.dir}/vtis/java"
+ >
<compilerarg value="-Xlint:unchecked"/>
<compilerarg value="-Xlint:deprecation"/>
+ <classpath>
+ <pathelement location="${out.shared.dir}"/>
+ <pathelement location="${out.drda.dir}"/>
+ <pathelement location="${out.engine.dir}"/>
+ <pathelement location="${out.tools.dir}"/>
+ </classpath>
</javac>
<!-- "simple" demos under java/demo/ (SimpleApp) -->
<javac
@@ -80,12 +92,16 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.demo.src.dir}/simple"
- destdir="${out.dir}">
+ destdir="${out.demo.dir}">
+ <compilerarg value="-Xlint:unchecked"/>
+ <compilerarg value="-Xlint:deprecation"/>
<classpath>
+ <pathelement location="${out.shared.dir}"/>
+ <pathelement location="${out.drda.dir}"/>
+ <pathelement location="${out.engine.dir}"/>
+ <pathelement location="${out.tools.dir}"/>
<pathelement location="${javasrc.dir}"/>
</classpath>
- <compilerarg value="-Xlint:unchecked"/>
- <compilerarg value="-Xlint:deprecation"/>
</javac>
<javac
source="${min.version}"
@@ -98,7 +114,7 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.demo.src.dir}/workingwithderby"
- destdir="${out.dir}">
+ destdir="${out.demo.dir}">
<classpath>
<pathelement location="${javasrc.dir}"/>
</classpath>
@@ -133,9 +149,13 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.demo.src.dir}/vtis/java"
- destdir="${out.dir}">
+ destdir="${out.demo.dir}">
<compilerarg value="-Xlint:unchecked"/>
<compilerarg value="-Xlint:deprecation"/>
+ <classpath>
+ <pathelement location="${out.shared.dir}"/>
+ <pathelement location="${out.engine.dir}"/>
+ </classpath>
</javac>
</target>
Modified: db/derby/code/trunk/java/demo/toursdb/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/toursdb/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/build.xml (original)
+++ db/derby/code/trunk/java/demo/toursdb/build.xml Sat Mar 10 16:24:00 2018
@@ -48,7 +48,7 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.demo.src.dir}"
- destdir="${out.dir}">
+ destdir="${out.demo.dir}">
<include name="toursdb/insertMaps.java"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
@@ -71,7 +71,10 @@
failonerror="true"
dir="${derby.demo.src.dir}/toursdb" fork="true">
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.demo.dir}"/>
+ <pathelement path="${out.tools.dir}"/>
+ <pathelement path="${out.shared.dir}"/>
+ <pathelement path="${out.engine.dir}"/>
</classpath>
<sysproperty key="derby.system.home" value="${generated.toursdb.dir}"/>
</java>
@@ -85,7 +88,9 @@
failonerror="true"
dir="${derby.demo.src.dir}/toursdb" fork="true">
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.tools.dir}"/>
+ <pathelement path="${out.shared.dir}"/>
+ <pathelement path="${out.engine.dir}"/>
</classpath>
<sysproperty key="derby.system.home" value="${generated.toursdb.dir}"/>
<sysproperty key="ij.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
@@ -102,7 +107,7 @@
</target>
<target name="copyfiles">
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/demo">
+ <copy todir="${out.demo.dir}/${derby.testing.functest.dir}/tests/demo">
<fileset dir="${derby.demo.src.dir}/toursdb"
includes="*.sql,*.gif"/>
</copy>
Modified: db/derby/code/trunk/java/drda/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/build.xml (original)
+++ db/derby/code/trunk/java/drda/build.xml Sat Mar 10 16:24:00 2018
@@ -63,15 +63,18 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.drda.src.dir}"
- destdir="${out.dir}">
+ destdir="${out.drda.dir}">
<compilerarg value="-Xlint:unchecked"/>
<classpath>
<pathelement location="${servlet24}"/>
+ <pathelement location="${out.engine.dir}"/>
+ <pathelement location="${out.shared.dir}"/>
+ <pathelement location="${out.tools.dir}"/>
</classpath>
</javac>
<copy
- todir="${out.dir}/${derby.dir}/drda/"
+ todir="${out.drda.dir}/${derby.dir}/drda/"
file="${derby.drda.dir}/drda/server.policy"
/>
@@ -103,7 +106,7 @@
<delete file="${metadata.out.dir}/metadata.properties"/>
<copy file="${derby.metadata.src.dir}/metadata.properties" tofile="${metadata.out.dir}/metadata.properties"/>
<java classname="org.apache.derbyBuild.ODBCMetadataGenerator"
- classpath="${out.dir}"
+ classpath="${out.build.dir}:${out.engine.dir}"
dir="${metadata.out.dir}"
fork="yes"
failonerror="true">
@@ -120,7 +123,7 @@
<uptodate property="odbcgen.done"
targetfile="${odbc.donefile}" >
<srcfiles dir="${metadata.out.dir}" includes="metadata.properties" />
- <srcfiles dir="${out.dir}/org/apache/derbyBuild" includes="ODBCMetadataGenerator.class,odbcgen_fragments.properties" />
+ <srcfiles dir="${out.build.dir}/org/apache/derbyBuild" includes="ODBCMetadataGenerator.class,odbcgen_fragments.properties" />
</uptodate>
</target>
@@ -128,7 +131,7 @@
<available classname="org.apache.derbyBuild.ODBCMetadataGenerator"
property="odbcgen.available">
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.build.dir}"/>
</classpath>
</available>
</target>
Modified: db/derby/code/trunk/java/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/build.xml (original)
+++ db/derby/code/trunk/java/engine/build.xml Sat Mar 10 16:24:00 2018
@@ -63,10 +63,11 @@
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
- srcdir="${derby.engine.src.dir}:${generated.src.dir}"
- destdir="${out.dir}">
+ srcdir="${derby.engine.src.dir}:${generated.src.engine.dir}"
+ destdir="${out.engine.dir}">
<compilerarg value="-Xlint:unchecked"/>
<classpath>
+ <pathelement location="${out.shared.dir}"/>
<pathelement location="${osgi}"/>
</classpath>
</javac>
@@ -74,7 +75,7 @@
<ant dir="${derby.build.src.dir}"/>
<ant dir="${derby.locales.dir}"/>
- <copy todir="${out.dir}/${derby.dir}">
+ <copy todir="${out.engine.dir}/${derby.dir}">
<fileset dir="${derby.engine.dir}">
<include name="modules.properties"/>
</fileset>
@@ -82,17 +83,18 @@
<copy
file="${derby.engine.src.dir}/org/apache/derby/impl/jdbc/metadata.properties"
- tofile="${out.dir}/org/apache/derby/impl/jdbc/metadata.properties"/>
+ tofile="${out.engine.dir}/org/apache/derby/impl/jdbc/metadata.properties"/>
<copy
file="${derby.engine.src.dir}/org/apache/derby/impl/sql/catalog/metadata_net.properties"
- tofile="${out.dir}/org/apache/derby/impl/sql/catalog/metadata_net.properties"/>
+ tofile="${out.engine.dir}/org/apache/derby/impl/sql/catalog/metadata_net.properties"/>
</target>
<target name="parser" >
<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="directory" value="${derby.dir}/impl/sql/compile"/>
<property name="rmfiles" value="implparser_rm.files"/>
@@ -122,7 +124,7 @@
we delete the conflicting classes here.
-->
<delete>
- <fileset dir="${generated.src.dir}/${derby.dir}/impl/sql/compile">
+ <fileset dir="${generated.src.engine.dir}/${derby.dir}/impl/sql/compile">
<include name="CharStream.java"/>
<include name="ParseException.java"/>
<include name="Token.java"/>
@@ -131,7 +133,7 @@
<!-- Reduce the visibility of these files from public to package. -->
<replaceregexp match="^public (class|interface)" replace="\1" flags="m">
- <fileset dir="${generated.src.dir}/${derby.dir}/impl/sql/compile">
+ <fileset dir="${generated.src.engine.dir}/${derby.dir}/impl/sql/compile">
<include name="SQLParser.java"/>
<include name="SQLParserConstants.java"/>
<include name="SQLParserTokenManager.java"/>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/build.xml Sat Mar 10 16:24:00 2018
@@ -32,7 +32,7 @@
<taskdef
name="buildMessages"
classname="org.apache.derbyBuild.MessageBuilder"
- classpath="${out.dir}"
+ classpath="${out.build.dir}"
/>
<property name="messageDescriptors" value="${derby.locales.dir}/messages.xml"/>
<property name="englishMessages" value="${generated.engine.locale.dir}/messages_en.properties"/>
@@ -130,11 +130,15 @@
</target>
<target name="doSplit" depends="splitprops,verifysplit,noSplit,chksplit" unless="split.done">
- <mkdir dir="${loc.dir}"/>
+ <mkdir dir="${loc.engine.dir}"/>
+ <mkdir dir="${loc.client.dir}"/>
+ <mkdir dir="${loc.locales.dir}"/>
<java classname="org.apache.derbyBuild.splitmessages"
- classpath="${out.dir}"
+ classpath="${out.build.dir}:${out.shared.dir}"
failonerror="true">
- <arg value="${loc.dir}"/>
+ <arg value="${loc.engine.dir}"/>
+ <arg value="${loc.client.dir}"/>
+ <arg value="${loc.locales.dir}"/>
<arg value="${split.properties}"/>
</java>
<touch file="${split.donefile}"/>
@@ -142,7 +146,7 @@
<target name="splitprops">
<property name="split.properties" value="${msgdir}/${msgfile}.properties"/>
- <property name="split.donefile" value="${loc.dir}/${msgfile}.done"/>
+ <property name="split.donefile" value="${loc.engine.dir}/${msgfile}.done"/>
</target>
<target name="chksplit">
@@ -156,7 +160,8 @@
<available classname="org.apache.derbyBuild.splitmessages"
property="splitmsgs.available">
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.build.dir}"/>
+ <pathelement path="${out.shared.dir}"/>
</classpath>
</available>
</target>
Modified: db/derby/code/trunk/java/optional/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/optional/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/optional/build.xml (original)
+++ db/derby/code/trunk/java/optional/build.xml Sat Mar 10 16:24:00 2018
@@ -65,8 +65,11 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.optional.src.dir}:${generated.src.dir}"
- destdir="${out.dir}">
+ destdir="${out.optional.dir}">
<classpath>
+ <pathelement path="${out.shared.dir}"/>
+ <pathelement path="${out.engine.dir}"/>
+ <pathelement path="${out.tools.dir}"/>
<pathelement path="${lucene_core}"/>
<pathelement path="${lucene_a_co}"/>
<pathelement path="${lucene_qp}"/>
Modified: db/derby/code/trunk/java/run/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/run/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/run/build.xml (original)
+++ db/derby/code/trunk/java/run/build.xml Sat Mar 10 16:24:00 2018
@@ -65,10 +65,14 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.run.src.dir}:${generated.src.dir}"
- destdir="${out.dir}">
+ destdir="${out.run.dir}">
<include name="${derby.dir}/${cur.dir}/**"/>
<compilerarg value="-Xlint:unchecked"/>
<compilerarg value="-Xlint:deprecation"/>
+ <classpath>
+ <pathelement location="${out.drda.dir}"/>
+ <pathelement location="${out.tools.dir}"/>
+ </classpath>
</javac>
</target>
Modified: db/derby/code/trunk/java/shared/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/build.xml (original)
+++ db/derby/code/trunk/java/shared/build.xml Sat Mar 10 16:24:00 2018
@@ -62,8 +62,8 @@
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
- srcdir="${generated.src.dir}:${derby.shared.src.dir}"
- destdir="${out.dir}">
+ srcdir="${generated.src.shared.dir}:${derby.shared.src.dir}"
+ destdir="${out.shared.dir}">
<compilerarg value="-Xlint:unchecked"/>
</javac>
Modified: db/derby/code/trunk/java/storeless/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/storeless/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/storeless/build.xml (original)
+++ db/derby/code/trunk/java/storeless/build.xml Sat Mar 10 16:24:00 2018
@@ -72,7 +72,8 @@
srcdir="${derby.storeless.src.dir}"
destdir="${out.storeless.dir}">
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.engine.dir}"/>
+ <pathelement path="${out.shared.dir}"/>
</classpath>
<compilerarg value="-Xlint:unchecked"/>
</javac>
Modified: db/derby/code/trunk/java/testing/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/build.xml?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/build.xml (original)
+++ db/derby/code/trunk/java/testing/build.xml Sat Mar 10 16:24:00 2018
@@ -67,12 +67,20 @@
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.testing.src.dir}"
- destdir="${out.dir}">
+ destdir="${out.testing.dir}">
<compilerarg value="-Xlint"/>
<classpath>
+ <pathelement path="${out.shared.dir}"/>
+ <pathelement path="${out.engine.dir}"/>
+ <pathelement path="${out.client.dir}"/>
+ <pathelement path="${out.drda.dir}"/>
+ <pathelement path="${out.tools.dir}"/>
+ <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="${out.dir}"/>
- <pathelement path="${junit}"/>
<pathelement path="${lucene_core}"/>
<pathelement path="${lucene_a_co}"/>
<pathelement path="${lucene_qp}"/>
@@ -80,164 +88,164 @@
</classpath>
</javac>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/harness">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/harness">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/harness"
includes="*.properties"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/master">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/master">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/master"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/multi/stress">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/multi/stress">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/multi/stress"
includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/multi/stress/copyfiles.ant"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.suites.dir}">
+ <copy todir="${out.testing.dir}/${derby.testing.suites.dir}">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/suites" includes="*.runall,*.properties,*.exclude,*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/v1">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/testData/v1">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/v1"
includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/v1/copyfiles.ant"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/v2">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/testData/v2">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/v2"
includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/v2/copyfiles.ant"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/ImportExport">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/testData/ImportExport">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ImportExport"
includes="*.del,*.txt,*.dat"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/ResultSetStream">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/testData/ResultSetStream">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ResultSetStream"
includes="*.asc,*.del,*.txt,*.utf,*.gif"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/ConnectionMethods">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/testData/ConnectionMethods">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ConnectionMethods"
includes="*.txt"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/serializedDataSources">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/testData/serializedDataSources">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/serializedDataSources"
includes="*.ser"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/Derby6587">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/testData/Derby6587">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/Derby6587"
includes="*.csv"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/compatibility">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/compatibility">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/compatibility"
includes="*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/demo">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/demo">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/demo"
includes="*.sql,*.properties"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/derbynet">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/derbynet">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/derbynet"
includes="*.inc,*.policy,*.properties,*.sql,*.tests,*.key"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/engine">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/engine">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/engine"
includes="*.sql,*.properties,*.subsql,*.policy,*.jar,*.tstlog,xmlTestFiles/*"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/i18n">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/i18n">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/i18n"
includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/i18n/copyfiles.ant"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/i18n/data">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/i18n/data">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/i18n/data"
includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/i18n/data/copyfiles.ant"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/jdbc4">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/jdbc4">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbc4"
includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbc4/copyfiles.ant"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/jdbcapi">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/jdbcapi">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbcapi"
includes="*.gif,*.properties,*.sql,*.utf,*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/lang">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/lang">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/lang"
includes="*.sql,*.properties,*.subsql,*.policy,*.jar,*.dat,*.tstlog,*.trace,xmlTestFiles/*"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/largedata">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/largedata">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/largedata"
includes="*.sql,*.properties,*.subsql,*.policy,*.jar,*.dat,*.tstlog,xmlTestFiles/*"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/management">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/management">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/management"
includes="jmx.*,*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/memorydb">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/memorydb">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/memorydb"
includes="*.sql,*.properties"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/nist">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/nist">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/nist"
includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/nist/copyfiles.ant"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/perf">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/perf">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/perf"
includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/perf/copyfiles.ant"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/replicationTests">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/replicationTests">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/replicationTests" includes="*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/store">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/store">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/store"
includes="*.sql,*.properties,*.subsql,*.policy,*.jar,*.view,*banner,*.data"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/storetests">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/storetests">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/storetests"
includes="*.sql,*.properties,*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/tools">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/tools">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/tools"
includes="*.jar,*.sql,*.properties,*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/unit">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/tests/unit">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/unit"
includes="*.properties,*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.functest.dir}/util">
+ <copy todir="${out.testing.dir}/${derby.testing.functest.dir}/util">
<fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/util"
includes="*.sql,*.properties,*.policy"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.system.dir}/mailjdbc/schema">
+ <copy todir="${out.testing.dir}/${derby.testing.system.dir}/mailjdbc/schema">
<fileset dir="${derby.testing.src.dir}/${derby.testing.system.dir}/mailjdbc/schema"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.system.dir}/mailjdbc/">
+ <copy todir="${out.testing.dir}/${derby.testing.system.dir}/mailjdbc/">
<fileset dir="${derby.testing.src.dir}/${derby.testing.system.dir}/mailjdbc"
includes="*.properties"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.system.dir}/oe/schema">
+ <copy todir="${out.testing.dir}/${derby.testing.system.dir}/oe/schema">
<fileset dir="${derby.testing.src.dir}/${derby.testing.system.dir}/oe/schema"/>
</copy>
- <copy todir="${out.dir}/${derby.testing.unittest.dir}">
+ <copy todir="${out.testing.dir}/${derby.testing.unittest.dir}">
<fileset dir="${derby.testing.src.dir}/${derby.testing.unittest.dir}"
includes="**/*.policy"/>
</copy>
@@ -296,7 +304,8 @@
failonerror="true"
dir="${lang-test-dir}" fork="true">
<classpath>
- <pathelement path="${out.dir}"/>
+ <pathelement path="${out.tools.dir}"/>
+ <pathelement path="${out.shared.dir}"/>
</classpath>
<arg value="${lang-test-dir}/nast_init.sql"/>
</java>
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.policy?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.policy Sat Mar 10 16:24:00 2018
@@ -24,6 +24,6 @@
// The permissions below are expected to be added to the set of default
// permissions granted to the test framework.
//
-grant codeBase "${derbyTesting.testjar}derbyTesting.jar" {
+grant codeBase "${derbyTesting.testing}" {
permission java.lang.RuntimePermission "getProtectionDomain";
};
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy?rev=1826417&r1=1826416&r2=1826417&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy Sat Mar 10 16:24:00 2018
@@ -44,7 +44,7 @@
//
// Permissions for the embedded engine (derby.jar)
//
-grant codeBase "${derbyTesting.codejar}derby.jar" {
+grant codeBase "${derbyTesting.engine}" {
permission java.util.PropertyPermission "derby.*", "read";
permission java.util.PropertyPermission "derby.storage.jvmInstanceId",
"write";
@@ -97,7 +97,7 @@ grant codeBase "${derbyTesting.codejar}d
//
// Permissions for the network server (derbynet.jar)
//
-grant codeBase "${derbyTesting.codejar}derbynet.jar" {
+grant codeBase "${derbyTesting.netserver}" {
permission java.util.PropertyPermission "java.class.path", "read";//sysinfo
permission java.util.PropertyPermission "java.runtime.version", "read";//sysinfo
permission java.util.PropertyPermission "java.fullversion", "read";//sysinfo
@@ -124,7 +124,7 @@ grant codeBase "${derbyTesting.codejar}d
//
// Permissions for the network client (derbyclient.jar)
//
-grant codeBase "${derbyTesting.clientjar}derbyclient.jar" {
+grant codeBase "${derbyTesting.client}" {
permission java.net.SocketPermission "127.0.0.1", "connect,resolve";
permission java.net.SocketPermission "localhost", "connect,resolve";
permission java.net.SocketPermission "${derbyTesting.serverhost}", "connect,resolve";
@@ -148,7 +148,7 @@ grant codeBase "${derbyTesting.clientjar
// Ideally this would be more secure, for now the
// focus is on getting the engine & network server secure.
//
-grant codeBase "${derbyTesting.codejar}derbytools.jar" {
+grant codeBase "${derbyTesting.tools}" {
// Access all properties using System.getProperties -
// ij enumerates the properties in order to open connections
// for any property set in ij.connection.* and set protocols
@@ -172,7 +172,7 @@ grant codeBase "${derbyTesting.codejar}d
// We are liberal here, it's not a goal to make the test harness
// or tests secure.
//
-grant codeBase "${derbyTesting.testjar}derbyTesting.jar" {
+grant codeBase "${derbyTesting.testing}" {
// just add the complete gross policy change for ServerPropertiesTest
permission java.security.SecurityPermission "getPolicy";
@@ -198,58 +198,6 @@ grant codeBase "${derbyTesting.testjar}d
permission java.net.SocketPermission "localhost", "listen";
};
-//
-// super-set of the jar permissions for running out of the classes directory
-//
-grant codeBase "${derbyTesting.codeclasses}" {
-
- // just add the complete gross policy change for ServerPropertiesTest
- permission java.security.SecurityPermission "getPolicy";
-
- // Tests need to be able to exec a java program. DERBY-6295: Also give them
- // read permission so that detailed error message is shown.
- permission java.io.FilePermission "${java.home}${/}-", "execute, read";
-
- // Access all properties using System.getProperties
- permission java.util.PropertyPermission "*", "read, write";
-
- permission java.util.PropertyPermission "derby.*", "read";
- permission java.lang.RuntimePermission "createClassLoader";
- permission java.security.SecurityPermission "getPolicy";
-
- permission java.io.FilePermission "${derby.system.home}${/}derby.properties", "read";
- permission java.io.FilePermission "${derby.system.home}${/}derby.log", "read, write, delete";
- permission java.io.FilePermission "${derby.system.home}", "read";
- permission java.io.FilePermission "${derby.system.home}${/}-", "read, write, delete";
-
- // combination of client and server side.
- permission java.net.SocketPermission "127.0.0.1", "accept,connect,resolve";
- permission java.net.SocketPermission "localhost", "accept,connect,resolve,listen";
- permission java.net.SocketPermission "${derbyTesting.clienthost}", "accept,connect";
- permission java.net.SocketPermission "${derbyTesting.serverhost}", "connect,resolve";
-
- // Access all files under ${user.dir}to write the test directory structure
- // Also covers extin, extout and extinout locations
- permission java.io.FilePermission "${user.dir}${/}-", "read,write,delete";
-
- // These permissions are needed to load the JCE for encryption with Sun and IBM JDK131.
- // JDK14 has the JCE preloaded
- permission java.security.SecurityPermission "insertProvider.SunJCE";
- permission java.security.SecurityPermission "insertProvider.IBMJCE";
-
- // When running with useprocess=false need to install and uninstall
- // the security manager and allow setIO to change the system err and out
- // streams. Currently the nist suite runs with useprocess=false.
- permission java.lang.RuntimePermission "setSecurityManager";
- permission java.lang.RuntimePermission "setIO";
-
- // Needed by FileUtil#limitAccessToOwner
- permission java.lang.RuntimePermission "accessUserInformation";
- permission java.lang.RuntimePermission "getFileStoreAttributes";
-
- permission org.apache.derby.shared.common.security.SystemPermission "engine", "usederbyinternals";
-};
-
// JUnit jar file tries to read junit.properties in the user's
// home directory and seems to require permission to read the
// property user.home as well.