You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2005/07/11 17:49:55 UTC
svn commit: r210150 [2/35] - in /webservices/axis/trunk/java: ./ etc/
modules/addressing/
modules/addressing/src/org/apache/axis2/handlers/addressing/
modules/addressing/test-resources/
modules/addressing/test/org/apache/axis2/handlers/addressing/ modu...
Modified: webservices/axis/trunk/java/etc/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/etc/project.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/etc/project.xml (original)
+++ webservices/axis/trunk/java/etc/project.xml Mon Jul 11 08:49:30 2005
@@ -1,274 +1,274 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
-<name>Axis2.0</name>
- <pomVersion>3</pomVersion>
+ <name>Axis2.0</name>
+ <pomVersion>3</pomVersion>
- <!-- a unique name for this project -->
- <name>Apache Axis 2.0</name>
- <id>axis</id>
- <groupId>axis</groupId>
- <package>org.apache.axis2</package>
-
- <currentVersion>0.9</currentVersion>
-
- <!-- details about the organization that 'owns' the project -->
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- <logo>http://www.apache.org/images/asf-logo.gif</logo>
- </organization>
-
- <inceptionYear>2004</inceptionYear>
- <package>org.apache.axis2</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 and Apache WSS4J 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>
- <issueTrackingUrl>http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10611</issueTrackingUrl>
- <siteAddress>ws.apache.org/axis2</siteAddress>
- <siteDirectory>/www/ws.apache.org/axis2/</siteDirectory>
- <distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
- <!-- repository>
- <connection>scm|svn|http://svn.apache.org/repos/asf/webservices/axis/trunk</connection>
- <developerConnection>scm|svn|https://svn.apache.org/repos/asf/webservices/axis/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/webservices/axis/trunk/?root=Apache-SVN</url>
- </repository -->
- <mailingLists>
- <mailingList>
- <name>Axis Developer List</name>
- <subscribe>axis-dev-subscribe@ws.apache.org</subscribe>
- <unsubscribe>axis-dev-unsubscribe@ws.apache.org</unsubscribe>
- <archive>http://marc.theaimsgroup.com/?l=axis-dev&r=1&w=2</archive>
-
- </mailingList>
- <mailingList>
- <name>Axis User List</name>
- <subscribe>axis-user-subscribe@ws.apache.org</subscribe>
- <unsubscribe>axis-user-unsubscribe@ws.apache.org</unsubscribe>
- <archive>http://marc.theaimsgroup.com/?l=axis-user&r=1&w=2</archive>
- </mailingList>
- </mailingLists>
-
- <!-- ========== -->
- <!-- Developers -->
- <!-- ========== -->
-
- <developers>
- <developer>
- <name>Davanum Srinivas</name>
- <id>dims</id>
- <email>dims@apache.org</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Sanjiva Weerawarana</name>
- <id>sanjiva</id>
- <email>sanjiva@apache.org</email>
- <organization>Lanka Software Foundation</organization>
- </developer>
- <developer>
- <name>Glen Daniels</name>
- <id>gdaniels</id>
- <email>gdaniels@apache.org</email>
- <organization>Sonic Software</organization>
- </developer>
- <developer>
- <name>Aleksander Slominski</name>
- <id>alek</id>
- <email>aslom@cs.indiana.edu</email>
- <organization>Indiana University Extreme! Computing Lab</organization>
- </developer>
- <developer>
- <name>Srinath Perera</name>
- <id>hemapani</id>
- <email>hemapani@apache.org</email>
- <organization>Lanka Software Foundation</organization>
- <url>http://www.apache.org/~hemapani</url>
- </developer>
- <developer>
- <name>Eran Chinthaka</name>
- <id>chinthaka</id>
- <email>chinthaka@apache.org</email>
- <organization>Lanka Software Foundation / Eurocenter DDC</organization>
- <url>http://www.apache.org/~chinthaka</url>
- </developer>
- <developer>
- <name>Dasarath Weerathunga</name>
- <id>dasarath</id>
- <email>dasarath@opensource.lk</email>
- <organization>Lanka Software Foundation</organization>
- </developer>
- <developer>
- <name>Jaliya Ekanayake</name>
- <id>jaliya</id>
- <email>jaliya@opensource.lk</email>
- <organization>Virtusa / Lanka Software Foundation</organization>
- <url>http://www.apache.org/~jaliya</url>
- </developer>
- <developer>
- <name>Chathura Herath</name>
- <id>chathura</id>
- <email>chathura@opensource.lk</email>
- <organization>LSF/MIT</organization>
- <url>www.apache.org/~chathura</url>
- </developer>
- <developer>
- <name>Deepal Jayasinghe</name>
- <id>deepal</id>
- <email>deepal@apache.org</email>
- <organization>Lanka Software Foundation</organization>
- <url>http://www.apache.org/~deepal</url>
-
- </developer>
- <developer>
- <name>Ajith Ranabahu</name>
- <id>ajith</id>
- <email>ajith@apache.org</email>
- <organization>Lanka Software Foundation / Eurocenter DDC</organization>
- <url>http://www.apache.org/~ajith</url>
-
- </developer>
- <developer>
- <name>Venkat Reddy</name>
- <id>venkat</id>
- <email>vreddyp@gmail.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Shahi, Ashutosh</name>
- <id>ashu</id>
- <email>Ashutosh.Shahi@ca.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Jayachandra Sekhara Rao Sunkara</name>
- <id>jaya</id>
- <email>jayachandra@gmail.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Thilina Gunarathne</name>
- <id>thilina</id>
- <email>thilina@opensource.lk</email>
- <organization>Lanka Software Foundation / Virtusa</organization>
- </developer>
-
-
- </developers>
- <contributors>
- <contributor>
- <name>Farhaan Mohideen</name>
- <email>fmohideen@valista.com</email>
- <organization>Lanka Software Foundation</organization>
- </contributor>
- <contributor>
- <name>Changshin Lee</name>
- <email>iasandcb@hotmail.com</email>
- <organization>Tmax Soft, Korea</organization>
- </contributor>
- <contributor>
- <name>Chamil Thanthrimudalige</name>
- <email>chamil@opensource.lk</email>
- <organization>Lanka Software Foundation</organization>
- </contributor>
- <contributor>
- <name>Ruchith Fernando</name>
- <email>ruchithf@apache.lk</email>
- <organization>Lanka Software Foundation</organization>
- </contributor>
- <contributor>
- <name>Nadana Gunarathna</name>
- <email>nadana@opensource.lk</email>
- <organization>Lanka Software Foundation</organization>
- </contributor>
- <contributor>
- <name>Saminda Abeyruwan</name>
- <email>saminda@opensource.lk</email>
- <organization>Lanka Software Foundation</organization>
- </contributor>
- <contributor>
- <name>Gayan Asanka</name>
- <email>gayan@opensource.lk</email>
- <organization>Lanka Software Foundation</organization>
- </contributor>
+ <!-- a unique name for this project -->
+ <name>Apache Axis 2.0</name>
+ <id>axis</id>
+ <groupId>axis</groupId>
+ <package>org.apache.axis2</package>
+
+ <currentVersion>0.9</currentVersion>
+
+ <!-- details about the organization that 'owns' the project -->
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ <logo>http://www.apache.org/images/asf-logo.gif</logo>
+ </organization>
+
+ <inceptionYear>2004</inceptionYear>
+ <package>org.apache.axis2</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 and Apache WSS4J 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>
+ <issueTrackingUrl>http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10611</issueTrackingUrl>
+ <siteAddress>ws.apache.org/axis2</siteAddress>
+ <siteDirectory>/www/ws.apache.org/axis2/</siteDirectory>
+ <distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
+ <!-- repository>
+<connection>scm|svn|http://svn.apache.org/repos/asf/webservices/axis/trunk</connection>
+<developerConnection>scm|svn|https://svn.apache.org/repos/asf/webservices/axis/trunk</developerConnection>
+<url>http://svn.apache.org/viewcvs.cgi/webservices/axis/trunk/?root=Apache-SVN</url>
+</repository -->
+ <mailingLists>
+ <mailingList>
+ <name>Axis Developer List</name>
+ <subscribe>axis-dev-subscribe@ws.apache.org</subscribe>
+ <unsubscribe>axis-dev-unsubscribe@ws.apache.org</unsubscribe>
+ <archive>http://marc.theaimsgroup.com/?l=axis-dev&r=1&w=2</archive>
+
+ </mailingList>
+ <mailingList>
+ <name>Axis User List</name>
+ <subscribe>axis-user-subscribe@ws.apache.org</subscribe>
+ <unsubscribe>axis-user-unsubscribe@ws.apache.org</unsubscribe>
+ <archive>http://marc.theaimsgroup.com/?l=axis-user&r=1&w=2</archive>
+ </mailingList>
+ </mailingLists>
+
+ <!-- ========== -->
+ <!-- Developers -->
+ <!-- ========== -->
+
+ <developers>
+ <developer>
+ <name>Davanum Srinivas</name>
+ <id>dims</id>
+ <email>dims@apache.org</email>
+ <organization>Computer Associates</organization>
+ </developer>
+ <developer>
+ <name>Sanjiva Weerawarana</name>
+ <id>sanjiva</id>
+ <email>sanjiva@apache.org</email>
+ <organization>Lanka Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Glen Daniels</name>
+ <id>gdaniels</id>
+ <email>gdaniels@apache.org</email>
+ <organization>Sonic Software</organization>
+ </developer>
+ <developer>
+ <name>Aleksander Slominski</name>
+ <id>alek</id>
+ <email>aslom@cs.indiana.edu</email>
+ <organization>Indiana University Extreme! Computing Lab</organization>
+ </developer>
+ <developer>
+ <name>Srinath Perera</name>
+ <id>hemapani</id>
+ <email>hemapani@apache.org</email>
+ <organization>Lanka Software Foundation</organization>
+ <url>http://www.apache.org/~hemapani</url>
+ </developer>
+ <developer>
+ <name>Eran Chinthaka</name>
+ <id>chinthaka</id>
+ <email>chinthaka@apache.org</email>
+ <organization>Lanka Software Foundation / Eurocenter DDC</organization>
+ <url>http://www.apache.org/~chinthaka</url>
+ </developer>
+ <developer>
+ <name>Dasarath Weerathunga</name>
+ <id>dasarath</id>
+ <email>dasarath@opensource.lk</email>
+ <organization>Lanka Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Jaliya Ekanayake</name>
+ <id>jaliya</id>
+ <email>jaliya@opensource.lk</email>
+ <organization>Virtusa / Lanka Software Foundation</organization>
+ <url>http://www.apache.org/~jaliya</url>
+ </developer>
+ <developer>
+ <name>Chathura Herath</name>
+ <id>chathura</id>
+ <email>chathura@opensource.lk</email>
+ <organization>LSF/MIT</organization>
+ <url>www.apache.org/~chathura</url>
+ </developer>
+ <developer>
+ <name>Deepal Jayasinghe</name>
+ <id>deepal</id>
+ <email>deepal@apache.org</email>
+ <organization>Lanka Software Foundation</organization>
+ <url>http://www.apache.org/~deepal</url>
+
+ </developer>
+ <developer>
+ <name>Ajith Ranabahu</name>
+ <id>ajith</id>
+ <email>ajith@apache.org</email>
+ <organization>Lanka Software Foundation / Eurocenter DDC</organization>
+ <url>http://www.apache.org/~ajith</url>
+
+ </developer>
+ <developer>
+ <name>Venkat Reddy</name>
+ <id>venkat</id>
+ <email>vreddyp@gmail.com</email>
+ <organization>Computer Associates</organization>
+ </developer>
+ <developer>
+ <name>Shahi, Ashutosh</name>
+ <id>ashu</id>
+ <email>Ashutosh.Shahi@ca.com</email>
+ <organization>Computer Associates</organization>
+ </developer>
+ <developer>
+ <name>Jayachandra Sekhara Rao Sunkara</name>
+ <id>jaya</id>
+ <email>jayachandra@gmail.com</email>
+ <organization>Computer Associates</organization>
+ </developer>
+ <developer>
+ <name>Thilina Gunarathne</name>
+ <id>thilina</id>
+ <email>thilina@opensource.lk</email>
+ <organization>Lanka Software Foundation / Virtusa</organization>
+ </developer>
+
+
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Farhaan Mohideen</name>
+ <email>fmohideen@valista.com</email>
+ <organization>Lanka Software Foundation</organization>
+ </contributor>
+ <contributor>
+ <name>Changshin Lee</name>
+ <email>iasandcb@hotmail.com</email>
+ <organization>Tmax Soft, Korea</organization>
+ </contributor>
+ <contributor>
+ <name>Chamil Thanthrimudalige</name>
+ <email>chamil@opensource.lk</email>
+ <organization>Lanka Software Foundation</organization>
+ </contributor>
+ <contributor>
+ <name>Ruchith Fernando</name>
+ <email>ruchithf@apache.lk</email>
+ <organization>Lanka Software Foundation</organization>
+ </contributor>
+ <contributor>
+ <name>Nadana Gunarathna</name>
+ <email>nadana@opensource.lk</email>
+ <organization>Lanka Software Foundation</organization>
+ </contributor>
+ <contributor>
+ <name>Saminda Abeyruwan</name>
+ <email>saminda@opensource.lk</email>
+ <organization>Lanka Software Foundation</organization>
+ </contributor>
+ <contributor>
+ <name>Gayan Asanka</name>
+ <email>gayan@opensource.lk</email>
+ <organization>Lanka Software Foundation</organization>
+ </contributor>
</contributors>
-
-
- <!-- build information for the project -->
- <build>
- <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
- <sourceDirectory>src</sourceDirectory>
- <unitTestSourceDirectory>test</unitTestSourceDirectory>
-
-<!--
- <sourceModifications>
- <sourceModification>
- <className>fakeClass</className>
- <excludes>
- <exclude>org/apache/axis2</exclude>
- <exclude>**/_*.java</exclude>
- </excludes>
- </sourceModification>
- </sourceModifications
--->
- <unitTest>
-
- <excludes>
- <exclude>**/*Abstract*.java</exclude>
- <exclude>**/*Util*.java</exclude>
- <exclude>**/*PhaseResolvingTest.java</exclude>
- </excludes>
- <includes>
- <include>**/*Test.java</include>
- </includes>
-
- <resources>
- <resource>
- <directory>${basedir}/test-resources</directory>
- </resource>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- </includes>
- </resource>
- <resource>
- <directory>test</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- </includes>
- </resource>
- </resources>
- </build>
+
+
+ <!-- build information for the project -->
+ <build>
+ <nagEmailAddress>axis-dev@ws.apache.org</nagEmailAddress>
+ <sourceDirectory>src</sourceDirectory>
+ <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+ <!--
+ <sourceModifications>
+ <sourceModification>
+ <className>fakeClass</className>
+ <excludes>
+ <exclude>org/apache/axis2</exclude>
+ <exclude>**/_*.java</exclude>
+ </excludes>
+ </sourceModification>
+ </sourceModifications
+ -->
+ <unitTest>
+
+ <excludes>
+ <exclude>**/*Abstract*.java</exclude>
+ <exclude>**/*Util*.java</exclude>
+ <exclude>**/*PhaseResolvingTest.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/test-resources</directory>
+ </resource>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>test</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
<!-- ======= -->
@@ -286,6 +286,6 @@
<report>maven-clover-plugin</report> -->
<report>maven-changes-plugin</report>
</reports>
-
+
</project>
Modified: webservices/axis/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/maven.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/maven.xml (original)
+++ webservices/axis/trunk/java/maven.xml Mon Jul 11 08:49:30 2005
@@ -16,33 +16,33 @@
* limitations under the License.
*/
-->
-
- <!--
- | The main goals for multi project build are:
- |
- | default
- | Build all the modules
- |
- | clean
- | Deletes the 'target' directory in all projects
-
- | clean-repo
- | Deletes the 'target' directory in all projects
- |
- | war
- | Build the war
- |
- | maven war-withsamples
- | build the war with the default samples
- |
- | dist-src
- | Source Distribution
- |
- | dist-bin
- | Binary Distribution
- |
- -->
-
+
+<!--
+ | The main goals for multi project build are:
+ |
+ | default
+ | Build all the modules
+ |
+ | clean
+ | Deletes the 'target' directory in all projects
+
+ | clean-repo
+ | Deletes the 'target' directory in all projects
+ |
+ | war
+ | Build the war
+ |
+ | maven war-withsamples
+ | build the war with the default samples
+ |
+ | dist-src
+ | Source Distribution
+ |
+ | dist-bin
+ | Binary Distribution
+ |
+ -->
+
<project default="jar"
xmlns:j="jelly:core"
xmlns:u="jelly:util"
@@ -182,7 +182,7 @@
<j:set var="reactorProjects" value="${reactorProjects}" scope="parent"/>
</define:tag>
</define:taglib>
-
+
<goal name="m:init">
<ant:fileScanner var="scanner">
<ant:fileset dir="${basedir}">
@@ -220,30 +220,30 @@
</j:if>
</j:forEach>
</goal>
-
- <goal name="jar">
- <attainGoal name="multiproject:install"/>
- <attainGoal name="create-jar"/>
- <ant:copy file="target/lib/axis2-${pom.currentVersion}.jar"
- toDir="target/"/>
- </goal>
+
+ <goal name="jar">
+ <attainGoal name="multiproject:install"/>
+ <attainGoal name="create-jar"/>
+ <ant:copy file="target/lib/axis2-${pom.currentVersion}.jar"
+ toDir="target/"/>
+ </goal>
<goal name="init">
<ant:mkdir dir="target"/>
<ant:mkdir dir="${dist.dir}"/>
- <ant:mkdir dir="target/lib"/>
+ <ant:mkdir dir="target/lib"/>
<uptodate property="jars.uptodate" targetfile="target/axis2.war">
- <srcfiles dir="modules">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.wsdl"/>
- <exclude name="**/target/**"/>
- </srcfiles>
- </uptodate>
- <echo message="the files are up to date = ${jars.uptodate}"></echo>
- </goal>
+ <srcfiles dir="modules">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.wsdl"/>
+ <exclude name="**/target/**"/>
+ </srcfiles>
+ </uptodate>
+ <echo message="the files are up to date = ${jars.uptodate}"></echo>
+ </goal>
<goal name="modules:clean">
<attainGoal name="modules:reactor:init"/>
@@ -258,9 +258,9 @@
<ant:include name="maven.log"/>
<ant:include name="velocity.log*"/>
<ant:include name="junit*.properties"/>
- <ant:include name="axis.log"/>
- <ant:include name="junit*.properties"/>
- <ant:include name="temp.properties"/>
+ <ant:include name="axis.log"/>
+ <ant:include name="junit*.properties"/>
+ <ant:include name="temp.properties"/>
</ant:fileset>
</ant:delete>
<ant:echo></ant:echo>
@@ -276,19 +276,19 @@
<attainGoal name="modules:clean"/>
</goal>
- <!-- ================================================================ -->
- <!--- Clean the Repository -->
- <!-- ================================================================ -->
+ <!-- ================================================================ -->
+ <!--- Clean the Repository -->
+ <!-- ================================================================ -->
<goal name="clean-repo">
- <ant:delete >
- <ant:fileset dir="${maven.repo.local}">
+ <ant:delete>
+ <ant:fileset dir="${maven.repo.local}">
<ant:include name="axis/jars/axis2*.jar"/>
- </ant:fileset>
+ </ant:fileset>
</ant:delete>
</goal>
<goal name="create-jar" prereqs="init">
- <jar destfile="target/lib/axis2-${pom.currentVersion}.jar">
+ <jar destfile="target/lib/axis2-${pom.currentVersion}.jar">
<fileset dir="modules/core/target/classes"/>
<fileset dir="modules/xml/target/classes"/>
<fileset dir="modules/wsdl/target/classes"/>
@@ -300,203 +300,203 @@
</goal>
<goal name="create-lib">
- <attainGoal name="modules:reactor:init"/>
- <maven:reactor
- basedir="${basedir}"
- postProcessing="true"
- includes="${modules.reactor.includes}"
- banner="Executing (${goals}):"
- ignoreFailures="false"/>
- <j:forEach var="x" items="${reactorProjects}">
- <ant:echo message="${x}"/>
- <deploy:copy-deps todir="target/lib"
- projectDescriptor="${x.getFile()}"/>
- </j:forEach>
- </goal>
-
- <!-- ================================================================ -->
- <!--- Create the War -->
- <!-- ================================================================ -->
-
-
- <goal name="war" prereqs="init">
- <j:if test="${jars.uptodate != 'yes'}">
- <attainGoal name="jar"/>
- <attainGoal name="create-lib"/>
- </j:if>
+ <attainGoal name="modules:reactor:init"/>
+ <maven:reactor
+ basedir="${basedir}"
+ postProcessing="true"
+ includes="${modules.reactor.includes}"
+ banner="Executing (${goals}):"
+ ignoreFailures="false"/>
+ <j:forEach var="x" items="${reactorProjects}">
+ <ant:echo message="${x}"/>
+ <deploy:copy-deps todir="target/lib"
+ projectDescriptor="${x.getFile()}"/>
+ </j:forEach>
+ </goal>
+
+ <!-- ================================================================ -->
+ <!--- Create the War -->
+ <!-- ================================================================ -->
+
+
+ <goal name="war" prereqs="init">
+ <j:if test="${jars.uptodate != 'yes'}">
+ <attainGoal name="jar"/>
+ <attainGoal name="create-lib"/>
+ </j:if>
<!-- jar the test classes -->
- <ant:war destfile="target/axis2.war" webxml="modules/core/conf/web.xml">
- <ant:fileset dir="modules/core/webapp"/>
- <ant:lib dir="target/lib">
- <ant:include name="**"/>
- <ant:exclude name="**servlet**"/>
- <ant:exclude name="commons-httpclient-*.jar"/>
- <ant:exclude name="ant*.jar"/>
- </ant:lib>
- <ant:classes dir="modules/core/conf">
- <ant:include name="*.properties"/>
- </ant:classes>
+ <ant:war destfile="target/axis2.war" webxml="modules/core/conf/web.xml">
+ <ant:fileset dir="modules/core/webapp"/>
+ <ant:lib dir="target/lib">
+ <ant:include name="**"/>
+ <ant:exclude name="**servlet**"/>
+ <ant:exclude name="commons-httpclient-*.jar"/>
+ <ant:exclude name="ant*.jar"/>
+ </ant:lib>
+ <ant:classes dir="modules/core/conf">
+ <ant:include name="*.properties"/>
+ </ant:classes>
<ant:webinf dir="modules/samples/target/toWar/"/>
<ant:webinf dir="modules/core/src/org/apache/axis2/deployment">
- <ant:include name="*.xml"/>
- </ant:webinf>
- </ant:war>
- </goal>
- <!-- to transforme htmls to xdocs -->
- <preGoal name="xdoc:jelly-transform">
- <attainGoal name="html2xdoc"/>
- </preGoal>
-
- <!-- ================================================================ -->
- <!--- Create the Binary Distribution -->
- <!-- ================================================================ -->
-
- <goal name="dist-bin" prereqs="war,javadoc-gen,create-lib">
+ <ant:include name="*.xml"/>
+ </ant:webinf>
+ </ant:war>
+ </goal>
+ <!-- to transforme htmls to xdocs -->
+ <preGoal name="xdoc:jelly-transform">
+ <attainGoal name="html2xdoc"/>
+ </preGoal>
+
+ <!-- ================================================================ -->
+ <!--- Create the Binary Distribution -->
+ <!-- ================================================================ -->
+
+ <goal name="dist-bin" prereqs="war,javadoc-gen,create-lib">
<property name="bin.dist.dir" value="target/dist-bin/axis2-${pom.currentVersion}-bin"/>
<ant:mkdir dir="${bin.dist.dir}"/>
- <ant:mkdir dir="${bin.dist.dir}/docs"/>
- <ant:mkdir dir="${bin.dist.dir}/bin"/>
- <ant:mkdir dir="${bin.dist.dir}/lib"/>
- <ant:mkdir dir="${bin.dist.dir}/samples"/>
- <ant:mkdir dir="${bin.dist.dir}/webapps"/>
- <ant:mkdir dir="${bin.dist.dir}/docs/api"/>
-
- <ant:copy todir="${bin.dist.dir}/docs/api">
- <ant:fileset dir="target/apidocs/">
- <ant:include name="**"/>
- </ant:fileset>
- </ant:copy>
- <ant:copy todir="${bin.dist.dir}/docs">
- <ant:fileset dir="xdocs">
- <ant:include name="**"/>
- <ant:exclude name="*M1*/**"/>
- </ant:fileset>
- </ant:copy>
- <ant:copy todir="${bin.dist.dir}/lib" flatten="true">
- <ant:fileset dir="target/lib">
- <ant:include name="*.jar"/>
- <ant:exclude name="**servlet**.jar"/>
- <ant:exclude name="commons-httpclient-*.jar"/>
- <ant:exclude name="ant*.jar"/>
- <ant:exclude name="commons-fileupload-*.jar"/>
- </ant:fileset>
- </ant:copy>
- <ant:copy file="target/axis2.war" tofile="${bin.dist.dir}/webapps/axis2.war"/>
+ <ant:mkdir dir="${bin.dist.dir}/docs"/>
+ <ant:mkdir dir="${bin.dist.dir}/bin"/>
+ <ant:mkdir dir="${bin.dist.dir}/lib"/>
+ <ant:mkdir dir="${bin.dist.dir}/samples"/>
+ <ant:mkdir dir="${bin.dist.dir}/webapps"/>
+ <ant:mkdir dir="${bin.dist.dir}/docs/api"/>
+
+ <ant:copy todir="${bin.dist.dir}/docs/api">
+ <ant:fileset dir="target/apidocs/">
+ <ant:include name="**"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:copy todir="${bin.dist.dir}/docs">
+ <ant:fileset dir="xdocs">
+ <ant:include name="**"/>
+ <ant:exclude name="*M1*/**"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:copy todir="${bin.dist.dir}/lib" flatten="true">
+ <ant:fileset dir="target/lib">
+ <ant:include name="*.jar"/>
+ <ant:exclude name="**servlet**.jar"/>
+ <ant:exclude name="commons-httpclient-*.jar"/>
+ <ant:exclude name="ant*.jar"/>
+ <ant:exclude name="commons-fileupload-*.jar"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:copy file="target/axis2.war" tofile="${bin.dist.dir}/webapps/axis2.war"/>
<ant:copy file="modules/samples/script/build.xml" tofile="${bin.dist.dir}/samples/build.xml"/>
- <ant:copy todir="${bin.dist.dir}/samples">
- <ant:fileset dir="modules/samples/conf/">
- <ant:include name="*.xml"/>
- </ant:fileset>
- </ant:copy>
- <ant:copy todir="${bin.dist.dir}/samples">
- <ant:fileset dir="modules/samples/target/samples">
- <include name="**"/>
- </ant:fileset>
- </ant:copy>
- <ant:copy todir="${bin.dist.dir}/">
- <ant:fileset dir=".">
- <ant:include name="*.html"/>
- <ant:include name="*.txt"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:mkdir dir="${bin.dist.dir}/repository"/>
- <ant:mkdir dir="${bin.dist.dir}/repository/services"/>
- <ant:mkdir dir="${bin.dist.dir}/repository/modules"/>
- <ant:copy todir="${bin.dist.dir}/repository">
- <ant:fileset dir="modules/samples/target/toWar/">
- <ant:include name="**"/>
- </ant:fileset>
- </ant:copy>
-
-
- <ant:copy todir="${bin.dist.dir}/bin">
- <ant:fileset dir="modules/tool/script"/>
- </ant:copy>
-
- <ant:zip file="${dist.dir}/${dist.name}-bin.zip" basedir="target/dist-bin"/>
- <ant:tar tarfile="target/${dist.name}-bin.tar" basedir="target/dist-bin"/>
- <gzip src="target/${dist.name}-bin.tar" zipfile="${dist.dir}/${dist.name}-bin.tar.gz"/>
- <ant:delete dir="target/dist-bin"/>
- <ant:delete file="target/${dist.name}-bin.tar"/>
- </goal>
-
- <!-- ================================================================ -->
- <!--- Create the Source Distribution -->
- <!-- ================================================================ -->
-
- <goal name="dist-src" prereqs="init">
- <ant:zip file="${dist.dir}/${dist.name}-src.zip" >
- <ant:fileset dir=".">
- <ant:include name="**"/>
- <ant:exclude name="**/target/**"/>
- <ant:exclude name="**/.svn/**"/>
- <ant:exclude name="**/bin/**"/>
- <ant:exclude name=".*"/>
- <ant:exclude name="**/*.license"/>
- </ant:fileset>
- </ant:zip>
- <ant:tar tarfile="target/${dist.name}-src.tar" longfile="gnu" >
- <ant:tarfileset dir=".">
- <ant:include name="**"/>
- <ant:exclude name="**/target/**"/>
- <ant:exclude name="**/.svn/**"/>
- <ant:exclude name="**/bin/**"/>
- <ant:exclude name=".*"/>
- <ant:exclude name="**/*.license"/>
- </ant:tarfileset>
- </ant:tar>
- <gzip src="target/${dist.name}-src.tar" zipfile="${dist.dir}/${dist.name}-src.tar.gz"/>
- <ant:delete file="target/${dist.name}-src.tar"/>
- </goal>
-
- <!-- ================================================================ -->
- <!--- Create the Java Docs -->
- <!-- ================================================================ -->
-
- <goal name="javadoc-gen" prereqs="init">
- <ant:javadoc packagenames="org.apache.axis2.*"
- defaultexcludes="yes"
- destdir="target/apidocs"
- author="true"
- version="true"
- use="true"
- windowtitle="Axis2 API">
- <ant:sourcepath>
- <ant:pathelement location="modules/core/src"/>
- <ant:pathelement location="modules/wsdl/src"/>
- <ant:pathelement location="modules/xml/src"/>
- </ant:sourcepath>
- </ant:javadoc>
- </goal>
-
- <!-- ================================================================ -->
- <!--- Reports -->
- <!-- ================================================================ -->
- <!-- Conditionally disable linkcheck based on a property. -->
-
-<postGoal name="xdoc:register-reports">
-<j:if test="${maven.allreports.disable}">
- <echo>Reports are disabled. Deregistering all the reports ....</echo>
- <attainGoal name="maven-linkcheck-plugin:deregister"/>
- <echo>linkcheck is disabled.</echo>
- <attainGoal name="maven-checkstyle-plugin:deregister"/>
- <echo>checkstyle is disabled.</echo>
- <attainGoal name="maven-changes-plugin:deregister"/>
- <echo>changes is disabled.</echo>
- <attainGoal name="maven-changelog-plugin:deregister"/>
- <echo>changelog is disabled.</echo>
- <attainGoal name="maven-license-plugin:deregister"/>
- <echo>license is disabled.</echo>
- <attainGoal name="maven-javadoc-plugin:deregister"/>
- <echo>javadoc is disabled.</echo>
- <attainGoal name="maven-junit-report-plugin:deregister"/>
- <echo>junit-report is disabled.</echo>
- <attainGoal name="maven-tasklist-plugin:deregister"/>
- <echo>tasklist is disabled.</echo>
- </j:if>
-
-</postGoal>
-
- </project>
+ <ant:copy todir="${bin.dist.dir}/samples">
+ <ant:fileset dir="modules/samples/conf/">
+ <ant:include name="*.xml"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:copy todir="${bin.dist.dir}/samples">
+ <ant:fileset dir="modules/samples/target/samples">
+ <include name="**"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:copy todir="${bin.dist.dir}/">
+ <ant:fileset dir=".">
+ <ant:include name="*.html"/>
+ <ant:include name="*.txt"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:mkdir dir="${bin.dist.dir}/repository"/>
+ <ant:mkdir dir="${bin.dist.dir}/repository/services"/>
+ <ant:mkdir dir="${bin.dist.dir}/repository/modules"/>
+ <ant:copy todir="${bin.dist.dir}/repository">
+ <ant:fileset dir="modules/samples/target/toWar/">
+ <ant:include name="**"/>
+ </ant:fileset>
+ </ant:copy>
+
+
+ <ant:copy todir="${bin.dist.dir}/bin">
+ <ant:fileset dir="modules/tool/script"/>
+ </ant:copy>
+
+ <ant:zip file="${dist.dir}/${dist.name}-bin.zip" basedir="target/dist-bin"/>
+ <ant:tar tarfile="target/${dist.name}-bin.tar" basedir="target/dist-bin"/>
+ <gzip src="target/${dist.name}-bin.tar" zipfile="${dist.dir}/${dist.name}-bin.tar.gz"/>
+ <ant:delete dir="target/dist-bin"/>
+ <ant:delete file="target/${dist.name}-bin.tar"/>
+ </goal>
+
+ <!-- ================================================================ -->
+ <!--- Create the Source Distribution -->
+ <!-- ================================================================ -->
+
+ <goal name="dist-src" prereqs="init">
+ <ant:zip file="${dist.dir}/${dist.name}-src.zip">
+ <ant:fileset dir=".">
+ <ant:include name="**"/>
+ <ant:exclude name="**/target/**"/>
+ <ant:exclude name="**/.svn/**"/>
+ <ant:exclude name="**/bin/**"/>
+ <ant:exclude name=".*"/>
+ <ant:exclude name="**/*.license"/>
+ </ant:fileset>
+ </ant:zip>
+ <ant:tar tarfile="target/${dist.name}-src.tar" longfile="gnu">
+ <ant:tarfileset dir=".">
+ <ant:include name="**"/>
+ <ant:exclude name="**/target/**"/>
+ <ant:exclude name="**/.svn/**"/>
+ <ant:exclude name="**/bin/**"/>
+ <ant:exclude name=".*"/>
+ <ant:exclude name="**/*.license"/>
+ </ant:tarfileset>
+ </ant:tar>
+ <gzip src="target/${dist.name}-src.tar" zipfile="${dist.dir}/${dist.name}-src.tar.gz"/>
+ <ant:delete file="target/${dist.name}-src.tar"/>
+ </goal>
+
+ <!-- ================================================================ -->
+ <!--- Create the Java Docs -->
+ <!-- ================================================================ -->
+
+ <goal name="javadoc-gen" prereqs="init">
+ <ant:javadoc packagenames="org.apache.axis2.*"
+ defaultexcludes="yes"
+ destdir="target/apidocs"
+ author="true"
+ version="true"
+ use="true"
+ windowtitle="Axis2 API">
+ <ant:sourcepath>
+ <ant:pathelement location="modules/core/src"/>
+ <ant:pathelement location="modules/wsdl/src"/>
+ <ant:pathelement location="modules/xml/src"/>
+ </ant:sourcepath>
+ </ant:javadoc>
+ </goal>
+
+ <!-- ================================================================ -->
+ <!--- Reports -->
+ <!-- ================================================================ -->
+ <!-- Conditionally disable linkcheck based on a property. -->
+
+ <postGoal name="xdoc:register-reports">
+ <j:if test="${maven.allreports.disable}">
+ <echo>Reports are disabled. Deregistering all the reports ....</echo>
+ <attainGoal name="maven-linkcheck-plugin:deregister"/>
+ <echo>linkcheck is disabled.</echo>
+ <attainGoal name="maven-checkstyle-plugin:deregister"/>
+ <echo>checkstyle is disabled.</echo>
+ <attainGoal name="maven-changes-plugin:deregister"/>
+ <echo>changes is disabled.</echo>
+ <attainGoal name="maven-changelog-plugin:deregister"/>
+ <echo>changelog is disabled.</echo>
+ <attainGoal name="maven-license-plugin:deregister"/>
+ <echo>license is disabled.</echo>
+ <attainGoal name="maven-javadoc-plugin:deregister"/>
+ <echo>javadoc is disabled.</echo>
+ <attainGoal name="maven-junit-report-plugin:deregister"/>
+ <echo>junit-report is disabled.</echo>
+ <attainGoal name="maven-tasklist-plugin:deregister"/>
+ <echo>tasklist is disabled.</echo>
+ </j:if>
+
+ </postGoal>
+
+</project>
Modified: webservices/axis/trunk/java/modules/addressing/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/maven.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/maven.xml (original)
+++ webservices/axis/trunk/java/modules/addressing/maven.xml Mon Jul 11 08:49:30 2005
@@ -8,16 +8,16 @@
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
<postGoal name="test:compile">
- <mkdir dir="target/classes/META-INF"/>
- <copy file="src/META-INF/module.xml"
- tofile="target/classes/META-INF/module.xml"/>
- <copy file="./test-resources/axis2.xml"
- tofile="target/axis2.xml"/>
+ <mkdir dir="target/classes/META-INF"/>
+ <copy file="src/META-INF/module.xml"
+ tofile="target/classes/META-INF/module.xml"/>
+ <copy file="./test-resources/axis2.xml"
+ tofile="target/axis2.xml"/>
<mkdir dir="target/modules"/>
- <jar jarfile="target/addressing.mar" basedir="target/classes" >
- <include name="**" />
- </jar>
+ <jar jarfile="target/addressing.mar" basedir="target/classes">
+ <include name="**"/>
+ </jar>
<copy file="target/addressing.mar"
- tofile="target/modules/addressing.mar"/>
- </postGoal>
- </project>
+ tofile="target/modules/addressing.mar"/>
+ </postGoal>
+</project>
Modified: webservices/axis/trunk/java/modules/addressing/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/project.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/project.xml (original)
+++ webservices/axis/trunk/java/modules/addressing/project.xml Mon Jul 11 08:49:30 2005
@@ -35,8 +35,8 @@
<groupId>axis</groupId>
<artifactId>axis2-wsdl</artifactId>
<version>${pom.currentVersion}</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>axis</groupId>
<artifactId>axis2-core</artifactId>
@@ -51,33 +51,33 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>1.1.1-dev</version>
<properties>
<module>true</module>
</properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
+ <url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
- <dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<properties>
<module>true</module>
</properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
+ <url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
- <dependency>
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0</version>
<properties>
<module>true</module>
</properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
+ <url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
@@ -87,7 +87,7 @@
<module>true</module>
</properties>
</dependency>
- </dependencies>
-
- <reports/>
+ </dependencies>
+
+ <reports/>
</project>
Modified: webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Mon Jul 11 08:49:30 2005
@@ -109,16 +109,14 @@
private void extractAddressingFinalInformationFromHeaders(SOAPHeader header,
MessageInformationHeadersCollection messageInformationHeaders,
ArrayList addressingHeaders)
- throws AddressingException
- {
+ throws AddressingException {
extractCommonAddressingParameters(header, messageInformationHeaders, addressingHeaders, Final.WSA_NAMESPACE);
}
private void extractAddressingSubmissionInformationFromHeaders(SOAPHeader header,
MessageInformationHeadersCollection messageInformationHeaders,
ArrayList addressingHeaders)
- throws AddressingException
- {
+ throws AddressingException {
extractCommonAddressingParameters(header, messageInformationHeaders, addressingHeaders, Submission.WSA_NAMESPACE);
}
@@ -126,8 +124,7 @@
MessageInformationHeadersCollection messageInformationHeadersCollection,
ArrayList addressingHeaders,
String addressingNamespace)
- throws AddressingException
- {
+ throws AddressingException {
if (messageInformationHeadersCollection == null) {
messageInformationHeadersCollection = new MessageInformationHeadersCollection();
}
Modified: webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Mon Jul 11 08:49:30 2005
@@ -139,12 +139,12 @@
if (relatesToHeader != null)
if ("".equals(relatesTo.getRelationshipType())) {
relatesToHeader.addAttribute(WSA_RELATES_TO_RELATIONSHIP_TYPE,
- Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE,
- addressingNamespaceObject);
+ Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE,
+ addressingNamespaceObject);
} else {
relatesToHeader.addAttribute(WSA_RELATES_TO_RELATIONSHIP_TYPE,
- relatesTo.getRelationshipType(),
- addressingNamespaceObject);
+ relatesTo.getRelationshipType(),
+ addressingNamespaceObject);
}
}
@@ -175,7 +175,7 @@
if (!"".equals(address) && address != null) {
OMElement addressElement =
OMAbstractFactory.getOMFactory().createOMElement(EPR_ADDRESS,
- addressingNamespaceObject);
+ addressingNamespaceObject);
soapHeaderBlock.addChild(addressElement);
addressElement.setText(address);
}
@@ -220,13 +220,13 @@
if (serviceName != null) {
OMElement serviceNameElement =
OMAbstractFactory.getOMFactory().createOMElement(EPR_SERVICE_NAME,
- addressingNamespaceObject);
+ addressingNamespaceObject);
serviceNameElement.addAttribute(addressingNamespace.equals(Submission.WSA_NAMESPACE) ? Submission.EPR_SERVICE_NAME_PORT_NAME : Final.WSA_SERVICE_NAME_ENDPOINT_NAME,
- serviceName.getEndpointName(),
- addressingNamespaceObject);
+ serviceName.getEndpointName(),
+ addressingNamespaceObject);
serviceNameElement.addChild(OMAbstractFactory.getOMFactory().createText(serviceName.getName().getPrefix()
- + ":"
- + serviceName.getName().getLocalPart()));
+ + ":"
+ + serviceName.getName().getLocalPart()));
parentElement.addChild(serviceNameElement);
}
Modified: webservices/axis/trunk/java/modules/addressing/test-resources/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test-resources/axis2.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test-resources/axis2.xml (original)
+++ webservices/axis/trunk/java/modules/addressing/test-resources/axis2.xml Mon Jul 11 08:49:30 2005
@@ -22,7 +22,7 @@
<phaseOrder type="outflow">
<!-- user can add his own phases to this area -->
<phase name="userphase1"/>
-<!-- This is temporray solution will be change soon-->
+ <!-- This is temporray solution will be change soon-->
<phase name="addressing"/>
</phaseOrder>
<phaseOrder type="INfaultflow">
Modified: webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTest.java Mon Jul 11 08:49:30 2005
@@ -54,12 +54,12 @@
public void testExtractAddressingInformationFromHeaders() {
try {
StAXSOAPModelBuilder omBuilder = testUtil.getOMBuilder(testFileName);
-
+
SOAPHeader header = ((SOAPEnvelope) omBuilder.getDocumentElement()).getHeader();
MessageInformationHeadersCollection messageInformationHeadersCollection =
- inHandler.extractCommonAddressingParameters(header, null,header.getHeaderBlocksWithNSURI(AddressingConstants.Submission.WSA_NAMESPACE), AddressingConstants.Submission.WSA_NAMESPACE);
+ inHandler.extractCommonAddressingParameters(header, null, header.getHeaderBlocksWithNSURI(AddressingConstants.Submission.WSA_NAMESPACE), AddressingConstants.Submission.WSA_NAMESPACE);
- if(messageInformationHeadersCollection == null){
+ if (messageInformationHeadersCollection == null) {
fail("Addressing Information Headers have not been retrieved properly");
}
assertEquals("action header is not correct", messageInformationHeadersCollection.getAction(), action);
@@ -73,11 +73,9 @@
}
}
- private void assertFromEPR(EndpointReference fromEPR){
+ private void assertFromEPR(EndpointReference fromEPR) {
assertEquals("Address in EPR is not valid", fromEPR.getAddress(), fromAddress);
}
-
-
}
Modified: webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java (original)
+++ webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java Mon Jul 11 08:49:30 2005
@@ -35,12 +35,12 @@
}
public void testExtractAddressingInformationFromHeaders() throws AxisFault {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration er = builder.buildConfigurationContext("target").getAxisConfiguration();
- File file = new File("target/addressing.mar");
- assertTrue(file.exists());
- ModuleDescription moduleDesc = er.getModule(new QName("addressing"));
- assertNotNull(moduleDesc);
+ ConfigurationContextFactory builder = new ConfigurationContextFactory();
+ AxisConfiguration er = builder.buildConfigurationContext("target").getAxisConfiguration();
+ File file = new File("target/addressing.mar");
+ assertTrue(file.exists());
+ ModuleDescription moduleDesc = er.getModule(new QName("addressing"));
+ assertNotNull(moduleDesc);
}
}
Modified: webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java Mon Jul 11 08:49:30 2005
@@ -85,8 +85,8 @@
epr = new EndpointReference(WSA_TO, "http://www.to.org/service/");
referenceValues = new AnyContentType();
- referenceValues.addReferenceValue(new QName("http://reference.org","Reference4", "myRef"), "Value 400");
- referenceValues.addReferenceValue(new QName("http://reference.org","Reference3", "myRef"), "Value 300");
+ referenceValues.addReferenceValue(new QName("http://reference.org", "Reference4", "myRef"), "Value 400");
+ referenceValues.addReferenceValue(new QName("http://reference.org", "Reference3", "myRef"), "Value 300");
epr.setReferenceParameters(referenceValues);
epr.setServiceName(new ServiceName(new QName("http://www.from.org/service/", "Service", "serviceNS"), "port"));
Modified: webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/util/TestUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/util/TestUtil.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/util/TestUtil.java (original)
+++ webservices/axis/trunk/java/modules/addressing/test/org/apache/axis2/handlers/util/TestUtil.java Mon Jul 11 08:49:30 2005
@@ -23,7 +23,7 @@
* the License.
* <p/>
*/
-public class TestUtil{
+public class TestUtil {
/**
* Eran Chinthaka (chinthaka@apache.org)
@@ -43,7 +43,7 @@
return builder;
}
- protected File getTestResourceFile(String relativePath) {
+ protected File getTestResourceFile(String relativePath) {
return new File(testResourceDir, relativePath);
}
}
Modified: webservices/axis/trunk/java/modules/core/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/maven.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/maven.xml (original)
+++ webservices/axis/trunk/java/modules/core/maven.xml Mon Jul 11 08:49:30 2005
@@ -9,13 +9,13 @@
xmlns:ant="jelly:ant">
<postGoal name="test:compile">
<j:jelly xmlns="jelly:ant">
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/service2"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/service2"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/echo"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/invalidservice"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/outservice"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/module1"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/invalidservice"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/outservice"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/module1"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/serviceModule"/>
- </j:jelly>
- <ant:copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
- </postGoal>
- </project>
+ </j:jelly>
+ <ant:copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
+ </postGoal>
+</project>
Modified: webservices/axis/trunk/java/modules/core/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/project.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/project.xml (original)
+++ webservices/axis/trunk/java/modules/core/project.xml Mon Jul 11 08:49:30 2005
@@ -46,59 +46,59 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>1.1.1-dev</version>
<properties>
<module>true</module>
</properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
+ <url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
- <dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<properties>
<module>true</module>
</properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
+ <url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
- <dependency>
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0</version>
<properties>
<module>true</module>
</properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-servlet</artifactId>
+ <version>2.4-rc3</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0-rc2</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.0</version>
+ <properties>
+ <module>true</module>
+ </properties>
</dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-servlet</artifactId>
- <version>2.4-rc3</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0-rc2</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis-wsdl4j</artifactId>
@@ -107,7 +107,7 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
+ <dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-javamail</artifactId>
<version>1.3.1-rc3</version>
@@ -124,6 +124,6 @@
</properties>
</dependency>
</dependencies>
-
+
<reports/>
</project>
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/Constants.java Mon Jul 11 08:49:30 2005
@@ -78,20 +78,20 @@
* Field TRANSPORT_HTTP
*/
public static final String TRANSPORT_HTTP = "http";
-
+
public static final String TRANSPORT_COMMONS_HTTP = "commons-http";
-
+
public static final String TRANSPORT_MAIL = "mail";
public static final String TRANSPORT_JMS = "jms";
-
+
public static final String TRANSPORT_LOCAL = "local";
/**
* Field LISTSERVICES
*/
public static final String REQUEST_URL_PREFIX = "/services";
-
+
public static final String LISTSERVICES = "listServices";
public static final String LIST_SERVICE_FOR_MODULE_ENGAMNET = "listoperation";
@@ -165,31 +165,30 @@
public static final String LOGGED = "Logged";
- public static interface Configuration {
+ public static interface Configuration {
public static final String ENABLE_REST = "enableREST";
- // globally enable MTOM
+ // globally enable MTOM
public static final String ENABLE_MTOM = "enableMTOM";
public static final String ATTACHMENT_TEMP_DIR = "attachmentDIR";
public static final String CACHE_ATTACHMENTS = "cacheAttachments";
}
+
public static final String VALUE_TRUE = "true";
public static final String VALUE_FALSE = "false";
public static final String CONTAINER_MANAGED = "ContainerManaged";
public static final String RESPONSE_WRITTEN = "CONTENT_WRITTEN";
-
-
- public static final String TESTING_PATH = "target/test-resources/";
+
+
+ public static final String TESTING_PATH = "target/test-resources/";
//public static final String TESTING_PATH = "modules/samples/target/test-resources/";
-
- public static final String TESTING_REPOSITORY = TESTING_PATH+ "samples";
-
-
-
-
- public static interface REST_WITH_GET{
+
+ public static final String TESTING_REPOSITORY = TESTING_PATH + "samples";
+
+
+ public static interface REST_WITH_GET {
public static final String GET_PARAMETER_OPERATION = "operation";
public static final String GET_PARAMETER_URL = "http://ws.apache.org/goGetWithREST";
-
+
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/AnyContentType.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/AnyContentType.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/AnyContentType.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/AnyContentType.java Mon Jul 11 08:49:30 2005
@@ -60,7 +60,7 @@
return (String) valueHolder.get(name);
}
- public Iterator getKeys(){
+ public Iterator getKeys() {
return valueHolder.keySet().iterator();
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/EndpointReference.java Mon Jul 11 08:49:30 2005
@@ -86,8 +86,7 @@
*
* @param messageInformationHeaderType
*/
- public void setMessageInformationHeaderType(
- String messageInformationHeaderType) {
+ public void setMessageInformationHeaderType(String messageInformationHeaderType) {
this.messageInformationHeaderType = messageInformationHeaderType;
}
@@ -189,5 +188,5 @@
this.policies = policies;
}
-
+
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeadersCollection.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeadersCollection.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeadersCollection.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeadersCollection.java Mon Jul 11 08:49:30 2005
@@ -228,8 +228,8 @@
this.referenceParameters = referenceParameters;
}
- public void addReferenceParameter(OMElement referenceParameter){
- if(referenceParameters == null){
+ public void addReferenceParameter(OMElement referenceParameter) {
+ if (referenceParameters == null) {
referenceParameters = new ArrayList(5);
}
referenceParameters.add(referenceParameter);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/om/AddressingHeaders.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/om/AddressingHeaders.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/om/AddressingHeaders.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/addressing/om/AddressingHeaders.java Mon Jul 11 08:49:30 2005
@@ -68,7 +68,7 @@
this.action = action;
}
- // ------------------- Setters and Getters --------------------------------------
+ // ------------------- Setters and Getters --------------------------------------
/**
* Method getWsaTo
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/AsyncResult.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/AsyncResult.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/AsyncResult.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/AsyncResult.java Mon Jul 11 08:49:30 2005
@@ -22,29 +22,30 @@
* Class AsyncResult
*/
public class AsyncResult {
-
- public AsyncResult(MessageContext result){
+
+ public AsyncResult(MessageContext result) {
this.result = result;
}
+
/**
* Field result
*/
private MessageContext result;
-
/**
* @return SOAPEnvelope
*/
public SOAPEnvelope getResponseEnvelope() {
- if(result != null){
+ if (result != null) {
return result.getEnvelope();
- }else{
+ } else {
return null;
}
-
+
}
- public MessageContext getResponseMessageContext(){
+
+ public MessageContext getResponseMessageContext() {
return result;
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java Mon Jul 11 08:49:30 2005
@@ -38,8 +38,10 @@
private HashMap properties;
protected static OperationDescription operationTemplate;
private MessageContext lastResponseMessage;
+
/**
* this is a convenience Class, here the Call will assume a Annoynmous Service.
+ *
* @throws AxisFault
*/
@@ -50,16 +52,17 @@
/**
* This is used to create call object with client home , using onky this constructor it can
* able to engage modules , addning client side parameters
+ *
* @param clientHome
* @throws AxisFault
*/
public Call(String clientHome) throws AxisFault {
- super(assumeServiceContext(clientHome));
+ super(assumeServiceContext(clientHome));
}
/**
- * @see InOutMEPClient constructer
* @param service
+ * @see InOutMEPClient constructer
*/
public Call(ServiceContext service) {
super(service);
@@ -67,6 +70,7 @@
/**
* Invoke the blocking/Synchronous call
+ *
* @param axisop
* @param toSend - This should be OM Element (payload)
* @return
@@ -76,8 +80,8 @@
public OMElement invokeBlocking(String axisop, OMElement toSend) throws AxisFault {
OperationDescription axisConfig =
- serviceContext.getServiceConfig().getOperation(new QName(axisop));
- if (axisConfig == null) {
+ serviceContext.getServiceConfig().getOperation(new QName(axisop));
+ if (axisConfig == null) {
axisConfig = new OperationDescription(new QName(axisop));
axisConfig.setRemainingPhasesInFlow(operationTemplate.getRemainingPhasesInFlow());
axisConfig.setPhasesOutFlow(operationTemplate.getPhasesOutFlow());
@@ -96,19 +100,21 @@
SOAPEnvelope resEnvelope = lastResponseMessage.getEnvelope();
return resEnvelope.getBody().getFirstElement();
}
+
/**
* Invoke the nonblocking/Asynchronous call
+ *
* @param axisop
- * @param toSend - This should be OM Element (payload)
- * invocation behaves accordingly
+ * @param toSend - This should be OM Element (payload)
+ * invocation behaves accordingly
* @param callback
* @throws AxisFault
*/
public void invokeNonBlocking(String axisop, OMElement toSend, Callback callback)
- throws AxisFault {
+ throws AxisFault {
OperationDescription axisConfig =
- serviceContext.getServiceConfig().getOperation(new QName(axisop));
+ serviceContext.getServiceConfig().getOperation(new QName(axisop));
if (axisConfig == null) {
axisConfig = new OperationDescription(new QName(axisop));
axisConfig.setRemainingPhasesInFlow(operationTemplate.getRemainingPhasesInFlow());
@@ -124,6 +130,7 @@
/**
* Assume the values for the ConfigurationContext and ServiceContext to make the NON WSDL cases simple.
+ *
* @return ServiceContext that has a ConfigurationContext set in and has assumed values.
* @throws AxisFault
*/
@@ -132,7 +139,7 @@
if (ListenerManager.configurationContext == null) {
ConfigurationContextFactory efac = new ConfigurationContextFactory();
sysContext = efac.buildClientConfigurationContext(clinetHome);
- }else{
+ } else {
sysContext = ListenerManager.configurationContext;
}
@@ -162,6 +169,7 @@
public void set(String key, Object value) {
serviceContext.getEngineContext().setProperty(key, value);
}
+
/**
* @return
*/
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Callback.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Callback.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Callback.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/Callback.java Mon Jul 11 08:49:30 2005
@@ -9,7 +9,7 @@
* Time: 8:03:41 PM
*/
public abstract class Callback {
- /**
+ /**
* Field complete
*/
private boolean complete = false;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java Mon Jul 11 08:49:30 2005
@@ -25,6 +25,7 @@
public void invoke(String MsgID, SOAPEnvelope result) {
}
+
/* (non-Javadoc)
* @see org.apache.axis2.engine.MessageReceiver#recieve(org.apache.axis2.context.MessageContext)
*/
@@ -38,8 +39,8 @@
if (callback != null) {
callback.onComplete(result);
callback.setComplete(true);
- }else{
- throw new AxisFault("The Callback realtes to MessageID "+ messageID + " is not found");
+ } else {
+ throw new AxisFault("The Callback realtes to MessageID " + messageID + " is not found");
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/clientapi/InOnlyMEPClient.java Mon Jul 11 08:49:30 2005
@@ -35,31 +35,31 @@
public class InOnlyMEPClient extends MEPClient {
protected MessageInformationHeadersCollection messageInformationHeaders;
protected TransportOutDescription senderTransport;
-
-
+
+
public InOnlyMEPClient(ServiceContext service) {
- super(service,WSDLConstants.MEP_URI_IN_ONLY);
+ super(service, WSDLConstants.MEP_URI_IN_ONLY);
messageInformationHeaders = new MessageInformationHeadersCollection();
}
public void send(OperationDescription axisop, final MessageContext msgctx) throws AxisFault {
- verifyInvocation(axisop,msgctx);
+ verifyInvocation(axisop, msgctx);
msgctx.setSoapAction(soapAction);
msgctx.setMessageInformationHeaders(messageInformationHeaders);
msgctx.setServiceContext(serviceContext);
ConfigurationContext syscontext = serviceContext.getEngineContext();
-
- if(senderTransport == null ){
+
+ if (senderTransport == null) {
senderTransport = inferTransport(messageInformationHeaders.getTo());
}
-
+
msgctx.setTransportOut(senderTransport);
ConfigurationContext sysContext = serviceContext.getEngineContext();
AxisConfiguration registry = sysContext.getAxisConfiguration();
AxisEngine engine = new AxisEngine(sysContext);
- msgctx.setOperationContext(axisop.findOperationContext(msgctx,serviceContext));
+ msgctx.setOperationContext(axisop.findOperationContext(msgctx, serviceContext));
engine.send(msgctx);
}
@@ -112,12 +112,12 @@
public void setTo(EndpointReference to) {
messageInformationHeaders.setTo(to);
}
-
- public void engageModule(QName name) throws AxisFault{
+
+ public void engageModule(QName name) throws AxisFault {
serviceContext.getEngineContext().getAxisConfiguration().engageModule(name);
}
-
- public void setSenderTransport(String senderTransport) throws AxisFault{
+
+ public void setSenderTransport(String senderTransport) throws AxisFault {
this.senderTransport = serviceContext.getEngineContext().getAxisConfiguration().getTransportOut(new QName(senderTransport));
}
- }
+}