db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1583505 - in /db/derby/code/trunk: ./ java/engine/org/apache/derby/iapi/services/info/ java/testing/org/apache/derbyTesting/functionTests/tests/lang/ java/tools/org/apache/derby/impl/tools/sysinfo/ java/tools/org/apache/derby/tools/ tools/...
Date Tue, 01 Apr 2014 01:27:57 GMT
Author: rhillegas
Date: Tue Apr  1 01:27:56 2014
New Revision: 1583505

URL: http://svn.apache.org/r1583505
Log:
DERBY-590: Move the Lucene plugin into a new derbyoptionaltools.jar file; commit derby-590-12-aa-newJar.diff.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy
    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/extraDBMSclasses.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1583505&r1=1583504&r2=1583505&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Apr  1 01:27:56 2014
@@ -1362,7 +1362,7 @@
 
   <target
       name="buildjars"
-      depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar"
+      depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyoptionaltoolsjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar"
       description="Build all of the Derby jar files."
   />
 
@@ -1586,6 +1586,45 @@
     </jar>
   </target>
 
+<!-- - - - - - - - - - - - -  derbyoptionaltools.jar target - - - - - - - - - - -->
+
+  <target name="derbyoptionaltoolsjar" depends="setsanityname">
+
+    <echo level="info" message="Beginning derbyoptionaltools.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 tools.properties file "/>
+    <antcall target="infowriter">
+      <param name="info.buildnumber" value="${changenumber}"/>
+      <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"/>
+    </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/smfoptionaltools.mf"/>
+        <param name="manifest.mode" value="replace"/>
+    </antcall>
+
+    <delete file="${derby.jar.dir}/derbyoptionaltools.jar"/>
+    <jar destfile="${derby.jar.dir}/derbyoptionaltools.jar"
+         basedir="${out.dir}"
+         includes="org/apache/derby/optional/**"
+         manifest="${derby.jar.dir}/lists/smfoptionaltools.mf"
+         compress="true"
+         filesonly="true">
+      <fileset dir="${derby.jar.dir}/lists"
+               includes="META-INF/**"/>
+    </jar>
+  </target>
+
 <!-- - - - - - - - - - - - - - derbynet.jar target - - - - - - - - - - - -->
 
   <target name="derbynetjar" depends="setsanityname">
@@ -1755,7 +1794,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"/>
+      <attribute name="Class-Path" value="derby.jar derbyclient.jar derbytools.jar derbynet.jar
derbyoptionaltools.jar"/>
     </manifest> 
  	
     <jar destfile="${derby.jar.dir}/derbyrun.jar"

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=1583505&r1=1583504&r2=1583505&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
Tue Apr  1 01:27:56 2014
@@ -60,6 +60,11 @@ public interface ProductGenusNames
 	public static String DNC = "dnc";
 	public static String DNC_INFO = "/org/apache/derby/info/dnc.properties";
 
+
+	/**Genus name for optional tools */
+	public static String OPTIONALTOOLS = "optionaltools";
+	public static String OPTIONAL_TOOLS_INFO = "/org/apache/derby/optional/optionaltools.properties";
+
 }
 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy?rev=1583505&r1=1583504&r2=1583505&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/luceneSupport.policy
Tue Apr  1 01:27:56 2014
@@ -140,13 +140,6 @@ grant codeBase "${derbyTesting.codejar}d
   // This permission is needed to call DriverManager.deregisterDriver()
   // on Java SE 8 and later.
   permission java.sql.SQLPermission "deregisterDriver";
-
-  // extra permissions needed for the Lucene plugin
-  permission java.io.FilePermission "${derbyTesting.lucene.core.jar.file}", "read";
-  permission java.util.PropertyPermission "user.dir", "read";
-  permission java.lang.RuntimePermission "accessDeclaredMembers";
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
-  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
 
 //
@@ -454,6 +447,23 @@ grant codeBase "${derbyTesting.ppcodecla
   permission java.io.FilePermission "${user.dir}${/}extin${/}-", "read";
 };
 
+//
+// Permissions for the optional tools (derbyoptionaltools.jar)
+//
+grant codeBase "${derbyTesting.codejar}derbyoptionaltools.jar" {
+  permission java.util.PropertyPermission "derby.system.home", "read";
+
+  // all databases under derby.system.home 
+  permission java.io.FilePermission "${derby.system.home}${/}dbsqlauth${/}lucene", "read,write,delete";
+  permission java.io.FilePermission "${derby.system.home}${/}dbsqlauth${/}lucene${/}-", "read,write,delete";
+
+  permission java.io.FilePermission "${derbyTesting.lucene.core.jar.file}", "read";
+  permission java.util.PropertyPermission "user.dir", "read";
+  permission java.lang.RuntimePermission "accessDeclaredMembers";
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
+  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+};
+
 // Permissions for the Lucene plugin
 grant codeBase "${derbyTesting.lucene.core}"
 {

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=1583505&r1=1583504&r2=1583505&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 Tue Apr 
1 01:27:56 2014
@@ -881,7 +881,11 @@ public static void getMainInfo (java.io.
 
                                    "org/apache/derby/info/" +
                                     org.apache.derby.iapi.services.info.ProductGenusNames.DNC
+
-                                    ".properties"
+                                    ".properties",
+
+                                   "org/apache/derby/optional/" +
+                                    org.apache.derby.iapi.services.info.ProductGenusNames.OPTIONALTOOLS
+
+                                    ".properties",
                                 };
 
     /**

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=1583505&r1=1583504&r2=1583505&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 Tue Apr  1 01:27:56
2014
@@ -80,6 +80,12 @@ public class sysinfo {
 	 */
 	public static final String CLIENT="dnc";
 
+	/**
+	 *	The genus name for the optional tools code. Use this to determine the version of 
+		code in derbyoptionaltools.jar
+	 */
+	public static final String OPTIONALTOOLS="optionaltools";
+
 
 	/**
 		gets the major version of the Apache Derby embedded code.

Modified: db/derby/code/trunk/tools/jar/extraDBMSclasses.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/extraDBMSclasses.properties?rev=1583505&r1=1583504&r2=1583505&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/extraDBMSclasses.properties (original)
+++ db/derby/code/trunk/tools/jar/extraDBMSclasses.properties Tue Apr  1 01:27:56 2014
@@ -117,4 +117,3 @@ derby.module.logging.stream=org.apache.d
 # optional tools
 derby.module.opttrace=org.apache.derby.impl.sql.compile.OptimizerTracer
 derby.module.opttraceviewer=org.apache.derby.impl.sql.compile.OptTraceViewer
-derby.module.lucenespt=org.apache.derby.optional.lucene.LuceneSupport



Mime
View raw message