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 fu...@apache.org on 2006/03/08 03:52:35 UTC
svn commit: r384101 - in /db/derby/code/trunk: ./ java/tools/
java/tools/org/apache/derby/iapi/tools/ java/tools/org/apache/derby/loc/
tools/jar/
Author: fuzzylogic
Date: Tue Mar 7 18:52:33 2006
New Revision: 384101
URL: http://svn.apache.org/viewcvs?rev=384101&view=rev
Log:
DERBY-1063: Add derbyrun.jar - new jar file to execute tools with java -jar
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/tools/build.xml
db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml
db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java
db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
db/derby/code/trunk/tools/jar/tools.properties
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=384101&r1=384100&r2=384101&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Mar 7 18:52:33 2006
@@ -301,6 +301,7 @@
<target name="drda" depends="engine">
<ant dir="${derby.drda.src.dir}"/>
+ <ant dir="${derby.tools.src.dir}" target="tools_run"/>
</target>
<target name="client" depends="engine,shared">
@@ -695,8 +696,8 @@
<!-- Jar targets -->
<!-- =================================================================== -->
- <target name="buildjarsclean" depends="cleanjars,initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbywar,derbylocalejars,derbytestingjar"/>
- <target name="buildjars" depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbywar,derbylocalejars,derbytestingjar"/>
+ <target name="buildjarsclean" depends="cleanjars,initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar"/>
+ <target name="buildjars" depends="initjars,derbyjar,derbytoolsjar,derbynetjar,derbyclientjar,derbyrunjar,derbywar,derbylocalejars,derbytestingjar"/>
<target name="initjars" depends="setsanityname,getsvnversion">
<property name="derby.jar.dir" value="${basedir}/jars/${sanity.name}"/>
@@ -951,16 +952,11 @@
<fileset dir="${basedir}" includes="LICENSE*,NOTICE*,COPYRIGHT*"/>
</copy>
- <manifest file="${derby.jar.dir}/lists/smftools.mf">
- <attribute name="Main-Class" value="org.apache.derby.iapi.tools.run"/>
- </manifest>
-
<delete file="${derby.jar.dir}/derbytools.jar"/>
<jar destfile="${derby.jar.dir}/derbytools.jar"
basedir="${out.dir}"
includesfile="${derby.jar.dir}/lists/derbytools.list"
compress="true"
- manifest="${derby.jar.dir}/lists/smftools.mf"
filesonly="true"/>
<jar destfile="${derby.jar.dir}/derbytools.jar"
compress="true"
@@ -1080,16 +1076,47 @@
manifest="${derby.jar.dir}/lists/smfclient.mf">
<fileset dir="${out.dir}"
includes="org/apache/derby/client/**,
- org/apache/derby/client/jdbc/Client**,org/apache/derby/jdbc/Client**,org/apache/derby/iapi/services/info/**,
+ org/apache/derby/client/jdbc/Client**,
+ org/apache/derby/jdbc/Client**,
+ org/apache/derby/iapi/services/info/**,
org/apache/derby/shared/**,
org/apache/derby/info/dnc.properties,
org/apache/derby/loc/clientmessages*.properties"
- excludes="org/apache/derby/shared/common/reference/**"/>
+ excludes="org/apache/derby/iapi/services/info/JVMInfo.class,
+ org/apache/derby/shared/common/reference/**"/>
<fileset dir="${derby.jar.dir}/lists"
includes="META-INF/**"/>
</jar>
</target>
+<!-- - - - - - - - - - - - - - derbyrun.jar target - - - - - - - - - -->
+
+ <target name="derbyrunjar" depends="setsanityname,initjars">
+
+ <echo message="Beginning derbyrun.jar build"/>
+
+ <mkdir dir="${derby.jar.dir}/lists/META-INF"/>
+ <copy todir="${derby.jar.dir}/lists/META-INF">
+ <fileset dir="${basedir}" includes="LICENSE*,NOTICE*,COPYRIGHT*"/>
+ </copy>
+
+ <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"/>
+ </manifest>
+
+ <jar destfile="${derby.jar.dir}/derbyrun.jar"
+ compress="true"
+ filesonly="true"
+ update="true"
+ manifest="${derby.jar.dir}/lists/smfcmd.mf">
+ <fileset dir="${out.dir}"
+ includes="org/apache/derby/iapi/tools/**"/>
+ <fileset dir="${derby.jar.dir}/lists"
+ includes="META-INF/**"/>
+ </jar>
+
+ </target>
<!-- - - - - - - - - - - - - - derby.war target - - - - - - - - - - - -->
<target name="derbywar" depends="initjars">
Modified: db/derby/code/trunk/java/tools/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/build.xml?rev=384101&r1=384100&r2=384101&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/build.xml Tue Mar 7 18:52:33 2006
@@ -46,6 +46,9 @@
<ant dir="${derby.tools.dir}/loc"/>
</target>
+ <target name="tools_run">
+ <ant dir="${derby.tools.dir}/iapi/tools" target="compile_tools_iapi_run"/>
+ </target>
<!-- ============= End Targets ============== -->
Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml?rev=384101&r1=384100&r2=384101&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml Tue Mar 7 18:52:33 2006
@@ -19,7 +19,26 @@
<!-- Targets -->
<target name="compile_tools_iapi">
+ <javac
+ bootclasspath="${empty}"
+ nowarn="on"
+ debug="${debug}"
+ depend="${depend}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ proceed="${proceed}"
+ verbose="${verbose}"
+ srcdir="${derby.tools.src.dir}"
+ destdir="${out.dir}">
+ <classpath>
+ <pathelement path="${compile.classpath}"/>
+ </classpath>
+ <include name="${derby.dir}/iapi/tools/i18n/**"/>
+ <exclude name="${derby.dir}/iapi/tools/run.java"/>
+ </javac>
+ </target>
+ <target name="compile_tools_iapi_run">
<javac
bootclasspath="${empty}"
nowarn="on"
@@ -34,9 +53,9 @@
<classpath>
<pathelement path="${compile.classpath}"/>
</classpath>
- <include name="${derby.dir}/iapi/tools/**"/>
+ <include name="${derby.dir}/iapi/tools/run.java"/>
</javac>
- </target>
+ </target>
</project>
Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java?rev=384101&r1=384100&r2=384101&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java Tue Mar 7 18:52:33 2006
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.tools.iapi.run
+ Derby - Class org.apache.derby.iapi.tools.run
Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
@@ -21,6 +21,7 @@
package org.apache.derby.iapi.tools;
import java.io.IOException;
+import org.apache.derby.drda.NetworkServerControl;
import org.apache.derby.tools.dblook;
import org.apache.derby.tools.ij;
import org.apache.derby.tools.sysinfo;
@@ -30,9 +31,10 @@
The run class facilitates running the various Derby utilities with the
java -jar command. For example:
- java -jar derbytools.jar ij
- java -jar derbytools.jar sysinfo
- java -jar derbytools.jar dblook
+ java -jar derbyrun.jar ij
+ java -jar derbyrun.jar sysinfo
+ java -jar derbyrun.jar dblook
+ java -jar derbyrun.jar NetworkServerControl
*/
public class run {
@@ -49,6 +51,8 @@
sysinfo.main(trimArgs(args));
} else if (args[0].equals("dblook")) {
dblook.main(trimArgs(args));
+ } else if (args[0].equals("NetworkServerControl")) {
+ NetworkServerControl.main(trimArgs(args));
} else printUsage();
}
Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=384101&r1=384100&r2=384101&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Tue Mar 7 18:52:33 2006
@@ -233,4 +233,8 @@
-- to review the message(s).\n\
\n
# Directory org/apache/derby/tools/iapi
-RUN_Usage=Usage: java -jar derbytools.jar ij | sysinfo | dblook [args]
+RUN_Usage=Usage:\n\
+java -jar derbyrun.jar ij [-p propertiesfile] [sql script]\n\
+java -jar derbyrun.jar sysinfo [-cp ...] [-cp help] \n\
+java -jar derbyrun.jar dblook [args] (or no arguments for usage)\n\
+java -jar derbyrun.jar NetworkServerControl [args] (or no arguments for usage)
Modified: db/derby/code/trunk/tools/jar/tools.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/jar/tools.properties?rev=384101&r1=384100&r2=384101&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/tools.properties (original)
+++ db/derby/code/trunk/tools/jar/tools.properties Tue Mar 7 18:52:33 2006
@@ -12,4 +12,3 @@
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.run=org.apache.derby.iapi.tools.run