Author: amilas
Date: Thu Oct 1 08:58:32 2009
New Revision: 820577
URL: http://svn.apache.org/viewvc?rev=820577&view=rev
Log:
remove the generated code and change the test senarios to suite for current
axis2 generated code
Removed:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceCallbackHandler.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceMessageReceiverInOnly.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceMessageReceiverInOut.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceSkeleton.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/RMInteropServiceStub.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/tempuri/
Modified:
webservices/sandesha/trunk/java/modules/interop/pom.xml
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java
Modified: webservices/sandesha/trunk/java/modules/interop/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/pom.xml?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/interop/pom.xml Thu Oct 1 08:58:32
2009
@@ -48,19 +48,63 @@
<target>1.5</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-code/src</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>source-code-generation</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <arg line="-uri
src/resources/conf/RMInteropService.wsdl -ss -g
+ -p org.apache.sandesha2.interop
+ -o target/generated-code"/>
+ <classpath
refid="maven.dependency.classpath"/>
+ <classpath
refid="maven.compile.classpath"/>
+ <classpath
refid="maven.runtime.classpath"/>
+ </java>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -79,6 +123,18 @@
</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>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_1.java
Thu Oct 1 08:58:32 2009
@@ -140,15 +140,15 @@
Ping ping = new Ping ();
ping.setText("ping1");
- stub.Ping (ping);
+ stub.ping (ping);
ping = new Ping ();
ping.setText("ping2");
- stub.Ping (ping);
+ stub.ping (ping);
ping = new Ping ();
ping.setText("ping3");
- stub.Ping (ping);
+ stub.ping (ping);
SequenceReport sequenceReport = null;
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_3.java
Thu Oct 1 08:58:32 2009
@@ -158,12 +158,12 @@
options.setProperty(SandeshaClientConstants.MESSAGE_NUMBER,new
Long(1));
Ping ping = new Ping ();
ping.setText("ping1");
- stub.Ping(ping);
+ stub.ping(ping);
options.setProperty(SandeshaClientConstants.MESSAGE_NUMBER,new
Long(3));
ping = new Ping ();
ping.setText("ping2");
- stub.Ping(ping);
+ stub.ping(ping);
boolean complete = false;
while (!complete) {
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_1_4.java
Thu Oct 1 08:58:32 2009
@@ -155,15 +155,15 @@
Ping ping = new Ping ();
ping.setText("ping1");
- stub.Ping(ping);
+ stub.ping(ping);
ping = new Ping ();
ping.setText("ping2");
- stub.Ping(ping);
+ stub.ping(ping);
ping = new Ping ();
ping.setText("ping3");
- stub.Ping(ping);
+ stub.ping(ping);
SequenceReport sequenceReport = null;
boolean complete = false;
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_1.java
Thu Oct 1 08:58:32 2009
@@ -261,7 +261,7 @@
echoString.getEchoString().setText("echo1");
RMInteropServiceCallbackHandlerImpl callback1 = new
RMInteropServiceCallbackHandlerImpl ("callback1");
- stub.startEchoString(echoString, callback1);
+ stub.startechoString(echoString, callback1);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -269,7 +269,7 @@
echoString.getEchoString().setText("echo2");
RMInteropServiceCallbackHandlerImpl callback2 = new
RMInteropServiceCallbackHandlerImpl ("callback2");
- stub.startEchoString(echoString, callback2);
+ stub.startechoString(echoString, callback2);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -277,7 +277,7 @@
echoString.getEchoString().setText("echo3");
RMInteropServiceCallbackHandlerImpl callback3 = new
RMInteropServiceCallbackHandlerImpl ("callback3");
- stub.startEchoString(echoString, callback3);
+ stub.startechoString(echoString, callback3);
while (!callback3.isCompleted()) {
Thread.sleep(2000);
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_2.java
Thu Oct 1 08:58:32 2009
@@ -262,7 +262,7 @@
echoString.getEchoString().setText("echo1");
RMInteropServiceCallbackHandlerImpl callback1 = new
RMInteropServiceCallbackHandlerImpl ("callback1");
- stub.startEchoString(echoString, callback1);
+ stub.startechoString(echoString, callback1);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -270,7 +270,7 @@
echoString.getEchoString().setText("echo2");
RMInteropServiceCallbackHandlerImpl callback2 = new
RMInteropServiceCallbackHandlerImpl ("callback2");
- stub.startEchoString(echoString, callback2);
+ stub.startechoString(echoString, callback2);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -278,7 +278,7 @@
echoString.getEchoString().setText("echo3");
RMInteropServiceCallbackHandlerImpl callback3 = new
RMInteropServiceCallbackHandlerImpl ("callback3");
- stub.startEchoString(echoString, callback3);
+ stub.startechoString(echoString, callback3);
while (!callback1.isCompleted() || !callback2.isCompleted() ||
!callback3.isCompleted()) {
Thread.sleep(2000);
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_2_3.java
Thu Oct 1 08:58:32 2009
@@ -263,7 +263,7 @@
echoString.getEchoString().setText("echo1");
RMInteropServiceCallbackHandlerImpl callback1 = new
RMInteropServiceCallbackHandlerImpl ("callback1");
- stub.startEchoString(echoString, callback1);
+ stub.startechoString(echoString, callback1);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -271,7 +271,7 @@
echoString.getEchoString().setText("echo2");
RMInteropServiceCallbackHandlerImpl callback2 = new
RMInteropServiceCallbackHandlerImpl ("callback2");
- stub.startEchoString(echoString, callback2);
+ stub.startechoString(echoString, callback2);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -279,7 +279,7 @@
echoString.getEchoString().setText("echo3");
RMInteropServiceCallbackHandlerImpl callback3 = new
RMInteropServiceCallbackHandlerImpl ("callback3");
- stub.startEchoString(echoString, callback3);
+ stub.startechoString(echoString, callback3);
while (!callback3.isCompleted()) {
Thread.sleep(2000);
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_3_1.java
Thu Oct 1 08:58:32 2009
@@ -253,7 +253,7 @@
options.setReplyTo(new EndpointReference
(AddressingConstants.Final.WSA_ANONYMOUS_URL));
RMInteropServiceCallbackHandlerImpl callback1 = new
RMInteropServiceCallbackHandlerImpl ("callback1");
- stub.startEchoString(echoString, callback1);
+ stub.startechoString(echoString, callback1);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -261,7 +261,7 @@
echoString.getEchoString().setText("echo2");
RMInteropServiceCallbackHandlerImpl callback2 = new
RMInteropServiceCallbackHandlerImpl ("callback2");
- stub.startEchoString(echoString, callback2);
+ stub.startechoString(echoString, callback2);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -269,7 +269,7 @@
echoString.getEchoString().setText("echo3");
RMInteropServiceCallbackHandlerImpl callback3 = new
RMInteropServiceCallbackHandlerImpl ("callback3");
- stub.startEchoString(echoString, callback3);
+ stub.startechoString(echoString, callback3);
while (!callback3.isCompleted()) {
Thread.sleep(2000);
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_1.java
Thu Oct 1 08:58:32 2009
@@ -165,22 +165,22 @@
Ping ping = new Ping ();
ping.setText("ping1");
- stub.Ping (ping);
+ stub.ping (ping);
ping = new Ping ();
ping.setText("ping2");
- stub.Ping (ping);
+ stub.ping (ping);
ping = new Ping ();
ping.setText("ping3");
- stub.Ping (ping);
+ stub.ping (ping);
terminateSequence(serviceClient);
Thread.sleep(5000);
serviceClient.getOptions().setProperty(SandeshaClientConstants.UNRELIABLE_MESSAGE,
Constants.VALUE_TRUE);
serviceClient.getOptions().setProperty(RampartMessageData.CANCEL_REQUEST,
Constants.VALUE_TRUE);
- stub.Ping(ping);
+ stub.ping(ping);
Thread.sleep(10000);
// stub._getServiceClient().cleanup();
Modified:
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java?rev=820577&r1=820576&r2=820577&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java
(original)
+++
webservices/sandesha/trunk/java/modules/interop/src/main/java/org/apache/sandesha2/interop/rm1_1_clients/Scenario_4_2.java
Thu Oct 1 08:58:32 2009
@@ -258,7 +258,7 @@
options.setReplyTo(new EndpointReference
(AddressingConstants.Final.WSA_ANONYMOUS_URL));
RMInteropServiceCallbackHandlerImpl callback1 = new
RMInteropServiceCallbackHandlerImpl ("callback1");
- stub.startEchoString(echoString, callback1);
+ stub.startechoString(echoString, callback1);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -266,7 +266,7 @@
echoString.getEchoString().setText("echo2");
RMInteropServiceCallbackHandlerImpl callback2 = new
RMInteropServiceCallbackHandlerImpl ("callback2");
- stub.startEchoString(echoString, callback2);
+ stub.startechoString(echoString, callback2);
echoString = new EchoString ();
echoString.setEchoString (new EchoStringRequestBodyType ());
@@ -274,7 +274,7 @@
echoString.getEchoString().setText("echo3");
RMInteropServiceCallbackHandlerImpl callback3 = new
RMInteropServiceCallbackHandlerImpl ("callback3");
- stub.startEchoString(echoString, callback3);
+ stub.startechoString(echoString, callback3);
while (!callback3.isCompleted()) {
Thread.sleep(2000);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
