You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by he...@apache.org on 2005/04/04 13:30:17 UTC
svn commit: r160030 - in webservices/axis/trunk/java: etc/
modules/core/samples/deployment/OutService/
modules/core/samples/deployment/module1/
modules/core/samples/deployment/module2/
modules/core/samples/deployment/service1/
modules/core/samples/deployment/service2/
modules/core/test/org/apache/axis/ modules/samples/ modules/tool/
modules/tool/src/org/apache/axis/tool/core/
Author: hemapani
Date: Mon Apr 4 04:30:15 2005
New Revision: 160030
URL: http://svn.apache.org/viewcvs?view=rev&rev=160030
Log:
fix the build, expect for the tools module. Hand that to Ajith... svn relased
Modified:
webservices/axis/trunk/java/etc/project.properties
webservices/axis/trunk/java/modules/core/samples/deployment/OutService/build.xml
webservices/axis/trunk/java/modules/core/samples/deployment/module1/build.xml
webservices/axis/trunk/java/modules/core/samples/deployment/module2/build.xml
webservices/axis/trunk/java/modules/core/samples/deployment/service1/build.xml
webservices/axis/trunk/java/modules/core/samples/deployment/service2/build.xml
webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java
webservices/axis/trunk/java/modules/samples/project.xml
webservices/axis/trunk/java/modules/tool/project.xml
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java
Modified: webservices/axis/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/etc/project.properties?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/etc/project.properties (original)
+++ webservices/axis/trunk/java/etc/project.properties Mon Apr 4 04:30:15 2005
@@ -16,6 +16,7 @@
maven.repo.remote=http://www.apache.org/dist/java-repository/
maven.multiproject.includes=modules/*/project.xml
+maven.multiproject.excludes=modules/tool/project.xml
maven.xdoc.date=left
## maven.xdoc.version=${pom.currentVersion}
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/OutService/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/OutService/build.xml?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/OutService/build.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/OutService/build.xml Mon Apr 4 04:30:15 2005
@@ -5,7 +5,7 @@
<property name="build.classes" location="${build}/classes"/>
<property name="build.lib" location="${build}/lib"/>
<property name="lib" location="lib"/>
- <property name="root" location="../../../../"/>
+ <property name="root" location="../../../"/>
<property name="jar.dir" location="${root}/target/test-resources/deployment/services/"/>
<path id="axis.test.classpath">
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/module1/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/module1/build.xml?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/module1/build.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/module1/build.xml Mon Apr 4 04:30:15 2005
@@ -5,7 +5,7 @@
<property name="build.classes" location="${build}/classes"/>
<property name="build.lib" location="${build}/lib"/>
<property name="lib" location="lib"/>
- <property name="root" location="../../../../"/>
+ <property name="root" location="../../../"/>
<property name="jar.dir" location="${root}/target/test-resources/deployment/modules/"/>
<path id="axis.test.classpath">
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/module2/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/module2/build.xml?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/module2/build.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/module2/build.xml Mon Apr 4 04:30:15 2005
@@ -5,7 +5,7 @@
<property name="build.classes" location="${build}/classes"/>
<property name="build.lib" location="${build}/lib"/>
<property name="lib" location="lib"/>
- <property name="root" location="../../../../"/>
+ <property name="root" location="../../../"/>
<property name="jar.dir" location="${root}/target/test-resources/deployment/modules/"/>
<path id="axis.test.classpath">
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/service1/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/service1/build.xml?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/service1/build.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/service1/build.xml Mon Apr 4 04:30:15 2005
@@ -5,7 +5,7 @@
<property name="build.classes" location="${build}/classes"/>
<property name="build.lib" location="${build}/lib"/>
<property name="lib" location="lib"/>
- <property name="root" location="../../../../"/>
+ <property name="root" location="../../../"/>
<property name="jar.dir" location="${root}/target/test-resources/deployment/services/"/>
<path id="axis.test.classpath">
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/service2/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/service2/build.xml?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/service2/build.xml (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/service2/build.xml Mon Apr 4 04:30:15 2005
@@ -5,7 +5,7 @@
<property name="build.classes" location="${build}/classes"/>
<property name="build.lib" location="${build}/lib"/>
<property name="lib" location="lib"/>
- <property name="root" location="../../../../"/>
+ <property name="root" location="../../../"/>
<property name="jar.dir" location="${root}/target/test-resources/deployment/services/"/>
<path id="axis.test.classpath">
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/AbstractTestCase.java Mon Apr 4 04:30:15 2005
@@ -25,11 +25,11 @@
*/
public abstract class AbstractTestCase
extends TestCase {
- protected String testDir = "src" + File.separator + "test" + File.separator;
- protected String sampleDir = "src" + File.separator + "samples" + File.separator;
+ protected String testDir = "test" + File.separator;
+ protected String sampleDir = "samples" + File.separator;
protected String outDir = "target" + File.separator + "generated" + File.separator + "samples" + File.separator;
protected String tempDir = "target" + File.separator + "generated" + File.separator + "temp";
- protected String testResourceDir = "src" + File.separator + "test-resources";
+ protected String testResourceDir = "test-resources";
/**
Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Mon Apr 4 04:30:15 2005
@@ -103,7 +103,7 @@
<resources>
<resource>
- <directory>${basedir}/src/test-resources</directory>
+ <directory>${basedir}/test-resources</directory>
</resource>
<resource>
<directory>conf</directory>
Modified: webservices/axis/trunk/java/modules/tool/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/project.xml?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/tool/project.xml (original)
+++ webservices/axis/trunk/java/modules/tool/project.xml Mon Apr 4 04:30:15 2005
@@ -19,7 +19,7 @@
<project>
<pomVersion>3</pomVersion>
<extend>../../etc/project.xml</extend>
- <id>axis2-Tools</id>
+ <id>axis2-tools</id>
<name>tool</name>
<description>Tools available for Axis 2.0.</description>
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java Mon Apr 4 04:30:15 2005
@@ -2,6 +2,10 @@
import java.io.File;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.types.FileSet;
+
import sun.rmi.transport.Target;
/*
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java?view=diff&r1=160029&r2=160030
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java Mon Apr 4 04:30:15 2005
@@ -3,6 +3,9 @@
import java.io.File;
import java.io.IOException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Jar;
+
import sun.rmi.transport.Target;
/*