You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by th...@apache.org on 2006/11/27 05:35:40 UTC

svn commit: r479514 [2/2] - in /webservices/kandula/trunk/java: ./ conf/ conf/AtomicTransactionCoordinator/META-INF/ conf/AtomicTransactionCoordinator/meta-inf/ modules/ src/org/apache/kandula/initiator/ src/org/apache/kandula/participant/ src/org/apac...

Modified: webservices/kandula/trunk/java/maven.xml
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/maven.xml?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/maven.xml (original)
+++ webservices/kandula/trunk/java/maven.xml Sun Nov 26 20:35:38 2006
@@ -1,125 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="jar"
-	xmlns:j="jelly:core"
-    xmlns:maven="jelly:maven"
-    xmlns:deploy="deploy"
-    xmlns:ant="jelly:ant">
-    
-    <goal name="setclasspath">
-        <path id="test.classpath">
-            <path refid="maven.dependency.classpath"/>
-        </path>
-    </goal>
-    
-    <postGoal name="test:compile">
-    <mkdir dir="${basedir}/target/lib"/>
-    <deploy:copy-deps todir="${basedir}/target/lib"/>
-
-	<echo message="----------------Creating ActivationCoordinator.aar----------------"/>
-	<mkdir dir="target/services/ActivationCoordinator/META-INF"/>
-        <copy file="conf/ActivationCoordinator/META-INF/services.xml"
-            tofile="target/services/ActivationCoordinator/META-INF/services.xml"/>
-        <jar jarfile="target/ActivationCoordinator.aar" 			basedir="target/services/ActivationCoordinator">
-            <include name="**"/>
-        </jar>
-
-	<echo message="----------------Creating AtomicTransactionCoordinator.aar----------------"/>
-	<mkdir dir="target/services/AtomicTransactionCoordinator/META-INF"/>
-        <copy file="conf/AtomicTransactionCoordinator/META-INF/services.xml"
-            tofile="target/services/AtomicTransactionCoordinator/META-INF/services.xml"/>
-        <jar jarfile="target/AtomicTransactionCoordinator.aar" 					basedir="target/services/AtomicTransactionCoordinator">
-            <include name="**"/>
-        </jar>
-
-
-	<echo message="----------------Creating AtomicTransactionParticipant.aar----------------"/>
-	<mkdir dir="target/services/AtomicTransactionParticipant/META-INF"/>
-        <copy file="conf/AtomicTransactionParticipant/META-INF/services.xml"
-            tofile="target/services/AtomicTransactionParticipant/META-INF/services.xml"/>
-        <jar jarfile="target/AtomicTransactionParticipant.aar" 					basedir="target/services/AtomicTransactionParticipant">
-            <include name="**"/>
-        </jar>
-
-
-	<echo message="----------------Creating CompletionCoordinator.aar----------------"/>
-	<mkdir dir="target/services/CompletionCoordinator/META-INF"/>
-        <copy file="conf/CompletionCoordinator/META-INF/services.xml"
-            tofile="target/services/CompletionCoordinator/META-INF/services.xml"/>
-        <jar jarfile="target/CompletionCoordinator.aar" 					basedir="target/services/CompletionCoordinator">
-            <include name="**"/>
-        </jar>
-
-
-	<echo message="----------------Creating RegistrationCoordinator.aar----------------"/>
-	<mkdir dir="target/services/RegistrationCoordinator/META-INF"/>
-        <copy file="conf/RegistrationCoordinator/META-INF/services.xml"
-            tofile="target/services/RegistrationCoordinator/META-INF/services.xml"/>
-        <jar jarfile="target/RegistrationCoordinator.aar" 					basedir="target/services/RegistrationCoordinator">
-            <include name="**"/>
-        </jar>
-
-	<echo message="----------------Creating Kandula-inflow.mar----------------"/>
-	<mkdir dir="target/modules/kandula-inflow/META-INF"/>
-        <copy file="conf/inflow-module.xml"
-            tofile="target/modules/kandula-inflow/META-INF/module.xml"/>
-        <jar jarfile="target/kandula-inflow-0.1.mar" 	basedir="target/modules/kandula-inflow">
-            <include name="**"/>
-        </jar>
-
-	<echo message="----------------Creating Kandula-outflow.mar----------------"/>
-	<mkdir dir="target/modules/kandula-outflow/META-INF"/>
-        <copy file="conf/outflow-module.xml"
-            tofile="target/modules/kandula-outflow/META-INF/module.xml"/>
-        <jar jarfile="target/kandula-outflow-0.1.mar" 	basedir="target/modules/kandula-outflow">
-            <include name="**"/>
-        </jar>
-
-
-	<echo message="-----------Creating Coordinator+participant test repository----------"/>
-	<mkdir dir="target/testing-repository"/>
-        <copy file="target/ActivationCoordinator.aar"
-            tofile="target/testing-repository/services/ActivationCoordinator.aar"/>
-	 <copy file="target/AtomicTransactionCoordinator.aar"
-            tofile="target/testing-repository/services/AtomicTransactionCoordinator.aar"/>
-	 <copy file="target/AtomicTransactionParticipant.aar"
-            tofile="target/testing-repository/services/AtomicTransactionParticipant.aar"/>
-	 <copy file="target/CompletionCoordinator.aar"
-            tofile="target/testing-repository/services/CompletionCoordinator.aar"/>
-	 <copy file="target/RegistrationCoordinator.aar"
-            tofile="target/testing-repository/services/RegistrationCoordinator.aar"/>
-         <mkdir dir="target/testing-repository/modules"/>
-	 <copy file="target/kandula-inflow-0.1.mar"
-            tofile="target/testing-repository/modules/kandula-inflow-0.1.mar"/>
-	 <copy file="modules/addressing-1.0.mar"
-            tofile="target/testing-repository/modules/addressing-1.0.mar"/>
-	 <copy file="conf/coordinator-axis2.xml"
-            tofile="target/testing-repository/axis2.xml"/>
-
-	<echo message="----------------Creating KandulaDemoService.aar----------------"/>
-  <ant:copy todir="${samples.dir}/version/src">
-            <ant:fileset dir="src">
-                <ant:include name="sample/axisversion/**"/>
-            </ant:fileset>
-        </ant:copy>
-	<mkdir dir="target/services/KandulaDemoService/META-INF"/>
-        <copy file="test-resources/KandulaDemoService/META-INF/services.xml"
-            tofile="target/services/KandulaDemoService/META-INF/services.xml"/>
-        <jar jarfile="target/KandulaDemoService.aar" basedir="target/services/KandulaDemoService">
-            <include name="**"/>
-        </jar>
-	<copy file="target/KandulaDemoService.aar"
-            tofile="target/testing-repository/services/KandulaDemoService.aar"/>
-        
-	<echo message="-----------Creating Initiator test repository----------"/>
-        <mkdir dir="target/initiator-repository"/>
-	<mkdir dir="target/initiator-repository/modules"/>
-	<copy file="target/kandula-outflow-0.1.mar"
-            tofile="target/initiator-repository/modules/kandula-outflow-0.1.mar"/>
- 	<copy file="modules/addressing-1.0.mar"
-            tofile="target/initiator-repository/modules/addressing-1.0.mar"/>
-	 <copy file="conf/initiator-axis2.xml"
-            tofile="target/initiator-repository/axis2.xml"/>       
-       
-    </postGoal>
-    
+<project default="jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:deploy="deploy" xmlns:ant="jelly:ant">
+
+	<goal name="setclasspath">
+		<path id="test.classpath">
+			<path refid="maven.dependency.classpath" />
+		</path>
+	</goal>
+
+	<goal name="generate:code">
+		<java classname="org.apache.axis2.wsdl.WSDL2Java">
+			<arg value="-uri" />
+			<arg value="${basedir}/resources/MTOMSample.wsdl" />
+			<arg value="-ss" />
+			<arg value="-sd" />
+			<arg value="-p" />
+			<arg value="sample.mtom.service" />
+			<arg value="-o" />
+			<arg value="${service.dir}" />
+			<classpath refid="class.path" />
+		</java>
+		<copy file="${skeleton.path}" tofile="${service.dir}/${skeleton.path}" overwrite="true" />
+		<antcall target="jar.server" />
+		<copy file="${service.dir}/sample-mtom.aar" tofile="../../repository/services/sample-mtom.aar" overwrite="true" />
+	</goal>
+
+	<postGoal name="test:compile">
+		<mkdir dir="${basedir}/target/lib" />
+		<deploy:copy-deps todir="${basedir}/target/lib" />
+
+		<echo message="----------------Creating ActivationCoordinator.aar----------------" />
+		<mkdir dir="target/services/ActivationCoordinator/META-INF" />
+		<copy file="conf/ActivationCoordinator/META-INF/services.xml" tofile="target/services/ActivationCoordinator/META-INF/services.xml" />
+		<jar jarfile="target/ActivationCoordinator.aar" basedir="target/services/ActivationCoordinator">
+			<include name="**" />
+		</jar>
+
+		<echo message="----------------Creating AtomicTransactionCoordinator.aar----------------" />
+		<mkdir dir="target/services/AtomicTransactionCoordinator/META-INF" />
+		<copy file="conf/AtomicTransactionCoordinator/META-INF/services.xml" tofile="target/services/AtomicTransactionCoordinator/META-INF/services.xml" />
+		<jar jarfile="target/AtomicTransactionCoordinator.aar" basedir="target/services/AtomicTransactionCoordinator">
+			<include name="**" />
+		</jar>
+
+
+		<echo message="----------------Creating AtomicTransactionParticipant.aar----------------" />
+		<mkdir dir="target/services/AtomicTransactionParticipant/META-INF" />
+		<copy file="conf/AtomicTransactionParticipant/META-INF/services.xml" tofile="target/services/AtomicTransactionParticipant/META-INF/services.xml" />
+		<jar jarfile="target/AtomicTransactionParticipant.aar" basedir="target/services/AtomicTransactionParticipant">
+			<include name="**" />
+		</jar>
+
+
+		<echo message="----------------Creating CompletionCoordinator.aar----------------" />
+		<mkdir dir="target/services/CompletionCoordinator/META-INF" />
+		<copy file="conf/CompletionCoordinator/META-INF/services.xml" tofile="target/services/CompletionCoordinator/META-INF/services.xml" />
+		<jar jarfile="target/CompletionCoordinator.aar" basedir="target/services/CompletionCoordinator">
+			<include name="**" />
+		</jar>
+
+
+		<echo message="----------------Creating RegistrationCoordinator.aar----------------" />
+		<mkdir dir="target/services/RegistrationCoordinator/META-INF" />
+		<copy file="conf/RegistrationCoordinator/META-INF/services.xml" tofile="target/services/RegistrationCoordinator/META-INF/services.xml" />
+		<jar jarfile="target/RegistrationCoordinator.aar" basedir="target/services/RegistrationCoordinator">
+			<include name="**" />
+		</jar>
+
+		<echo message="----------------Creating Kandula-inflow.mar----------------" />
+		<mkdir dir="target/modules/kandula-inflow/META-INF" />
+		<copy file="conf/inflow-module.xml" tofile="target/modules/kandula-inflow/META-INF/module.xml" />
+		<jar jarfile="target/kandula-inflow-${pom.currentVersion}.mar" basedir="target/modules/kandula-inflow">
+			<include name="**" />
+		</jar>
+
+		<echo message="----------------Creating Kandula-outflow.mar----------------" />
+		<mkdir dir="target/modules/kandula-outflow/META-INF" />
+		<copy file="conf/outflow-module.xml" tofile="target/modules/kandula-outflow/META-INF/module.xml" />
+		<jar jarfile="target/kandula-outflow-${pom.currentVersion}.mar" basedir="target/modules/kandula-outflow">
+			<include name="**" />
+		</jar>
+
+
+		<echo message="-----------Creating Coordinator+participant test repository----------" />
+		<mkdir dir="target/testing-repository" />
+		<copy file="target/ActivationCoordinator.aar" tofile="target/testing-repository/services/ActivationCoordinator.aar" />
+		<copy file="target/AtomicTransactionCoordinator.aar" tofile="target/testing-repository/services/AtomicTransactionCoordinator.aar" />
+		<copy file="target/AtomicTransactionParticipant.aar" tofile="target/testing-repository/services/AtomicTransactionParticipant.aar" />
+		<copy file="target/CompletionCoordinator.aar" tofile="target/testing-repository/services/CompletionCoordinator.aar" />
+		<copy file="target/RegistrationCoordinator.aar" tofile="target/testing-repository/services/RegistrationCoordinator.aar" />
+		<mkdir dir="target/testing-repository/modules" />
+		<copy file="target/kandula-inflow-${pom.currentVersion}.mar" tofile="target/testing-repository/modules/kandula-inflow-${pom.currentVersion}.mar" />
+		<copy file="modules/addressing-${axis2.version}.mar" tofile="target/testing-repository/modules/addressing-${axis2.version}.mar" />
+		<copy file="conf/coordinator-axis2.xml" tofile="target/testing-repository/axis2.xml" />
+
+		<echo message="----------------Creating KandulaDemoService.aar----------------" />
+		<ant:copy todir="${samples.dir}/version/src">
+			<ant:fileset dir="src">
+				<ant:include name="sample/axisversion/**" />
+			</ant:fileset>
+		</ant:copy>
+		<mkdir dir="target/services/KandulaDemoService/META-INF" />
+		<copy file="test-resources/KandulaDemoService/META-INF/services.xml" tofile="target/services/KandulaDemoService/META-INF/services.xml" />
+		<jar jarfile="target/KandulaDemoService.aar" basedir="target/services/KandulaDemoService">
+			<include name="**" />
+		</jar>
+		<copy file="target/KandulaDemoService.aar" tofile="target/testing-repository/services/KandulaDemoService.aar" />
+
+		<echo message="-----------Creating Initiator test repository----------" />
+		<mkdir dir="target/initiator-repository" />
+		<mkdir dir="target/initiator-repository/modules" />
+		<copy file="target/kandula-outflow-${pom.currentVersion}.mar" tofile="target/initiator-repository/modules/kandula-outflow-${pom.currentVersion}.mar" />
+		<copy file="modules/addressing-${axis2.version}.mar" tofile="target/initiator-repository/modules/addressing-${axis2.version}.mar" />
+		<copy file="conf/initiator-axis2.xml" tofile="target/initiator-repository/axis2.xml" />
+
+	</postGoal>
+
 </project>

Added: webservices/kandula/trunk/java/modules/addressing-1.1.mar
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/modules/addressing-1.1.mar?view=auto&rev=479514
==============================================================================
Binary file - no diff available.

Propchange: webservices/kandula/trunk/java/modules/addressing-1.1.mar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: webservices/kandula/trunk/java/project.properties
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/project.properties?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/project.properties (original)
+++ webservices/kandula/trunk/java/project.properties Sun Nov 26 20:35:38 2006
@@ -1,4 +1,84 @@
-maven.repo.remote = http://www.apache.org/dist/java-repository/, http://cvs.apache.org/repository/, http://mirrors.sunsite.dk/maven/, http://www.ibiblio.org/maven, http://dist.codehaus.org, http://jakarta.apache.org/commons/logging/,
-http://www.reverse.net/pub/apache/java-repository/
-maven.xdoc.date = left
-maven.xdoc.version = ${pom.currentVersion}
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+maven.multiproject.type=jar
+
+# -------------------------------------------------------------------
+#                Project Information
+# -------------------------------------------------------------------
+kandula.version=SNAPSHOT
+
+# -------------------------------------------------------------------
+#                Dependency Repositories
+# -------------------------------------------------------------------
+maven.repo.remote=\
+http://www.ibiblio.org/maven,\
+https://maven-repository.dev.java.net/nonav/repository/,\
+http://people.apache.org/repo/m1-ibiblio-rsync-repository/,\
+http://people.apache.org/repository/,\
+http://mirrors.sunsite.dk/maven/,\
+http://ws.zones.apache.org/~dims/maven/
+
+# -------------------------------------------------------------------
+#                JUnit
+# -------------------------------------------------------------------
+maven.junit.jvmargs=-Xmx256m -Djava.awt.headless=true
+maven.junit.fork=true
+
+# -------------------------------------------------------------------
+#                Compile
+# -------------------------------------------------------------------
+maven.compile.optimize=false
+maven.compile.fork=true
+maven.compile.target=1.3
+maven.compile.source=1.3
+
+# -------------------------------------------------------------------
+#                Versions of dependencies
+# -------------------------------------------------------------------
+axis2.version=1.1
+activation.version=1.1
+annogen.version=0.1.0
+axiom.version=1.2
+backport_util_concurrent.version=2.2
+commons.codec.version=1.3
+commons.httpclient.version=3.0.1
+commons.logging.version=1.1
+jakarta.httpcore.version=4.0-alpha2
+javamail.version=1.4
+jaxen.version=1.1-beta-10
+junit.version=3.8.2
+neethi.version=2.0
+stax.api.version=1.0.1
+stax.impl.artifactid=wstx
+stax.impl.groupid=woodstox
+stax.impl.version=asl-3.0.1
+stax_utils.version=20060915 
+woden.version=1.0.0M6
+wsdl4j.version=1.6.1
+XmlSchema.version=1.2
+log4j.version=1.2.13
+
+# -------------------------------------------------------------------
+#                xdoc
+# -------------------------------------------------------------------
+maven.xdoc.date=left
+maven.xdoc.version=${pom.currentVersion}
+maven.xdoc.includeProjectDocumentation=no
+maven.html2xdoc.enabled=true
+maven.html2xdoc.dir=src/site/xdoc
+maven.pdf.navigationFile=navigation-pdf.xml
+maven.allreports.disable=true

Modified: webservices/kandula/trunk/java/project.xml
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/project.xml?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/project.xml (original)
+++ webservices/kandula/trunk/java/project.xml Sun Nov 26 20:35:38 2006
@@ -1,293 +1,333 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project>
 
-  <!-- the version of maven's project object model -->
-  <pomVersion>3</pomVersion>
-  
-  <!-- a unique name for this project -->
-  <id>kandula2</id>
-  
-  <!-- a short but descriptive name for the project -->
-  <name>Apache Kandula2</name>
-  
-  <!-- The version of the project under development, e.g. 1.1, 1.2, 2.0-SNAPSHOT -->
-  <currentVersion>0.1-SNAPSHOT</currentVersion>
-  
-  <!-- details about the organization that 'owns' the project -->
-  <organization>
-    <name>Apache Web Services</name>
-    <url>http://ws.apache.org/</url>
-    <logo>http://www.apache.org/images/asf-logo.gif</logo>
-  </organization>
-  
-  <!-- the year the project started -->
-  <inceptionYear>2005</inceptionYear>
-  <package>org.apache.kandula</package>
-  <logo/>
-  <description>Kandula will provide an open-source implementation of WS-Coordination, 
-  	WS-AtomicTransaction and WS-BusinessActivity based on Axis. The initial implementation will be in 
-  	Java using Axis/Java. In addition to providing an implementation, a major focus of this project 
-  	would be to ensure interoperability with other implementations of above specifications, 
-  	particularly those by Microsoft (.NET) and IBM.
-  </description>
-  <!-- a short description of what the project does -->
-  <shortDescription>WS-Coor, 
-  	WS-AT and WS-BA implementation</shortDescription>
-
-  <!-- the project home page -->
-  <url>http://ws.apache.org/kandula/</url>
-  <issueTrackingUrl>http://issues.apache.org/jira/browse/KAND</issueTrackingUrl>
-  <siteAddress>ws.apache.org</siteAddress>
-  <siteDirectory>/kandula/</siteDirectory>
-  <distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
-
-  <repository>
-        <connection>
-            scm:svn:http://svn.apache.org:repos/asf/webservices:kandula/trunk/java</connection>
-        <developerConnection>
-            scm:svn:http://svn.apache.org:repos/asf/webservices:kandula/trunk/java</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/webservices/kandula/trunk/java?root=Apache-SVN</url>
-    </repository>
-
-
-  <!-- any mailing lists for the project -->
-    <mailingLists>
-        <mailingList>
-            <name>Kandula Developer List</name>
-            <subscribe>kandula-dev-subscribe@ws.apache.org</subscribe>
-            <unsubscribe>kandula-dev-unsubscribe@ws.apache.org</unsubscribe>
-            <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listId=221</archive>
-        </mailingList>
-    </mailingLists>
-  
-  <!-- who the developers are for the project -->
-  <developers>
+	<!-- the version of maven's project object model -->
+	<pomVersion>3</pomVersion>
+
+	<!-- a unique name for this project -->
+	<id>kandula2</id>
+
+	<!-- a short but descriptive name for the project -->
+	<name>Apache Kandula2</name>
+
+	<!-- The version of the project under development, e.g. 1.1, 1.2, 2.0-SNAPSHOT -->
+	<currentVersion>SNAPSHOT</currentVersion>
+
+	<!-- details about the organization that 'owns' the project -->
+	<organization>
+		<name>Apache Web Services</name>
+		<url>http://ws.apache.org/</url>
+		<logo>http://www.apache.org/images/asf-logo.gif</logo>
+	</organization>
+
+	<!-- the year the project started -->
+	<inceptionYear>2005</inceptionYear>
+	<package>org.apache.kandula</package>
+	<logo />
+	<description>
+		Kandula will provide an open-source implementation of WS-Coordination,
+		WS-AtomicTransaction and WS-BusinessActivity based on Axis. The initial
+		implementation will be in Java using Axis/Java. In addition to providing
+		an implementation, a major focus of this project would be to ensure
+		interoperability with other implementations of above specifications.
+	</description>
+	<!-- a short description of what the project does -->
+	<shortDescription>WS-Coor, WS-AT and WS-BA implementation</shortDescription>
+
+	<!-- the project home page -->
+	<url>http://ws.apache.org/kandula/</url>
+	<issueTrackingUrl>
+		http://issues.apache.org/jira/browse/KAND
+	</issueTrackingUrl>
+	<siteAddress>ws.apache.org</siteAddress>
+	<siteDirectory>/kandula/</siteDirectory>
+	<distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
+
+	<repository>
+		<connection>
+			scm:svn:http://svn.apache.org:repos/asf/webservices:kandula/trunk/java
+		</connection>
+		<developerConnection>
+			scm:svn:http://svn.apache.org:repos/asf/webservices:kandula/trunk/java
+		</developerConnection>
+		<url>
+			http://svn.apache.org/viewcvs.cgi/webservices/kandula/trunk/java?root=Apache-SVN
+		</url>
+	</repository>
+
+
+	<!-- any mailing lists for the project -->
+	<mailingLists>
+		<mailingList>
+			<name>Kandula Developer List</name>
+			<subscribe>kandula-dev-subscribe@ws.apache.org</subscribe>
+			<unsubscribe>kandula-dev-unsubscribe@ws.apache.org</unsubscribe>
+			<archive>
+				http://nagoya.apache.org/eyebrowse/SummarizeList?listId=221
+			</archive>
+		</mailingList>
+	</mailingLists>
+
+	<!-- who the developers are for the project -->
+	<developers>
 		<developer>
 			<name>Davanum Srinivas</name>
 			<id>dims</id>
 			<email>dims AT wso2.com</email>
 			<organization>WSO2</organization>
-		</developer>  
-       <developer>
+		</developer>
+		<developer>
 			<name>Sanjiva Weerawarana</name>
 			<id>sanjiva</id>
 			<email>sanjiva AT wso2.com</email>
 			<organization>WSO2</organization>
 		</developer>
-        <developer>
-            <name>Dasarath Weeratunge</name>
-            <id>dasarath</id>
-            <email>dasarath AT opensource.lk</email>
-            <organization>Lanka Software Foundation (LSF), Sri Lanka.</organization>
-        </developer>    
-		<developer>
-            <name>Thilina Gunarathne</name>
-            <id>thilina</id>
-            <email>thilina AT apache.org</email>
-            <organization>Lanka Software Foundation (LSF) / University of Moratuwa, Sri Lanka.</organization>
-        </developer>
-  </developers>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-  
-  <!-- build information for the project -->
-  <build>
-    <nagEmailAddress>kandula-dev@ws.apache.org</nagEmailAddress>
-    <sourceDirectory>src</sourceDirectory>
-  </build>
-
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-
-    <dependencies>
-    
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>3.8.1</version>
-          <url>http://ws.apache.org/axis/</url>
-          <properties>
-            <module>true</module>
-          </properties>
-        </dependency>     
-        <dependency>
-            <groupId>axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-   
-             <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
- 
-       <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.0</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-            <properties>
-                <module>true</module>
-            </properties>
-            <url>http://dist.codehaus.org/stax/jars/</url>
-        </dependency>
-
-           <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>2.8.2</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>stax</groupId>
-             <artifactId>stax-api</artifactId>
-            <version>1.0</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-  	      <dependency>
-            <groupId>org.apache.ws.commons</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-
- 	  <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-wsdl4j</artifactId>
-            <version>1.2</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-	  <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-            <version>2.0_01_pd</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-		<dependency>
-            <groupId>annogen</groupId>
-            <artifactId>annogen</artifactId>
-            <version>0.1.0</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-     <dependency>
-            <groupId>ws-commons</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.0</version>
-        </dependency>
-   <dependency>
-            <groupId>ws-commons</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-
-		 <dependency>
-            <groupId>ws-commons</groupId>
-            <artifactId>neethi</artifactId>
-            <version>1.0.1</version>
-            <properties>
-                <module>true</module>
-            </properties>
-             </dependency>
-        
-    </dependencies>
-
-    <!-- ================================= -->
-    <!-- build information for the project -->
-    <!-- ================================= -->
-
-    <build>
-        <nagEmailAddress>kandula-dev@ws.apache.org</nagEmailAddress>
-        <sourceDirectory>src</sourceDirectory>
-        <!--unitTestSourceDirectory>test</unitTestSourceDirectory>
-
-        <unitTest>    
-        	 <includes>
-                <include>**/CreateCoordinationContextTest.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>**/*.conf</include>
-                        <include>**/*.xml</include>
-                    </includes>
-                </resource>
-            </resources>
-        </unitTest-->
-        
-			<resources>    
-                <resource>
-                    <directory>src</directory>
-                    <includes>
-                        <include>**/*.conf</include>
-                        <include>**/*.xml</include>
-                    </includes>
-                </resource>
-            </resources>
-    </build>
-
-    <!-- ======= -->
-    <!-- Reports -->
-    <!-- ======= -->
-
-    <reports>
-     <report>maven-changes-plugin</report>
-        <report>maven-jdepend-plugin</report>
-        <report>maven-checkstyle-plugin</report>
-        <report>maven-pmd-plugin</report>
-        <report>maven-junit-report-plugin</report>
-        <report>maven-license-plugin</report>
-        <report>maven-jxr-plugin</report>
+		<developer>
+			<name>Dasarath Weerathunga</name>
+			<id>dasarath</id>
+			<email>dasarath AT opensource.lk</email>
+			<organization>Purdue University, USA</organization>
+		</developer>
+		<developer>
+			<name>Thilina Gunarathne</name>
+			<id>thilina</id>
+			<email>thilina AT wso2.com</email>
+			<organization>WSO2</organization>
+			<url>www.apache.org/~thilina</url>
+		</developer>
+	</developers>
 
-    </reports>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<!-- build information for the project -->
+	<build>
+		<nagEmailAddress>kandula-dev@ws.apache.org</nagEmailAddress>
+		<sourceDirectory>src</sourceDirectory>
+	</build>
+
+	<!-- ============ -->
+	<!-- Dependencies -->
+	<!-- ============ -->
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.ws.commons.axiom</groupId>
+			<artifactId>axiom-api</artifactId>
+			<version>${axiom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ws.commons.axiom</groupId>
+			<artifactId>axiom-impl</artifactId>
+			<version>${axiom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>wsdl4j</groupId>
+			<artifactId>wsdl4j</artifactId>
+			<version>${wsdl4j.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ws.commons.schema</groupId>
+			<artifactId>XmlSchema</artifactId>
+			<version>${XmlSchema.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+			<version>${jaxen.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+			<url>http://www.ibiblio.org/maven/jaxen/jars/</url>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-java2wsdl</artifactId>
+			<version>${axis2.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-kernel</artifactId>
+			<version>${axis2.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-adb-codegen</artifactId>
+			<version>${axis2.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-codegen</artifactId>
+			<version>${axis2.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-adb</artifactId>
+			<version>${axis2.version}</version>
+		</dependency>
+
+		<!-- Following dependency was required due to the EndpointReferenceHelper class-->
+		<!-- dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-addressing</artifactId>
+			<version>${axis2.version}</version>
+			</dependency-->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>${commons.logging.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>${stax.impl.groupid}</groupId>
+			<artifactId>${stax.impl.artifactid}</artifactId>
+			<version>${stax.impl.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>stax</groupId>
+			<artifactId>stax-api</artifactId>
+			<version>${stax.api.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>${activation.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>${javamail.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>${commons.httpclient.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>httpcomponents-httpcore</groupId>
+			<artifactId>jakarta-httpcore</artifactId>
+			<version>${jakarta.httpcore.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons.codec.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>backport-util-concurrent</groupId>
+			<artifactId>backport-util-concurrent</artifactId>
+			<version>${backport_util_concurrent.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>annogen</groupId>
+			<artifactId>annogen</artifactId>
+			<version>${annogen.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.neethi</groupId>
+			<artifactId>neethi</artifactId>
+			<version>${neethi.version}</version>
+			<properties>
+				<module>true</module>
+			</properties>
+		</dependency>
+	</dependencies>
+
+	<!-- ================================= -->
+	<!-- build information for the project -->
+	<!-- ================================= -->
+
+	<build>
+		<nagEmailAddress>kandula-dev@ws.apache.org</nagEmailAddress>
+		<sourceDirectory>src</sourceDirectory>
+		<unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+		<unitTest>
+			<includes>
+				<include>**/CompletionCommitTest.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>**/*.conf</include>
+						<include>**/*.xml</include>
+					</includes>
+				</resource>
+			</resources>
+		</unitTest>
+
+		<resources>
+			<resource>
+				<directory>src</directory>
+				<includes>
+					<include>**/*.conf</include>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
+
+	<!-- ======= -->
+	<!-- Reports -->
+	<!-- ======= -->
+
+	<reports>
+		<report>maven-changes-plugin</report>
+		<report>maven-jdepend-plugin</report>
+		<report>maven-checkstyle-plugin</report>
+		<report>maven-pmd-plugin</report>
+		<report>maven-junit-report-plugin</report>
+		<report>maven-license-plugin</report>
+		<report>maven-jxr-plugin</report>
+	</reports>
 </project>
 

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/initiator/TransactionOutHandler.java Sun Nov 26 20:35:38 2006
@@ -28,7 +28,7 @@
 
 	private static final long serialVersionUID = 4133392345837905499L;
 
-	public void invoke(MessageContext msgContext) throws AxisFault {
+	public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
 
 		InitiatorTransaction initiatorTransaction;
 		try {
@@ -46,5 +46,6 @@
 		} catch (AbstractKandulaException e) {
 			throw new AxisFault(e);
 		}
+		return InvocationResponse.CONTINUE;
 	}
 }

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/participant/TransactionInHandler.java Sun Nov 26 20:35:38 2006
@@ -38,7 +38,7 @@
 
 	// private ThreadLocal threadInfo = new ThreadLocal();
 
-	public void invoke(MessageContext msgContext) throws AxisFault {
+	public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
 		KandulaResource resource;
 		String wsaAction = msgContext.getWSAAction();
 		if ((wsaAction != Constants.WS_COOR_CREATE_COORDINATIONCONTEXT)
@@ -79,5 +79,6 @@
 				ParticipantUtility.registerParticipant(context);
 			}
 		}
+		return InvocationResponse.CONTINUE;
 	}
 }

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLSkeleton.java Sun Nov 26 20:35:38 2006
@@ -18,8 +18,7 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.coordinator.at.ATCoordinator;
 import org.apache.kandula.faults.AbstractKandulaException;
@@ -30,12 +29,6 @@
  */
 
 public class CompletionCoordinatorPortTypeRawXMLSkeleton {
-	private OperationContext opContext;
-
-	public void setOperationContext(OperationContext opContext) {
-		this.opContext = opContext;
-	}
-
 	/**
 	 * @param requestElement
 	 * @throws AxisFault
@@ -44,9 +37,8 @@
 		String activityId;
 		// log.info("Visited Commit operation");
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		activityId = header.getFirstChildWithName(
 				Constants.TRANSACTION_ID_PARAMETER).getText();
 		try {
@@ -65,10 +57,9 @@
 
 		String activityId;
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
 		// log.info("Visited rollback operation");
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		activityId = header.getFirstChildWithName(
 				Constants.TRANSACTION_ID_PARAMETER).getText();
 		try {

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLStub.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionCoordinatorPortTypeRawXMLStub.java Sun Nov 26 20:35:38 2006
@@ -19,7 +19,6 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.kandula.Constants;
 import org.apache.kandula.faults.AbstractKandulaException;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLSkeleton.java Sun Nov 26 20:35:38 2006
@@ -18,8 +18,7 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.Status;
 import org.apache.kandula.initiator.InitiatorTransaction;
@@ -30,18 +29,11 @@
  */
 
 public class CompletionInitiatorPortTypeRawXMLSkeleton {
-	private OperationContext opContext;
-
-	public void setOperationContext(OperationContext opContext) {
-		this.opContext = opContext;
-	}
-
 	public void committedOperation(OMElement requestElement)
 			throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String requesterID = header.getFirstChildWithName(
 				Constants.REQUESTER_ID_PARAMETER).getText();
 		InitiatorTransaction transaction = (InitiatorTransaction) StorageFactory
@@ -52,9 +44,8 @@
 	public void abortedOperation(OMElement requestElement)
 			throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String requesterID = header.getFirstChildWithName(
 				Constants.REQUESTER_ID_PARAMETER).getText();
 		InitiatorTransaction transaction = (InitiatorTransaction) StorageFactory

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorPortTypeRawXMLStub.java Sun Nov 26 20:35:38 2006
@@ -18,7 +18,6 @@
 
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.kandula.Constants;
 import org.apache.kandula.faults.AbstractKandulaException;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/completion/CompletionInitiatorServiceListener.java Sun Nov 26 20:35:38 2006
@@ -26,7 +26,6 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.InOnlyAxisOperation;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
 import org.apache.kandula.Constants;
 import org.apache.kandula.utility.KandulaListener;
@@ -64,7 +63,7 @@
 		String serviceName = "CompletionInitiatorPortType";
 		AxisService service = new AxisService(serviceName);
 		service.addParameter(new Parameter(
-				AbstractMessageReceiver.SERVICE_CLASS, className));
+				org.apache.axis2.Constants.SERVICE_CLASS, className));
 		service.setFileName((new File(className)).toURL());
 
 		QName committedOperationName = new QName(Constants.WS_COOR,

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLSkeleton.java Sun Nov 26 20:35:38 2006
@@ -18,8 +18,7 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.coordinator.at.ATCoordinator;
 import org.apache.kandula.faults.AbstractKandulaException;
@@ -30,12 +29,6 @@
  * @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
  */
 public class CoordinatorPortTypeRawXMLSkeleton {
-	private OperationContext opContext;
-
-	public void setOperationContext(OperationContext opContext) {
-		this.opContext = opContext;
-	}
-
 	/**
 	 * @param requestElement
 	 * @throws AbstractKandulaException
@@ -43,9 +36,8 @@
 	public void preparedOperation(OMElement requestElement)
 			throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String activityId = header.getFirstChildWithName(
 				Constants.TRANSACTION_ID_PARAMETER).getText();
 		String enlistmentId = header.getFirstChildWithName(
@@ -68,9 +60,8 @@
 	public void abortedOperation(OMElement requestElement)
 			throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String activityId = header.getFirstChildWithName(
 				Constants.TRANSACTION_ID_PARAMETER).getText();
 		String enlistmentId = header.getFirstChildWithName(
@@ -92,9 +83,8 @@
 	public void readOnlyOperation(OMElement requestElement)
 			throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String activityId = header.getFirstChildWithName(
 				Constants.TRANSACTION_ID_PARAMETER).getText();
 		String enlistmentId = header.getFirstChildWithName(
@@ -116,9 +106,8 @@
 	public void committedOperation(OMElement requestElement)
 			throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String activityId = header.getFirstChildWithName(
 				Constants.TRANSACTION_ID_PARAMETER).getText();
 		String enlistmentId = header.getFirstChildWithName(
@@ -139,7 +128,7 @@
 	 */
 	public void replayOperation(OMElement requestElement) throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
 		System.out.println("Visited Replay operation");
 	}
 

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/CoordinatorPortTypeRawXMLStub.java Sun Nov 26 20:35:38 2006
@@ -18,7 +18,6 @@
 
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.kandula.Constants;
 import org.apache.kandula.faults.AbstractKandulaException;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLSkeleton.java Sun Nov 26 20:35:38 2006
@@ -18,8 +18,7 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.context.AbstractContext;
 import org.apache.kandula.faults.AbstractKandulaException;
@@ -32,17 +31,10 @@
  */
 
 public class ParticipantPortTypeRawXMLSkeleton {
-	private OperationContext opContext;
-
-	public void setOperationContext(OperationContext opContext) {
-		this.opContext = opContext;
-	}
-
 	public void prepareOperation(OMElement requestEle) throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String requesterID = header.getFirstChildWithName(
 				Constants.REQUESTER_ID_PARAMETER).getText();
 		Store store = StorageFactory.getInstance().getStore();
@@ -60,9 +52,8 @@
 
 	public void commitOperation(OMElement requestEle) throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String requesterID = header.getFirstChildWithName(
 				Constants.REQUESTER_ID_PARAMETER).getText();
 		Store store = StorageFactory.getInstance().getStore();
@@ -79,9 +70,8 @@
 
 	public void rollbackOperation(OMElement requestEle) throws AxisFault {
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		String requesterID = header.getFirstChildWithName(
 				Constants.REQUESTER_ID_PARAMETER).getText();
 		Store store = StorageFactory.getInstance().getStore();

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantPortTypeRawXMLStub.java Sun Nov 26 20:35:38 2006
@@ -18,7 +18,6 @@
 
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.kandula.Constants;
 import org.apache.kandula.faults.AbstractKandulaException;

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wsat/twopc/ParticipantServiceListener.java Sun Nov 26 20:35:38 2006
@@ -26,7 +26,6 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.InOnlyAxisOperation;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
 import org.apache.kandula.Constants;
 import org.apache.kandula.utility.KandulaListener;
@@ -63,7 +62,7 @@
 		String serviceName = "ParticipantPortType";
 		AxisService service = new AxisService(serviceName);
 		service.addParameter(new Parameter(
-				AbstractMessageReceiver.SERVICE_CLASS, className));
+				org.apache.axis2.Constants.SERVICE_CLASS, className));
 		service.setFileName((new File(className)).toURL());
 		QName prepareOperationName = new QName(Constants.WS_COOR,
 				"prepareOperation");

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationCoordinatorPortTypeRawXMLStub.java Sun Nov 26 20:35:38 2006
@@ -42,7 +42,6 @@
 import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.kandula.Constants;
@@ -176,7 +175,7 @@
 		KandulaListener listener = KandulaListener.getInstance();
 		AxisService service = new AxisService(serviceName);
 		service.addParameter(new Parameter(
-				AbstractMessageReceiver.SERVICE_CLASS, className));
+				org.apache.axis2.Constants.SERVICE_CLASS, className));
 		service.setFileName((new File(className)).toURL());
 
 		responseOperationDesc = new InOnlyAxisOperation();

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSkeleton.java Sun Nov 26 20:35:38 2006
@@ -23,7 +23,7 @@
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.context.AbstractContext;
 import org.apache.kandula.coordinator.Coordinator;
@@ -35,12 +35,6 @@
  */
 
 public class ActivationPortTypeRawXMLSkeleton {
-	private OperationContext opContext;
-
-	public void setOperationContext(OperationContext opContext) {
-		this.opContext = opContext;
-	}
-
 	/**
 	 * @param requestElement
 	 * @throws AbstractKandulaException
@@ -49,7 +43,7 @@
 			throws AxisFault {
 		AbstractContext context;
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
 		/*
 		 * Extracting data from the incoming message
 		 */

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSyncMessageReceiver.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSyncMessageReceiver.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/ActivationPortTypeRawXMLSyncMessageReceiver.java Sun Nov 26 20:35:38 2006
@@ -20,7 +20,6 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.engine.DependencyManager;
 import org.apache.kandula.Constants;
 
 /**
@@ -39,9 +38,7 @@
 			// get the implementation class for the Web Service
 			Object obj = getTheImplementationObject(msgContext);
 
-			// Inject the Message Context if it is asked for
-			DependencyManager.configureBusinessLogicProvider(obj, msgContext
-					.getOperationContext());
+		
 
 			ActivationPortTypeRawXMLSkeleton skel = (ActivationPortTypeRawXMLSkeleton) obj;
 			// Out Envelop

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationCoordinatorPortTypeRawXMLStub.java Sun Nov 26 20:35:38 2006
@@ -42,7 +42,6 @@
 import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.kandula.Constants;
@@ -77,7 +76,6 @@
 	public RegistrationCoordinatorPortTypeRawXMLStub(
 			ConfigurationContext configurationContext,
 			EndpointReference targetEndpoint) throws AbstractKandulaException {
-		configurationContext = configurationContext;
 		this.toEPR = targetEndpoint;
 		service = new AxisService("annonService"+this.hashCode());
 		try {
@@ -191,7 +189,7 @@
 		KandulaListener listener = KandulaListener.getInstance();
 		AxisService service = new AxisService(serviceName);
 		service.addParameter(new Parameter(
-				AbstractMessageReceiver.SERVICE_CLASS, className));
+				org.apache.axis2.Constants.SERVICE_CLASS, className));
 		service.setFileName((new File(className)).toURL());
 
 		responseOperationDesc = new InOnlyAxisOperation();

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSkeleton.java Sun Nov 26 20:35:38 2006
@@ -24,8 +24,7 @@
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.coordinator.Coordinator;
 import org.apache.kandula.faults.AbstractKandulaException;
@@ -37,11 +36,6 @@
  */
 
 public class RegistrationPortTypeRawXMLSkeleton {
-	private OperationContext opContext;
-
-	public void setOperationContext(OperationContext opContext) {
-		this.opContext = opContext;
-	}
 
 	public OMElement registerOperation(OMElement request) throws AxisFault {
 
@@ -49,7 +43,7 @@
 		EndpointReference participantEPR;
 		String activityId;
 		StorageFactory.getInstance().setConfigurationContext(
-				opContext.getServiceContext().getConfigurationContext());
+				MessageContext.getCurrentMessageContext().getServiceContext().getConfigurationContext());
 		/*
 		 * Extracting data from the received message
 		 */
@@ -61,8 +55,7 @@
 		participantEPR = EndpointReferenceFactory
 				.endpointFromOM(participantEPRElement);
 
-		OMElement header = opContext.getMessageContext(
-				WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope().getHeader();
+		OMElement header = MessageContext.getCurrentMessageContext().getEnvelope().getHeader();
 		activityId = header.getFirstChildWithName(
 				Constants.TRANSACTION_ID_PARAMETER).getText();
 		/*

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSyncMessageReceiver.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSyncMessageReceiver.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationPortTypeRawXMLSyncMessageReceiver.java Sun Nov 26 20:35:38 2006
@@ -20,7 +20,6 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.engine.DependencyManager;
 import org.apache.kandula.Constants;
 
 /**
@@ -39,9 +38,7 @@
 			// get the implementation class for the Web Service
 			Object obj = getTheImplementationObject(msgContext);
 
-			// Inject the Message Context if it is asked for
-			DependencyManager.configureBusinessLogicProvider(obj, msgContext
-					.getOperationContext());
+		
 
 			RegistrationPortTypeRawXMLSkeleton skel = (RegistrationPortTypeRawXMLSkeleton) obj;
 			// Out Envelop

Modified: webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java (original)
+++ webservices/kandula/trunk/java/src/org/apache/kandula/wscoor/RegistrationRequesterPortTypeRawXMLSkeleton.java Sun Nov 26 20:35:38 2006
@@ -19,8 +19,7 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.context.MessageContext;
 import org.apache.kandula.Constants;
 import org.apache.kandula.context.impl.ATParticipantContext;
 import org.apache.kandula.initiator.InitiatorTransaction;
@@ -32,19 +31,13 @@
  */
 
 public class RegistrationRequesterPortTypeRawXMLSkeleton {
-	private OperationContext opContext;
-
-	public void setOperationContext(OperationContext opContext) {
-		this.opContext = opContext;
-	}
 
 	public OMElement registerResponseOperation(OMElement responseElement)
 			throws AxisFault {
 
 		OMElement response = responseElement.getFirstElement();
 		if ("CoordinatorProtocolService".equals(response.getLocalName())) {
-			OMElement header = opContext.getMessageContext(
-					WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope()
+			OMElement header = MessageContext.getCurrentMessageContext().getEnvelope()
 					.getHeader();
 			String requesterID = header.getFirstChildWithName(
 					Constants.REQUESTER_ID_PARAMETER).getText();

Modified: webservices/kandula/trunk/java/test/interop/testService.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/test/interop/testService.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/test/interop/testService.java (original)
+++ webservices/kandula/trunk/java/test/interop/testService.java Sun Nov 26 20:35:38 2006
@@ -21,7 +21,6 @@
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;

Modified: webservices/kandula/trunk/java/test/org/apache/kandula/integration/CompletionCommitTest.java
URL: http://svn.apache.org/viewvc/webservices/kandula/trunk/java/test/org/apache/kandula/integration/CompletionCommitTest.java?view=diff&rev=479514&r1=479513&r2=479514
==============================================================================
--- webservices/kandula/trunk/java/test/org/apache/kandula/integration/CompletionCommitTest.java (original)
+++ webservices/kandula/trunk/java/test/org/apache/kandula/integration/CompletionCommitTest.java Sun Nov 26 20:35:38 2006
@@ -20,8 +20,6 @@
  * @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
  */
 
-import interop.TestServiceStub;
-
 import java.io.File;
 
 import junit.framework.TestCase;
@@ -35,7 +33,7 @@
 
 public class CompletionCommitTest extends TestCase {
 
-	private String repository = "C:/Program Files/Apache Software Foundation/Tomcat 5.0/webapps/axis2/WEB-INF";
+	private String repository = "target/testing-repository";
 
 	private KandulaDemoServiceStub stub;
 
@@ -46,7 +44,7 @@
 		stub = new KandulaDemoServiceStub(
 				"target/initiator-repository",
 				new EndpointReference(
-						"http://localhost:8082/axis2/services/TestService"));
+						"http://localhost:8082/axis2/services/KandulaDemoService"));
 	}
 
 	public CompletionCommitTest(String testName) throws Exception {
@@ -54,12 +52,12 @@
 		stub = new KandulaDemoServiceStub(
 				"target/initiator-repository",
 				new EndpointReference(
-						"http://localhost:8082/axis2/services/TestService"));
+						"http://localhost:8082/axis2/services/KandulaDemoService"));
 	}
 
 	protected void setUp() throws Exception {
 		File file = new File(repository);
-		File configFile = new File(repository + "/conf/axis2.xml");
+		File configFile = new File(repository + "/axis2.xml");
 		if (!file.exists()) {
 			throw new Exception("repository directory "
 					+ file.getAbsolutePath() + " does not exists");
@@ -86,7 +84,7 @@
 		TransactionManager tm = new TransactionManager(
 				Constants.WS_AT,
 				new EndpointReference(
-						"http://localhost:8082/axis2/services/ActivationCoordinator"),
+						"http://localhost:8081/axis2/services/ActivationCoordinator"),
 				"target/initiator-repository",
 				"target/initiator-repository/axis2.xml");
 		tm.begin(false);
@@ -101,7 +99,7 @@
 //		// TransactionManager tm = new TransactionManager(
 //		// Constants.WS_AT,
 //		// new EndpointReference(
-//		// "http://localhost:8082/axis2/services/ActivationCoordinator"));
+//		// "http://localhost:8081/axis2/services/ActivationCoordinator"));
 //		// tm.begin("target/initiator-repository",
 //		// "target/initiator-repository/axis2.xml", false);
 //		// try {



---------------------------------------------------------------------
To unsubscribe, e-mail: kandula-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: kandula-dev-help@ws.apache.org