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 2017/12/21 01:35:16 UTC
svn commit: r1818865 - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/ java/build/org/apache/derbyBuild/eclipse/
java/client/org/apache/derby/client/am/ java/drda/org/apache/derby/drda/
java/drda/org/apache/derby/impl/drda/ java/engine/or...
Author: rhillegas
Date: Thu Dec 21 01:35:15 2017
New Revision: 1818865
URL: http://svn.apache.org/viewvc?rev=1818865&view=rev
Log:
DERBY-6945: Create new derbyshared.jar file to hold code which was previously coned across several jar files; commit derby-6945-02-ac-newDerbySharedJar.diff.
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java
db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy
db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/i18n/MessageUtil.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.policy
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java
db/derby/code/trunk/tools/jar/dnc.properties
db/derby/code/trunk/tools/jar/extraDBMSclasses.properties
db/derby/code/trunk/tools/jar/tools.properties
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Dec 21 01:35:15 2017
@@ -196,53 +196,69 @@
<target name="ckversioninfo">
<condition property="versioninfo.available">
<and>
- <available file="${out.dir}/org/apache/derby/info/DBMS.properties"/>
- <available file="${out.dir}/org/apache/derby/info/tools.properties"/>
- <available file="${out.dir}/org/apache/derby/info/net.properties"/>
- <available file="${out.dir}/org/apache/derby/info/dnc.properties"/>
+ <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"/>
</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"/>
<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/DBMS.properties"/>
+ <param name="info.file" value="${out.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.properties"/>
+ <param name="info.file" value="${out.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.properties"/>
+ <param name="info.file" value="${out.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/dnc.properties"/>
+ <param name="info.file" value="${out.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"/>
</antcall>
</target>
<target name="cleanversion">
- <delete file="${out.dir}/org/apache/derby/info/DBMS.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/tools.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/net.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/dnc.properties"/>
- <delete file="${out.dir}/org/apache/derby/info/tsting.properties"/>
+ <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"/>
</target>
<!-- Set the ant variables which identify the compiler classpaths. -->
@@ -339,11 +355,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}.properties"/>
+ <param name="info.file" value="${out.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}"/>
<propertyfile file="${info.file}" comment="${copyright.comment}">
<entry key="derby.locale.version.major" value="${major}"/>
<entry key="derby.locale.version.minor" value="${minor}"/>
@@ -1272,7 +1289,7 @@
<target
name="buildjars"
- depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyoptionaltoolsjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar,jardriftcheck"
+ depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyoptionaltoolsjar,derbysharedjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar,jardriftcheck"
description="Build all of the Derby jar files."
/>
@@ -1331,7 +1348,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/DBMS.properties"/>
+ <param name="info.file" value="${out.dir}//org/apache/derby/info/engine/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1364,22 +1381,20 @@
<fileset dir="${out.dir}"
includes="org/apache/derby/loc/m?_en.properties,
org/apache/derby/loc/m??_en.properties,
- org/apache/derby/loc/sysinfoMessages.properties,
- org/apache/derby/loc/toolsmessages.properties,
org/apache/derby/impl/jdbc/metadata.properties,
org/apache/derby/impl/sql/catalog/metadata_net.properties,
- org/apache/derby/info/DBMS.properties"/>
+ org/apache/derby/info/engine/info.properties"/>
<fileset dir="${derby.jar.dir}/lists"
includes="META-INF/**,
org/apache/derby/modules.properties"/>
- </jar>
+ </jar>
</target>
<!-- Add localized jars to the classpath -->
<target name="make-locale-classpath-manifest">
<manifest file="${manifest.file}" mode="${manifest.mode}">
- <attribute name="Class-Path" value="derbyLocale_cs.jar derbyLocale_de_DE.jar derbyLocale_es.jar derbyLocale_fr.jar derbyLocale_hu.jar derbyLocale_it.jar derbyLocale_ja_JP.jar derbyLocale_ko_KR.jar derbyLocale_pl.jar derbyLocale_pt_BR.jar derbyLocale_ru.jar derbyLocale_zh_CN.jar derbyLocale_zh_TW.jar"/>
+ <attribute name="Class-Path" value="derbyshared.jar derbyLocale_cs.jar derbyLocale_de_DE.jar derbyLocale_es.jar derbyLocale_fr.jar derbyLocale_hu.jar derbyLocale_it.jar derbyLocale_ja_JP.jar derbyLocale_ko_KR.jar derbyLocale_pl.jar derbyLocale_pt_BR.jar derbyLocale_ru.jar derbyLocale_zh_CN.jar derbyLocale_zh_TW.jar"/>
</manifest>
</target>
@@ -1391,9 +1406,6 @@
<attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>
<attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Sealed" value="true"/>
- <section name="org/apache/derby/impl/tools/sysinfo/">
- <attribute name="Sealed" value="false"/>
- </section>
<section name="org/apache/derby/iapi/services/context/">
<attribute name="Sealed" value="false"/>
</section>
@@ -1409,22 +1421,12 @@
<section name="org/apache/derby/iapi/services/i18n/">
<attribute name="Sealed" value="false"/>
</section>
- <section name="org/apache/derby/shared/common/error/">
- <attribute name="Sealed" value="false"/>
- </section>
- <!-- See DERBY-4669. -->
- <section name="org/apache/derby/shared/common/sanity/">
- <attribute name="Sealed" value="false"/>
- </section>
<section name="org/apache/derby/iapi/tools/i18n/">
<attribute name="Sealed" value="false"/>
</section>
<section name="org/apache/derby/loc/">
<attribute name="Sealed" value="false"/>
</section>
- <section name="org/apache/derby/tools/">
- <attribute name="Sealed" value="false"/>
- </section>
</manifest>
<antcall target="make-locale-classpath-manifest">
@@ -1462,7 +1464,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.properties"/>
+ <param name="info.file" value="${out.dir}/org/apache/derby/info/tools/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1482,7 +1484,7 @@
<fileset dir="${out.dir}"
includes="org/apache/derby/loc/sysinfoMessages.properties,
org/apache/derby/loc/toolsmessages.properties,
- org/apache/derby/info/tools.properties"/>
+ org/apache/derby/info/tools/info.properties"/>
<fileset dir="${derby.tools.src.dir}"
includes="org/apache/derby/impl/tools/planexporter/resources/*.xsl"/>
<fileset dir="${derby.jar.dir}/lists"
@@ -1507,7 +1509,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/optionaltools.properties"/>
+ <param name="info.file" value="${out.dir}/org/apache/derby/optional/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1564,7 +1566,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.properties"/>
+ <param name="info.file" value="${out.dir}/org/apache/derby/info/net/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1572,17 +1574,11 @@
<manifest file="${derby.jar.dir}/lists/smfnet.mf">
<attribute name="Main-Class" value="org.apache.derby.drda.NetworkServerControl"/>
- <attribute name="Class-Path" value="derby.jar"/>
+ <attribute name="Class-Path" value="derby.jar derbyshared.jar"/>
<attribute name="Sealed" value="true"/>
<section name="org/apache/derby/impl/drda/">
<attribute name="Sealed" value="false"/>
</section>
- <section name="org/apache/derby/impl/tools/sysinfo/">
- <attribute name="Sealed" value="false"/>
- </section>
- <section name="org/apache/derby/tools/">
- <attribute name="Sealed" value="false"/>
- </section>
<section name="org/apache/derby/loc/">
<attribute name="Sealed" value="false"/>
</section>
@@ -1600,8 +1596,7 @@
manifest="${derby.jar.dir}/lists/smfnet.mf">
<fileset dir="${out.dir}"
includes="org/apache/derby/loc/drda/**,
- org/apache/derby/loc/sysinfoMessages.properties,
- org/apache/derby/info/net.properties,
+ org/apache/derby/info/net/info.properties,
org/apache/derby/drda/server.policy"/>
<fileset dir="${derby.jar.dir}/lists"
includes="META-INF/**"/>
@@ -1640,7 +1635,7 @@
<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/dnc.properties"/>
+ <param name="info.file" value="${out.dir}/org/apache/derby/info/client/info.properties"/>
</antcall>
<!-- copy boilerplate common to derby jar files -->
@@ -1679,8 +1674,7 @@
<fileset dir="${out.dir}"
includesfile="${derby.jar.dir}/lists/dnc.list"/>
<fileset dir="${out.dir}"
- includes="org/apache/derby/info/dnc.properties,
- org/apache/derby/loc/sysinfoMessages.properties,
+ includes="org/apache/derby/info/client/info.properties,
org/apache/derby/loc/clientmessages*.properties"
excludes="org/apache/derby/loc/clientmessages_qq_PP_testOnly.properties"/>
<fileset dir="${derby.jar.dir}/lists"
@@ -1696,6 +1690,43 @@
</concat>
</target>
+<!-- - - - - - - - - - - - - - derbyshared.jar target - - - - - - - - - - - -->
+
+ <target name="derbysharedjar" depends="setsanityname">
+
+ <echo level="info" message="Beginning derbyshared.jar ${sanity.name} build"/>
+
+ <!-- purge lists directory to avoid unnecessary content from other jars -->
+ <delete>
+ <fileset dir="${derby.jar.dir}/lists" includes="**/*"/>
+ </delete>
+
+ <echo level="info" message=" creating new shared.properties file "/>
+ <antcall target="infowriter">
+ <param name="info.buildnumber" value="${changenumber}"/>
+ <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"/>
+ </antcall>
+
+ <!-- copy boilerplate common to derby jar files -->
+ <antcall target="meta-inf-common"/>
+ <antcall target="make-locale-classpath-manifest">
+ <param name="manifest.file" value="${derby.jar.dir}/lists/smfshared.mf"/>
+ <param name="manifest.mode" value="update"/>
+ </antcall>
+
+ <delete file="${derby.jar.dir}/derbyshared.jar"/>
+ <jar destfile="${derby.jar.dir}/derbyshared.jar"
+ basedir="${out.dir}"
+ includes="org/apache/derby/iapi/error/**,org/apache/derby/iapi/reference/**,org/apache/derby/iapi/services/info/**,org/apache/derby/shared/common/**,org/apache/derby/info/*.class,org/apache/derby/info/shared/info.properties"
+ compress="true"
+ filesonly="true"
+ manifest="${derby.jar.dir}/lists/smfshared.mf"/>
+
+ </target>
+
<!-- - - - - - - - - - - - - - derbyrun.jar target - - - - - - - - - -->
<target name="derbyrunjar" depends="setsanityname,initjars">
@@ -1712,7 +1743,7 @@
<manifest file="${derby.jar.dir}/lists/smfcmd.mf">
<attribute name="Main-Class" value="org.apache.derby.iapi.tools.run"/>
- <attribute name="Class-Path" value="derby.jar derbyclient.jar derbytools.jar derbynet.jar derbyoptionaltools.jar"/>
+ <attribute name="Class-Path" value="derby.jar derbyclient.jar derbytools.jar derbynet.jar derbyoptionaltools.jar derbyshared.jar"/>
</manifest>
<jar destfile="${derby.jar.dir}/derbyrun.jar"
@@ -1814,16 +1845,17 @@
<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}.properties"/>
+ <param name="info.file" value="${out.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}"
- includes="org/apache/derby/info/*_${locale.iname}.properties,
- org/apache/derby/loc/*_${locale.iname}.properties,
- org/apache/derby/loc/drda/*_${locale.iname}.properties"/>
+ 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"
+ />
<fileset dir="${derby.jar.dir}/lists"
includes="META-INF/LICENSE,META-INF/NOTICE"/>
</jar>
@@ -1837,11 +1869,11 @@
<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.properties"/>
+ <param name="info.file" value="${out.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.properties"/>
+ <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"/>
</zip>
</target>
@@ -1855,7 +1887,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.properties"/>
+ <param name="info.file" value="${out.dir}/org/apache/derby/info/tsting/info.properties"/>
</antcall>
</target>
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/classlister.java Thu Dec 21 01:35:15 2017
@@ -428,11 +428,21 @@ public class classlister {
//System.out.println("Skipping JAVAX " + className);
return;
}
- if (className.startsWith("sun.") && skipSun)
- {
- //System.out.println("Skipping Sun " + className);
- return;
- }
+ if (className.startsWith("sun.") && skipSun)
+ {
+ //System.out.println("Skipping Sun " + className);
+ return;
+ }
+
+ if (isSharedCode(className)) { return; }
+
+ // exclude sysinfo from the network server jar
+ if (
+ className.startsWith("org.apache.derby.impl.tools.sysinfo.") &&
+ (foundClasses.get("org.apache.derby.impl.drda.NetworkServerControlImpl") != null)
+ )
+ { return; }
+
if (className.startsWith("org.") && skipOrg)
{
// Allow opensource org.apache.derby classes
@@ -691,6 +701,16 @@ public class classlister {
name.startsWith("db2j.") ||
name.startsWith("org.apache.derby");
}
+ private boolean isSharedCode(String className)
+ {
+ return
+ (
+ className.startsWith("org.apache.derby.shared")
+ || className.startsWith("org.apache.derby.iapi.error")
+ || className.startsWith("org.apache.derby.iapi.reference")
+ || className.startsWith("org.apache.derby.iapi.services.info")
+ );
+ }
protected void showAllItems()
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/eclipse/DerbyEclipsePlugin.java Thu Dec 21 01:35:15 2017
@@ -140,7 +140,7 @@ public class DerbyEclipsePlugin{
* @exception Exception if there is an error
*/
private void getProps() throws Exception{
- InputStream versionStream = getClass().getResourceAsStream(ProductGenusNames.DBMS_INFO);
+ InputStream versionStream = getClass().getResourceAsStream("/" + ProductGenusNames.DBMS_INFO);
Properties prop=new Properties();
prop.load(versionStream);
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java Thu Dec 21 01:35:15 2017
@@ -148,7 +148,7 @@ public class Configuration {
new PrivilegedExceptionAction<ProductVersionHolder>() {
public ProductVersionHolder run() throws IOException {
- InputStream versionStream = getClass().getResourceAsStream(ProductGenusNames.DNC_INFO);
+ InputStream versionStream = getClass().getResourceAsStream("/" + ProductGenusNames.CLIENT_INFO);
return ProductVersionHolder.getProductVersionHolderFromMyEnv(versionStream);
}
Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/server.policy Thu Dec 21 01:35:15 2017
@@ -105,6 +105,23 @@ grant codeBase "${derby.install.url}derb
permission java.lang.RuntimePermission "getFileStoreAttributes";
};
+//
+// Permissions for shared code (derbyshared.jar)
+//
+grant codeBase "${derby.install.url}derbyshared.jar" {
+//
+// Permissions needed for JMX based management and monitoring, which is only
+// available for JVMs supporting "platform management", that is J2SE 5.0 or better.
+//
+ // Gives permission for jmx to be used against Derby but
+ // only if JMX authentication is not being used.
+ // In that case the application would need to create
+ // a whole set of fine-grained permissions to allow specific
+ // users access to MBeans and actions they perform.
+ permission org.apache.derby.security.SystemPermission "engine", "monitor";
+ permission org.apache.derby.security.SystemPermission "server", "monitor";
+};
+
grant codeBase "${derby.install.url}derbynet.jar"
{
Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/template.policy Thu Dec 21 01:35:15 2017
@@ -96,6 +96,22 @@ grant codeBase "${derby.install.url}derb
permission java.lang.RuntimePermission "getFileStoreAttributes";
};
+//
+// Permissions for shared code (derbyshared.jar)
+//
+grant codeBase "${derby.install.url}derbyshared.jar" {
+//
+// Permissions needed for JMX based management and monitoring, which is only
+// available for JVMs supporting "platform management", that is J2SE 5.0 or better.
+//
+ // Gives permission for jmx to be used against Derby but
+ // only if JMX authentication is not being used.
+ // In that case the application would need to create
+ // a whole set of fine-grained permissions to allow specific
+ // users access to MBeans and actions they perform.
+ permission org.apache.derby.security.SystemPermission "engine", "monitor";
+ permission org.apache.derby.security.SystemPermission "server", "monitor";
+};
grant codeBase "${derby.install.url}derbynet.jar"
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Thu Dec 21 01:35:15 2017
@@ -4242,7 +4242,7 @@ public final class NetworkServerControlI
throws UnknownHostException, IOException {
InputStream versionStream =
getClass().getResourceAsStream(
- ProductGenusNames.NET_INFO);
+ "/" + ProductGenusNames.NET_INFO);
return ProductVersionHolder.
getProductVersionHolderFromMyEnv(versionStream);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java Thu Dec 21 01:35:15 2017
@@ -43,28 +43,23 @@ package org.apache.derby.iapi.services.i
*/
public interface ProductGenusNames
{
-
/**Genus name for dbms products.*/
- public static String DBMS = "DBMS";
- public static String DBMS_INFO = "/org/apache/derby/info/DBMS.properties";
+ public static String DBMS_INFO = "org/apache/derby/info/engine/info.properties";
/**Genus name for tools products.*/
- public static String TOOLS = "tools";
- public static String TOOLS_INFO = "/org/apache/derby/info/tools.properties";
+ public static String TOOLS_INFO = "org/apache/derby/info/tools/info.properties";
/**Genus name for net products.*/
- public static String NET = "net";
- public static String NET_INFO = "/org/apache/derby/info/net.properties";
+ public static String NET_INFO = "org/apache/derby/info/net/info.properties";
/**Genus name for network client */
- public static String DNC = "dnc";
- public static String DNC_INFO = "/org/apache/derby/info/dnc.properties";
+ public static String CLIENT_INFO = "org/apache/derby/info/client/info.properties";
+ /**Genus name for shared code */
+ public static String SHARED_INFO = "org/apache/derby/info/shared/info.properties";
/**Genus name for optional tools */
- public static String OPTIONALTOOLS = "optionaltools";
- public static String OPTIONAL_TOOLS_INFO = "/org/apache/derby/optional/optionaltools.properties";
-
+ public static String OPTIONAL_INFO = "org/apache/derby/optional/info.properties";
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java Thu Dec 21 01:35:15 2017
@@ -530,7 +530,7 @@ public final class ProductVersionHolder
}
// SECURITY PERMISSION - IP4
private Properties loadProperties(String productGenus) {
- String resourceName = "/org/apache/derby/info/" + productGenus+".properties";
+ String resourceName = "/org/apache/derby/info/" + productGenus+"/info.properties";
InputStream is = getClass().getResourceAsStream(resourceName);
if (is==null) {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java Thu Dec 21 01:35:15 2017
@@ -118,7 +118,7 @@ public final class FileMonitor extends B
daemonGroup = createDaemonGroup();
}
- InputStream versionStream = getClass().getResourceAsStream(ProductGenusNames.DBMS_INFO);
+ InputStream versionStream = getClass().getResourceAsStream("/" + ProductGenusNames.DBMS_INFO);
engineVersion = ProductVersionHolder.getProductVersionHolderFromMyEnv(versionStream);
Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/i18n/MessageUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/i18n/MessageUtil.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/i18n/MessageUtil.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/i18n/MessageUtil.java Thu Dec 21 01:35:15 2017
@@ -1,5 +1,5 @@
/*
- Derby - Class org.apache.derby.common.i18n.MessageUtil
+ Derby - Class org.apache.derby.shared.common.i18n.MessageUtil
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/FileCompare.java Thu Dec 21 01:35:15 2017
@@ -33,6 +33,8 @@ import java.io.*;
import java.util.StringTokenizer;
import java.util.Properties;
+import org.apache.derby.iapi.services.info.ProductGenusNames;
+
public class FileCompare
{
@@ -109,7 +111,7 @@ public class FileCompare
else {
// if this is using product jars, use product_master first
Class c = FileCompare.class; // get our class loader
- InputStream is = c.getResourceAsStream("/org/apache/derby/info/DBMS.properties");
+ InputStream is = c.getResourceAsStream("/" + ProductGenusNames.DBMS_INFO);
Properties dbprop = new Properties();
dbprop.load(is);
is.close();
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy Thu Dec 21 01:35:15 2017
@@ -144,6 +144,34 @@ grant codeBase "${derbyTesting.codejar}d
};
//
+// Permissions for shared code (derbyshared.jar)
+//
+grant codeBase "${derbyTesting.codejar}derbyshared.jar" {
+ // These permissions are needed by AssertFailure to dump the thread stack
+ // traces upon failure.
+ permission java.lang.RuntimePermission "getStackTrace";
+ permission java.lang.RuntimePermission "modifyThreadGroup";
+
+ // DERBY-2302: derbyclient.jar needs to be able to read the user.dir property in order to
+ // do tracing in that directory. Also, it needs read/write permissions in user.dir in order
+ // to create the trace files in that directory.
+ permission java.util.PropertyPermission "user.dir", "read";
+ permission java.io.FilePermission "${user.dir}${/}-", "read, write";
+
+ //
+ // Permissions needed for JMX based management and monitoring, which is only
+ // available for JVMs supporting "platform management", that is J2SE 5.0 or better.
+ //
+ // Gives permission for jmx to be used against Derby but
+ // only if JMX authentication is not being used.
+ // In that case the application would need to create
+ // a whole set of fine-grained permissions to allow specific
+ // users access to MBeans and actions they perform.
+ permission org.apache.derby.security.SystemPermission "engine", "monitor";
+ permission org.apache.derby.security.SystemPermission "server", "monitor";
+};
+
+//
// Permissions for the network server (derbynet.jar)
//
grant codeBase "${derbyTesting.codejar}derbynet.jar" {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java Thu Dec 21 01:35:15 2017
@@ -334,7 +334,7 @@ public final class SecurityManagerSetup
* <P>
* Jar files:
* <BR>
- * derbyTesting.codejar - URL of derby.jar,
+ * derbyTesting.codejar - URL of derby.jar, derbyshared.jar,
* derbynet.jar and derbytools.jar, all assumed to be in the
* same location.
* <BR>
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java Thu Dec 21 01:35:15 2017
@@ -38,6 +38,8 @@ import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
+import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
+
/**
* Class which holds information about the configuration of a Test.
*
@@ -154,8 +156,10 @@ public final class TestConfiguration {
final File dsh = new File("system");
+ String absolutePath = PrivilegedFileOpsForTests.getAbsolutePath(dsh);
+
BaseTestCase.setSystemProperty(
- "derby.system.home", dsh.getAbsolutePath());
+ "derby.system.home", absolutePath);
}
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.policy?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.policy Thu Dec 21 01:35:15 2017
@@ -107,6 +107,18 @@ grant codeBase "${derbyTesting.codejar}d
permission java.lang.RuntimePermission "getProtectionDomain";
};
+grant codeBase "${derbyTesting.codejar}derbyshared.jar" {
+//These are the ones that matters:
+//-----------------------------------------------------------------------------
+ permission java.lang.RuntimePermission "getStackTrace";
+ permission java.lang.RuntimePermission "modifyThreadGroup";
+//-----------------------------------------------------------------------------
+
+// getProtectionDomain is an optional permission needed for printing classpath
+// information to derby.log
+ permission java.lang.RuntimePermission "getProtectionDomain";
+};
+
grant codeBase "${derbyTesting.codejar}derbyclient.jar" {
//These are the ones that matters:
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/utilMain.java Thu Dec 21 01:35:15 2017
@@ -219,7 +219,7 @@ public class utilMain {
// figure out which version this is
InputStream versionStream = util.getResourceAsStream(
- ProductGenusNames.TOOLS_INFO);
+ "/" + ProductGenusNames.TOOLS_INFO);
// figure out which version this is
ProductVersionHolder ijVersion =
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Thu Dec 21 01:35:15 2017
@@ -451,7 +451,7 @@ public static void getMainInfo (java.io.
for (int i = 0; i < stringLocales.length; i++) {
String localeResource =
- "/org/apache/derby/info/locale_" + stringLocales[i] + ".properties";
+ "/org/apache/derby/info/locale_" + stringLocales[i] + "/info.properties";
final Properties finalp = p;
final String finalLocaleResource = localeResource;
@@ -460,15 +460,16 @@ public static void getMainInfo (java.io.
InputStream is = AccessController.doPrivileged
(new PrivilegedAction<InputStream>() {
public InputStream run() {
+ Class loadingClass = Main.class;
InputStream locis =
- finalp.getClass().getResourceAsStream (finalLocaleResource);
+ loadingClass.getResourceAsStream (finalLocaleResource);
return locis;
}
}
);
if (is == null) {
-// localAW.println("resource is null: " + localeResource);
+ //localAW.println("resource is null: " + localeResource);
}
else {
@@ -540,7 +541,7 @@ public static void getMainInfo (java.io.
String hdr="org.apache.derbyTesting.*:";
Properties p = new Properties ();
- String tstingResource ="/org/apache/derby/info/tsting.properties";
+ String tstingResource ="/org/apache/derby/info/tsting/info.properties";
final Properties finalp = p;
final String finalTstingResource = tstingResource;
@@ -548,8 +549,9 @@ public static void getMainInfo (java.io.
InputStream is = AccessController.doPrivileged
(new PrivilegedAction<InputStream>() {
public InputStream run() {
+ Class loadingClass = Main.class;
InputStream is =
- finalp.getClass().getResourceAsStream (finalTstingResource);
+ loadingClass.getResourceAsStream (finalTstingResource);
return is;
}
});
@@ -865,29 +867,15 @@ public static void getMainInfo (java.io.
** Code related to loading info fromjar files.
*/
- private static final String infoNames[] = {
-
- "org/apache/derby/info/" +
- org.apache.derby.iapi.services.info.ProductGenusNames.DBMS +
- ".properties",
-
-
- "org/apache/derby/info/" +
- org.apache.derby.iapi.services.info.ProductGenusNames.TOOLS +
- ".properties",
-
- "org/apache/derby/info/" +
- org.apache.derby.iapi.services.info.ProductGenusNames.NET +
- ".properties",
-
- "org/apache/derby/info/" +
- org.apache.derby.iapi.services.info.ProductGenusNames.DNC +
- ".properties",
-
- "org/apache/derby/optional/" +
- org.apache.derby.iapi.services.info.ProductGenusNames.OPTIONALTOOLS +
- ".properties",
- };
+ private static final String infoNames[] =
+ {
+ org.apache.derby.iapi.services.info.ProductGenusNames.DBMS_INFO,
+ org.apache.derby.iapi.services.info.ProductGenusNames.TOOLS_INFO,
+ org.apache.derby.iapi.services.info.ProductGenusNames.NET_INFO,
+ org.apache.derby.iapi.services.info.ProductGenusNames.CLIENT_INFO,
+ org.apache.derby.iapi.services.info.ProductGenusNames.SHARED_INFO,
+ org.apache.derby.iapi.services.info.ProductGenusNames.OPTIONAL_INFO,
+ };
/**
* Get all the info we can obtain from the local execution context
Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java Thu Dec 21 01:35:15 2017
@@ -60,7 +60,7 @@ public class sysinfo {
The genus name for the Apache Derby code. Use this to determine the version of the
Apache Derby embedded code in derby.jar.
*/
- public static final String DBMS="DBMS";
+ public static final String DBMS="engine";
/**
* The genus name for the tools code. Use this to determine the version of
@@ -78,7 +78,7 @@ public class sysinfo {
* The genus name for the client code. Use this to determine the version of
code in derbyclient.jar
*/
- public static final String CLIENT="dnc";
+ public static final String CLIENT="client";
/**
* The genus name for the optional tools code. Use this to determine the version of
Modified: db/derby/code/trunk/tools/jar/dnc.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/dnc.properties?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/dnc.properties (original)
+++ db/derby/code/trunk/tools/jar/dnc.properties Thu Dec 21 01:35:15 2017
@@ -15,7 +15,6 @@
derby.module.client.driver=org.apache.derby.jdbc.ClientDriver
derby.module.client.40driver=org.apache.derby.jdbc.ClientDriver40
-derby.module.client.sysinfo=org.apache.derby.tools.sysinfo
derby.module.client.dsfactory=org.apache.derby.client.ClientDataSourceFactory
@@ -33,4 +32,3 @@ derby.module.client.xads=org.apache.derb
derby.module.client.40xads=org.apache.derby.jdbc.ClientXADataSource40
derby.module.client.40njxads=org.apache.derby.jdbc.BasicClientXADataSource40
-derby.module.shared.threaddump=org.apache.derby.shared.common.sanity.ThreadDump
Modified: db/derby/code/trunk/tools/jar/extraDBMSclasses.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/extraDBMSclasses.properties?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/extraDBMSclasses.properties (original)
+++ db/derby/code/trunk/tools/jar/extraDBMSclasses.properties Thu Dec 21 01:35:15 2017
@@ -20,7 +20,6 @@ derby.module.mbeans.mgmt=org.apache.derb
derby.module.a=org.apache.derby.jdbc.EmbeddedDriver
derby.module.b=org.apache.derby.impl.services.monitor.BaseMonitor
derby.module.uuidtype=org.apache.derby.catalog.UUID
-derby.module.sysinfo=org.apache.derby.tools.sysinfo
derby.module.database.PropInfo=org.apache.derby.iapi.db.PropertyInfo
derby.module.database.Factory=org.apache.derby.iapi.db.Factory
derby.module.aggs.MaxMinAggDef=org.apache.derby.impl.sql.compile.MaxMinAggregateDefinition
@@ -107,9 +106,6 @@ derby.module.store.jardbf=org.apache.der
derby.module.store.urlf=org.apache.derby.impl.io.URLFile
derby.module.store.cpf=org.apache.derby.impl.io.CPFile
-derby.module.shared.threaddump=org.apache.derby.shared.common.sanity.ThreadDump
-derby.module.engine.threaddump=org.apache.derby.iapi.error.ThreadDump
-
derby.module.logging.provider=org.apache.derby.impl.services.stream.RollingFileStreamProvider
derby.module.logging.stream=org.apache.derby.impl.services.stream.RollingFileStream
Modified: db/derby/code/trunk/tools/jar/tools.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/tools.properties?rev=1818865&r1=1818864&r2=1818865&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/tools.properties (original)
+++ db/derby/code/trunk/tools/jar/tools.properties Thu Dec 21 01:35:15 2017
@@ -26,10 +26,9 @@ derby.module.ij=org.apache.derby.tools.i
derby.module.ij.xaHelper=org.apache.derby.impl.tools.ij.xaHelper
derby.module.Attribute=org.apache.derby.iapi.reference.Attribute
derby.module.cslook=org.apache.derby.tools.dblook
-derby.module.sysinfo=org.apache.derby.tools.sysinfo
derby.module.SignatureChecker=org.apache.derby.tools.SignatureChecker
derby.module.planexporter=org.apache.derby.tools.PlanExporter
derby.module.dbmdwrapper=org.apache.derby.impl.tools.optional.DBMDWrapper
derby.module.fdbv=org.apache.derby.impl.tools.optional.ForeignDBViews
-
+derby.module.sysinfo=org.apache.derby.tools.sysinfo