You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/01/30 01:02:04 UTC
svn commit: r739091 - in /incubator/etch/trunk: examples/chat/
examples/distmap/ examples/example/ examples/perf/
plugins/ant/src/main/java/etch/tools/ant/ plugins/ant/src/main/java/org/
plugins/ant/src/main/java/org/apache/ plugins/ant/src/main/java/o...
Author: sccomer
Date: Fri Jan 30 00:02:03 2009
New Revision: 739091
URL: http://svn.apache.org/viewvc?rev=739091&view=rev
Log:
refactor ant task package names.
Added:
incubator/etch/trunk/plugins/ant/src/main/java/org/
incubator/etch/trunk/plugins/ant/src/main/java/org/apache/
incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/
incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/
incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/
- copied from r739076, incubator/etch/trunk/plugins/ant/src/main/java/etch/tools/ant/
incubator/etch/trunk/plugins/ant/src/main/resources/org/
incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/
incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/etch/
incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/etch/tools/
incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/etch/tools/ant/
- copied from r739076, incubator/etch/trunk/plugins/ant/src/main/resources/etch/tools/ant/
incubator/etch/trunk/plugins/ant/src/test/java/org/
incubator/etch/trunk/plugins/ant/src/test/java/org/apache/
incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/
incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/
incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/
- copied from r739076, incubator/etch/trunk/plugins/ant/src/test/java/etch/tools/ant/
Removed:
incubator/etch/trunk/plugins/ant/src/main/java/etch/tools/ant/
incubator/etch/trunk/plugins/ant/src/main/resources/etch/tools/ant/
incubator/etch/trunk/plugins/ant/src/test/java/etch/tools/ant/
Modified:
incubator/etch/trunk/examples/chat/build.xml
incubator/etch/trunk/examples/chat/dist-build.xml
incubator/etch/trunk/examples/distmap/build.xml
incubator/etch/trunk/examples/distmap/dist-build.xml
incubator/etch/trunk/examples/example/build.xml
incubator/etch/trunk/examples/example/dist-build.xml
incubator/etch/trunk/examples/perf/build.xml
incubator/etch/trunk/examples/perf/dist-build.xml
incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java
incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/etch/tools/ant/etch.xml
incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java
incubator/etch/trunk/tests/build.xml
Modified: incubator/etch/trunk/examples/chat/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/build.xml (original)
+++ incubator/etch/trunk/examples/chat/build.xml Fri Jan 30 00:02:03 2009
@@ -51,7 +51,7 @@
<!-- import etch task -->
<taskdef
onerror="report"
- resource="etch/tools/ant/etch.xml"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar" />
<!-- import dotnet task -->
@@ -213,7 +213,7 @@
</target>
<target name="test-csharp" depends="build-csharp" if="BUILD.csharp" >
- <nunit xmlout="${nunit-results}/NUnitResults.xml" >
+ <nunit xmlout="${nunit-results}/NUnitResults.xml">
<testassembly name="${src}/test/csharp/ChatTestProj/bin/${build.target}/ChatTestProj.dll" />
</nunit>
Modified: incubator/etch/trunk/examples/chat/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/dist-build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/dist-build.xml (original)
+++ incubator/etch/trunk/examples/chat/dist-build.xml Fri Jan 30 00:02:03 2009
@@ -26,7 +26,7 @@
</condition>
<taskdef
- resource="etch/tools/ant/etch.xml"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch-ant-plugin.jar}"/>
<target name="build" depends="build-java, build-csharp, done"/>
Modified: incubator/etch/trunk/examples/distmap/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/build.xml (original)
+++ incubator/etch/trunk/examples/distmap/build.xml Fri Jan 30 00:02:03 2009
@@ -17,7 +17,7 @@
</condition>
<property name="Etch.dependency.junit.jar"
- location="${env.TOOLS_DIR}/junit/4.3.1/junit-4.3.1.jar" />
+ location="${default.junit.lib}/junit-4.3.1.jar" />
<property name="Etch.buildSupportDirectory" location="../../build-support" />
@@ -50,9 +50,8 @@
<!-- import etch task -->
<taskdef
- name="etch"
onerror="report"
- classname="etch.tools.ant.EtchCompileTask"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar" />
<!-- import dotnet task -->
@@ -257,7 +256,7 @@
<property name="build.target" value="Release" />
</target>
- <target name="dist-src" >
+ <target name="dist-src" >
<copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" />
<copy file="dist-README.txt" tofile="${dist-src}/README.txt" overwrite="true" />
Modified: incubator/etch/trunk/examples/distmap/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/dist-build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/dist-build.xml (original)
+++ incubator/etch/trunk/examples/distmap/dist-build.xml Fri Jan 30 00:02:03 2009
@@ -26,7 +26,7 @@
</condition>
<taskdef
- resource="etch/tools/ant/etch.xml"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch-ant-plugin.jar}"/>
<target name="build" depends="build-java, build-csharp, done"/>
Modified: incubator/etch/trunk/examples/example/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/build.xml (original)
+++ incubator/etch/trunk/examples/example/build.xml Fri Jan 30 00:02:03 2009
@@ -17,7 +17,7 @@
</condition>
<property name="Etch.dependency.junit.jar"
- location="${env.TOOLS_DIR}/junit/4.3.1/junit-4.3.1.jar" />
+ location="${default.junit.lib}/junit-4.3.1.jar" />
<property name="Etch.buildSupportDirectory" location="../../build-support" />
@@ -50,9 +50,8 @@
<!-- import etch task -->
<taskdef
- name="etch"
onerror="report"
- classname="etch.tools.ant.EtchCompileTask"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar" />
<!-- import dotnet task -->
@@ -230,7 +229,7 @@
Build Complete!
-To run java example example, open a cmd window and run these
+To run java example, open a cmd window and run these
commands:
> cd target\bin
@@ -258,7 +257,7 @@
<target name="init-release" >
<property name="build.target" value="Release" />
</target>
-
+
<target name="dist-src" >
<copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" />
<copy file="dist-README.txt" tofile="${dist-src}/README.txt" overwrite="true" />
Modified: incubator/etch/trunk/examples/example/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/dist-build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/dist-build.xml (original)
+++ incubator/etch/trunk/examples/example/dist-build.xml Fri Jan 30 00:02:03 2009
@@ -26,7 +26,7 @@
</condition>
<taskdef
- resource="etch/tools/ant/etch.xml"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch-ant-plugin.jar}"/>
<target name="build" depends="build-java, build-csharp, done"/>
Modified: incubator/etch/trunk/examples/perf/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/build.xml (original)
+++ incubator/etch/trunk/examples/perf/build.xml Fri Jan 30 00:02:03 2009
@@ -17,7 +17,7 @@
</condition>
<property name="Etch.dependency.junit.jar"
- location="${env.TOOLS_DIR}/junit/4.3.1/junit-4.3.1.jar" />
+ location="${default.junit.lib}/junit-4.3.1.jar" />
<property name="Etch.buildSupportDirectory" location="../../build-support" />
@@ -50,9 +50,8 @@
<!-- import etch task -->
<taskdef
- name="etch"
onerror="report"
- classname="etch.tools.ant.EtchCompileTask"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar" />
<!-- import dotnet task -->
@@ -257,7 +256,7 @@
<property name="build.target" value="Release" />
</target>
- <target name="dist-src" >
+ <target name="dist-src" >
<copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" />
<copy file="dist-README.txt" tofile="${dist-src}/README.txt" overwrite="true" />
Modified: incubator/etch/trunk/examples/perf/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/dist-build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/dist-build.xml (original)
+++ incubator/etch/trunk/examples/perf/dist-build.xml Fri Jan 30 00:02:03 2009
@@ -26,7 +26,7 @@
</condition>
<taskdef
- resource="etch/tools/ant/etch.xml"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch-ant-plugin.jar}"/>
<target name="build" depends="build-java, build-csharp, done"/>
Modified: incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java?rev=739091&r1=739076&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java (original)
+++ incubator/etch/trunk/plugins/ant/src/main/java/org/apache/etch/tools/ant/EtchCompileTask.java Fri Jan 30 00:02:03 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.tools.ant;
+package org.apache.etch.tools.ant;
import java.io.File;
import java.util.StringTokenizer;
Modified: incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/etch/tools/ant/etch.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/etch/tools/ant/etch.xml?rev=739091&r1=739076&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/etch/tools/ant/etch.xml (original)
+++ incubator/etch/trunk/plugins/ant/src/main/resources/org/apache/etch/tools/ant/etch.xml Fri Jan 30 00:02:03 2009
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<antlib>
- <taskdef name="etch" classname="etch.tools.ant.EtchCompileTask"/>
+ <taskdef name="etch" classname="org.apache.etch.tools.ant.EtchCompileTask"/>
</antlib>
Modified: incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java?rev=739091&r1=739076&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java (original)
+++ incubator/etch/trunk/plugins/ant/src/test/java/org/apache/etch/tools/ant/TestEtchCompileTask.java Fri Jan 30 00:02:03 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.tools.ant;
+package org.apache.etch.tools.ant;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.etch.tools.ant.EtchCompileTask;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.DirSet;
import org.junit.Ignore;
Modified: incubator/etch/trunk/tests/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/build.xml?rev=739091&r1=739090&r2=739091&view=diff
==============================================================================
--- incubator/etch/trunk/tests/build.xml (original)
+++ incubator/etch/trunk/tests/build.xml Fri Jan 30 00:02:03 2009
@@ -6,9 +6,9 @@
<target name="help"><echo>Please select a target...</echo></target>
<!-- import etch task -->
- <taskdef name="etch"
+ <taskdef
onerror="report"
- classname="etch.tools.ant.EtchCompileTask"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${Etch.HOME}/lib/${etch-ant-task.jar}" />
<!-- set properties -->