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/25 19:24:00 UTC
svn commit: r1819254 - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/lastgoodjarcontents/ java/run/
java/run/org/ java/run/org/apache/ java/run/org/apache/derby/
java/run/org/apache/derby/run/
java/testing/org/apache/derbyTesting/functio...
Author: rhillegas
Date: Mon Dec 25 19:24:00 2017
New Revision: 1819254
URL: http://svn.apache.org/viewvc?rev=1819254&view=rev
Log:
DERBY-6945: Put java.run in its own package so that derbyrun.jar and derbytools.jar do not overlap; commit derby-6945-04-aa-moveRunClass.diff.
Added:
db/derby/code/trunk/java/run/
db/derby/code/trunk/java/run/build.xml (with props)
db/derby/code/trunk/java/run/org/
db/derby/code/trunk/java/run/org/apache/
db/derby/code/trunk/java/run/org/apache/derby/
db/derby/code/trunk/java/run/org/apache/derby/run/
db/derby/code/trunk/java/run/org/apache/derby/run/run.java
- copied, changed from r1819223, db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java
Removed:
db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents
db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
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=1819254&r1=1819253&r2=1819254&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Mon Dec 25 19:24:00 2017
@@ -48,7 +48,7 @@
<target
name="buildsource"
- depends="checkCompilerLevel,init,prebuild,setCompilerProperties,felixStubs,engine,storeless,tools,drda,client,optional,build,versioninfo,localeinfo,binscripts"
+ depends="checkCompilerLevel,init,prebuild,setCompilerProperties,felixStubs,engine,storeless,tools,drda,client,optional,runner,build,versioninfo,localeinfo,binscripts"
description="Compile the product source (does not build the tests)."
/>
<target
@@ -544,6 +544,10 @@
<ant dir="${derby.optional.src.dir}"/>
</target>
+ <target name="runner" depends="optional">
+ <ant dir="${derby.run.src.dir}"/>
+ </target>
+
<target name="storeless" depends="engine">
<ant dir="${derby.storeless.src.dir}"/>
</target>
@@ -1742,7 +1746,7 @@
<antcall target="meta-inf-common"/>
<manifest file="${derby.jar.dir}/lists/smfcmd.mf">
- <attribute name="Main-Class" value="org.apache.derby.iapi.tools.run"/>
+ <attribute name="Main-Class" value="org.apache.derby.run.run"/>
<attribute name="Class-Path" value="derby.jar derbyclient.jar derbytools.jar derbynet.jar derbyoptionaltools.jar derbyshared.jar"/>
</manifest>
@@ -1752,7 +1756,7 @@
update="true"
manifest="${derby.jar.dir}/lists/smfcmd.mf">
<fileset dir="${out.dir}"
- includes="org/apache/derby/iapi/tools/run.class"/>
+ includes="org/apache/derby/run/run.class"/>
<fileset dir="${derby.jar.dir}/lists"
includes="META-INF/LICENSE,META-INF/NOTICE"/>
</jar>
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents?rev=1819254&r1=1819253&r2=1819254&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/insane.derbyrun.jar.lastcontents Mon Dec 25 19:24:00 2017
@@ -1 +1 @@
-org.apache.derby.iapi.tools.run.class
+org.apache.derby.run.run.class
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents?rev=1819254&r1=1819253&r2=1819254&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/lastgoodjarcontents/sane.derbyrun.jar.lastcontents Mon Dec 25 19:24:00 2017
@@ -1 +1 @@
-org.apache.derby.iapi.tools.run.class
+org.apache.derby.run.run.class
Added: db/derby/code/trunk/java/run/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/run/build.xml?rev=1819254&view=auto
==============================================================================
--- db/derby/code/trunk/java/run/build.xml (added)
+++ db/derby/code/trunk/java/run/build.xml Mon Dec 25 19:24:00 2017
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- ==================================================================== -->
+<!-- Apache Derby build file -->
+<!-- ==================================================================== -->
+
+<project default="runner" basedir="../..">
+
+<!-- ==================================================================== -->
+<!-- Set properties -->
+<!-- ==================================================================== -->
+
+ <property name="properties.dir" value="tools/ant/properties"/>
+
+ <!-- User settings -->
+ <property file="${user.home}/ant.properties"/>
+
+ <!-- Significant dirs -->
+ <property file="${properties.dir}/dirs.properties"/>
+
+ <!-- Compiler settings -->
+ <property file="${properties.dir}/defaultcompiler.properties"/>
+ <property file="${properties.dir}/${build.compiler}.properties"/>
+
+ <!-- Parser properties -->
+ <property file="${properties.dir}/parser.properties"/>
+
+ <!-- Compile-time classpath properties files -->
+ <property file="${properties.dir}/extrapath.properties"/>
+ <property file="${properties.dir}/compilepath.properties"/>
+ <property name="cur.dir" value="run"/>
+
+ <!-- Release and Version info -->
+ <property file="${properties.dir}/release.properties"/>
+
+<!-- ============ Begin Targets ============== -->
+
+ <target name="runner"
+ description="Build Derby command runner">
+
+ <javac
+ source="${min.version}"
+ target="${min.version}"
+ nowarn="on"
+ debug="${debug}" debuglevel="${debuglevel}"
+ depend="${depend}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ proceed="${proceed}"
+ verbose="${verbose}"
+ srcdir="${derby.run.src.dir}:${generated.src.dir}"
+ destdir="${out.dir}">
+ <include name="${derby.dir}/${cur.dir}/**"/>
+ <compilerarg value="-Xlint:unchecked"/>
+ <compilerarg value="-Xlint:deprecation"/>
+ </javac>
+
+ </target>
+
+<!-- ============= End Targets ============== -->
+
+<!-- ============= End Project ============== -->
+
+</project>
+
Propchange: db/derby/code/trunk/java/run/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: db/derby/code/trunk/java/run/org/apache/derby/run/run.java (from r1819223, db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/run/org/apache/derby/run/run.java?p2=db/derby/code/trunk/java/run/org/apache/derby/run/run.java&p1=db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java&r1=1819223&r2=1819254&rev=1819254&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/run.java (original)
+++ db/derby/code/trunk/java/run/org/apache/derby/run/run.java Mon Dec 25 19:24:00 2017
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.iapi.tools.run
+ Derby - Class org.apache.derby.run.run
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +19,7 @@
*/
-package org.apache.derby.iapi.tools;
+package org.apache.derby.run;
import java.io.IOException;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java?rev=1819254&r1=1819253&r2=1819254&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java Mon Dec 25 19:24:00 2017
@@ -31,7 +31,7 @@ import org.apache.derbyTesting.junit.Der
import org.apache.derbyTesting.junit.SecurityManagerSetup;
/**
- * Basic tests for exercising the {@code org.apache.derby.iapi.tools.run}
+ * Basic tests for exercising the {@code org.apache.derby.run.run}
* class found in {@code derbyrun.jar}.
*/
public class derbyrunjartest extends BaseTestCase {
@@ -58,7 +58,7 @@ public class derbyrunjartest extends Bas
}
/**
- * Invoke {@code org.apache.derby.iapi.tools.run} in a sub-process.
+ * Invoke {@code org.apache.derby.run.run} in a sub-process.
*
* @param toolArgs the arguments to pass to derbyrun.jar
* @param output expected lines of output
@@ -66,7 +66,7 @@ public class derbyrunjartest extends Bas
*/
private void runtool(String[] toolArgs, String[] output, int exitCode)
throws Exception {
- String runClassName = org.apache.derby.iapi.tools.run.class.getName();
+ String runClassName = org.apache.derby.run.run.class.getName();
URL result = SecurityManagerSetup.getURL(runClassName);
String derbyrunloc = null;
Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=1819254&r1=1819253&r2=1819254&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Mon Dec 25 19:24:00 2017
@@ -70,6 +70,7 @@ derby.drda.src.dir=${derbysrc.dir}/drda
derby.client.src.dir=${derbysrc.dir}/client
derby.shared.src.dir=${derbysrc.dir}/shared
derby.optional.src.dir=${derbysrc.dir}/optional
+derby.run.src.dir=${derbysrc.dir}/run
derby.tools.src.dir=${derbysrc.dir}/tools
derby.build.src.dir=${derbysrc.dir}/build
derby.demo.src.dir=${derbysrc.dir}/demo