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 12:52:22 UTC
svn commit: r160027 - 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/samples/
modules/samples/test/org/apache/axis/om/builder/dummy/
modules/wsdl/test/org/apache/wsdl/ modules/xml/test/org/apache/axis/om/
Author: hemapani
Date: Mon Apr 4 03:52:19 2005
New Revision: 160027
URL: http://svn.apache.org/viewcvs?view=rev&rev=160027
Log:
fix few more test cases
Modified:
webservices/axis/trunk/java/etc/project.xml
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/samples/maven.xml
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/dummy/DummyOutObject.java
webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/AbstractTestCase.java
Modified: webservices/axis/trunk/java/etc/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/etc/project.xml?view=diff&r1=160026&r2=160027
==============================================================================
--- webservices/axis/trunk/java/etc/project.xml (original)
+++ webservices/axis/trunk/java/etc/project.xml Mon Apr 4 03:52:19 2005
@@ -19,7 +19,7 @@
<inceptionYear>2004</inceptionYear>
<package>org.apache.axis</package>
<logo>http://ws.apache.org/axis/images/axis.jpg</logo>
- <description> Axis2 is an effort to re-design and totally re-implement both Axis/Java and (eventually) Axis/C++ on a new architecture. Evolving from the now standard "handler chain" model which Axis1 pioneered, Axis2 is developing a more flexible pipeline architecture which can yet be managed and packaged in a more organized manner. This new design acknowledges the maturing of the Web services space â__ in terms of new protocols such as WS-ReliableMessaging, WS-Security and WS-Addressing that are built on top of the base SOAP system. At the time Axis1 was designed, while it was fully expected that other protocols such as WS-ReliableMessaging would be built on top of it, there was not a proper extension architecture defined to enable clean composition of such layers. Thus, one of the key motivations for Axis2 is to provide a clean and simple environment for like Apache Sandesha [4] and Apache WSS4J [5] to layer on top of the base SOAP system. Another driving force for Axis2 as well as the move away from RPC oriented Web services towards more document-oriented, message style asynchronous service interactions. The Axis2 project is centered on a new representation for SOAP messages called AXIOM (AXIs Object Model). AXIOM consists of two parts: a complete XML Infoset representation and a SOAP Infoset representation on top of that. The XML Infoset representation provides a JDOM-like simple API but is built on a deferred model via a StAX-based (Streaming API for XML) pull parsing API. A key feature of AXIOM is that it allows one to stop building the XML tree and just access the pull stream directly; thus enabling both maximum flexibility and maximum performance. This approach allows us to support multiple levels of abstraction for consuming and offering Web services: using plain AXIOM, using generated code and statically data-bound data types and so on. At the time of Axis1's design, RPC-style, synchronous, request-response interactions were the order of the day for Web services. Today service interactions are much more message-oriented and exploit many different message exchange patterns. The Axis2 engine architecture is careful to not build in any assumptions of request-response patterns to ensure that it can be used easily to support arbitrary message exchange patterns.</description>
+ <description> Axis2 is an effort to re-design and totally re-implement both Axis/Java and (eventually) Axis/C++ on a new architecture. Evolving from the now standard "handler chain" model which Axis1 pioneered, Axis2 is developing a more flexible pipeline architecture which can yet be managed and packaged in a more organized manner. This new design acknowledges the maturing of the Web services space �__ in terms of new protocols such as WS-ReliableMessaging, WS-Security and WS-Addressing that are built on top of the base SOAP system. At the time Axis1 was designed, while it was fully expected that other protocols such as WS-ReliableMessaging would be built on top of it, there was not a proper extension architecture defined to enable clean composition of such layers. Thus, one of the key motivations for Axis2 is to provide a clean and simple environment for like Apache Sandesha [4] and Apache WSS4J [5] to layer on top of the base SOAP system. Another driving force for Axis2 as well as the move away from RPC oriented Web services towards more document-oriented, message style asynchronous service interactions. The Axis2 project is centered on a new representation for SOAP messages called AXIOM (AXIs Object Model). AXIOM consists of two parts: a complete XML Infoset representation and a SOAP Infoset representation on top of that. The XML Infoset representation provides a JDOM-like simple API but is built on a deferred model via a StAX-based (Streaming API for XML) pull parsing API. A key feature of AXIOM is that it allows one to stop building the XML tree and just access the pull stream directly; thus enabling both maximum flexibility and maximum performance. This approach allows us to support multiple levels of abstraction for consuming and offering Web services: using plain AXIOM, using generated code and statically data-bound data types and so on. At the time of Axis1's design, RPC-style, synchronous, request-response interactions were the order of the day for Web services. Today service interactions are much more message-oriented and exploit many different message exchange patterns. The Axis2 engine architecture is careful to not build in any assumptions of request-response patterns to ensure that it can be used easily to support arbitrary message exchange patterns.</description>
<shortDescription>Axis 2.0</shortDescription>
<!-- the project home page -->
<url>http://ws.apache.org/axis2/</url>
@@ -170,20 +170,20 @@
<resources>
<resource>
- <directory>${basedir}/src/test-resources</directory>
+ <directory>${basedir}/test-resources</directory>
</resource>
<resource>
- <directory>conf</directory>
+ <directory>conf</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>src/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
</resource>
</resources>
</unitTest>
@@ -196,7 +196,7 @@
</includes>
</resource>
<resource>
- <directory>src/java</directory>
+ <directory>src</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
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=160026&r2=160027
==============================================================================
--- 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 03:52:19 2005
@@ -10,7 +10,7 @@
<path id="axis.test.classpath">
<path refid="maven.dependency.classpath"></path>
- <pathelement location="../../../../target/classes"/>
+ <pathelement location="../../../target/classes"/>
</path>
<target name="compile" depends="init" unless="jars.uptodate">
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=160026&r2=160027
==============================================================================
--- 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 03:52:19 2005
@@ -10,7 +10,7 @@
<path id="axis.test.classpath">
<path refid="maven.dependency.classpath"></path>
- <pathelement location="../../../../target/classes"/>
+ <pathelement location="../../../target/classes"/>
</path>
<target name="compile" depends="init" unless="jars.uptodate">
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=160026&r2=160027
==============================================================================
--- 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 03:52:19 2005
@@ -10,7 +10,7 @@
<path id="axis.test.classpath">
<path refid="maven.dependency.classpath"></path>
- <pathelement location="../../../../target/classes"/>
+ <pathelement location="../../../target/classes"/>
</path>
<target name="compile" depends="init" unless="jars.uptodate">
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=160026&r2=160027
==============================================================================
--- 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 03:52:19 2005
@@ -10,8 +10,8 @@
<path id="axis.test.classpath">
<path refid="maven.dependency.classpath"></path>
- <pathelement location="../../../../target/classes"/>
- <pathelement location="../../../../target/test-classes"/>
+ <pathelement location="../../../target/classes"/>
+ <pathelement location="../../../target/test-classes"/>
</path>
<target name="compile" depends="init" unless="jars.uptodate">
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=160026&r2=160027
==============================================================================
--- 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 03:52:19 2005
@@ -10,7 +10,7 @@
<path id="axis.test.classpath">
<path refid="maven.dependency.classpath"></path>
- <pathelement location="../../../../target/classes"/>
+ <pathelement location="../../../target/classes"/>
</path>
<target name="compile" depends="init" unless="jars.uptodate">
Modified: webservices/axis/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/maven.xml?view=diff&r1=160026&r2=160027
==============================================================================
--- webservices/axis/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis/trunk/java/modules/samples/maven.xml Mon Apr 4 03:52:19 2005
@@ -20,7 +20,7 @@
<include name="encoding/sample1/**/*.class"/>
</fileset>
</copy>
- <copy file="src/java/encoding/sample1/service.xml" tofile="target/jar-code/sample1/META-INF/service.xml"/>
+ <copy file="src/encoding/sample1/service.xml" tofile="target/jar-code/sample1/META-INF/service.xml"/>
<jar jarfile="target/test-resources/samples/services/echo.jar" basedir="target/jar-code/sample1" >
<include name="**" />
</jar>
@@ -32,7 +32,7 @@
<include name="encoding/sample2/**/*.class"/>
</fileset>
</copy>
- <copy file="src/java/encoding/sample2/benchMark/service.xml" tofile="target/jar-code/sample2/META-INF/service.xml"/>
+ <copy file="src/encoding/sample2/benchMark/service.xml" tofile="target/jar-code/sample2/META-INF/service.xml"/>
<jar jarfile="target/test-resources/samples/services/soap-bench.jar" basedir="target/jar-code/sample2" >
<include name="**" />
</jar>
@@ -57,7 +57,7 @@
<include name="interop/doclit/**/*.class"/>
</fileset>
</copy>
- <copy file="src/java/interop/doclit/service.xml" tofile="target/jar-code/sample4/META-INF/service.xml"/>
+ <copy file="src/interop/doclit/service.xml" tofile="target/jar-code/sample4/META-INF/service.xml"/>
<jar jarfile="target/test-resources/samples/services/interop-doclit.jar" basedir="target/jar-code/sample4" >
<include name="**" />
</jar>
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/dummy/DummyOutObject.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/dummy/DummyOutObject.java?view=diff&r1=160026&r2=160027
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/dummy/DummyOutObject.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/dummy/DummyOutObject.java Mon Apr 4 03:52:19 2005
@@ -31,7 +31,7 @@
public class DummyOutObject implements Encoder {
private XMLReader parser;
- String fileName = "src/test-resources/soapmessage.xml";
+ String fileName = "test-resources/soapmessage.xml";
public DummyOutObject() throws SAXException, ParserConfigurationException {
Modified: webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java?view=diff&r1=160026&r2=160027
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/test/org/apache/wsdl/AbstractTestCase.java Mon Apr 4 03:52:19 2005
@@ -24,11 +24,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";
/**
* Basedir for all file I/O. Important when running tests from
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/AbstractTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/AbstractTestCase.java?view=diff&r1=160026&r2=160027
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/AbstractTestCase.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/AbstractTestCase.java Mon Apr 4 03:52:19 2005
@@ -24,11 +24,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";
/**
* Basedir for all file I/O. Important when running tests from