Author: chamikara
Date: Sun Jun 3 23:14:09 2007
New Revision: 544062
URL: http://svn.apache.org/viewvc?view=rev&rev=544062
Log:
Removed rampart dependencies from the maven1 build. Updated samples
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/maven.xml
webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java
webservices/sandesha/branches/sandesha2/java/1_2/pom.xml
webservices/sandesha/branches/sandesha2/java/1_2/project.properties
webservices/sandesha/branches/sandesha2/java/1_2/project.xml
Modified: webservices/sandesha/branches/sandesha2/java/1_2/maven.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/maven.xml?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/maven.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/maven.xml Sun Jun 3
23:14:09 2007
@@ -33,9 +33,6 @@
<ant:property name="repo.addressing.mar.path"
value="${maven.repo.local}/${axis2.mar.groupid}/mars" />
<ant:property name="repo.addressing.mar"
value="${repo.addressing.mar.path}/${repo.addressing.mar.full.name}" />
- <ant:property name="repo.rampart.mar"
value="${maven.repo.local}/org.apache.axis2/mars/rampart-${rampart.version}.mar"
/>
- <ant:property name="repo.trust.mar"
value="${maven.repo.local}/org.apache.axis2/mars/rampart_sts-${rampart.version}.mar"
/>
-
<ant:property name="test.service.name" value="RMSampleService.aar" />
@@ -163,7 +160,6 @@
<!-- Copying addressing mar file-->
<ant:copy file="${repo.addressing.mar}"
toDir="${client.dist.path}/modules/" />
- <ant:copy file="${repo.rampart.mar}"
toDir="${client.dist.path}/modules/" />
</goal>
<goal name="secure:create" prereqs="server:create,client:create">
@@ -196,6 +192,7 @@
<delete dir="${build.temp.dir}"/>
</goal>
+<!--
<goal name="secure:rampart:create"
prereqs="server:create,client:create">
<ant:property name="secure.rampart.client.path"
value="${build.repo.dir}/secure-rampart-client"/>
<ant:property name="secure.rampart.server.path"
value="${build.repo.dir}/secure-rampart-server"/>
@@ -217,10 +214,8 @@
</fileset>
</copy>
- <!-- creating the Sandesha2 module configured for Rampart -->
-
<ant:mkdir dir="${secure.rampart.temp.path}/module" />
- <!-- Replace the security manager in the module.xml file -->
+
<ant:unjar src="${maven.build.dir}/${mar.name}"
dest="${secure.rampart.temp.path}/module"/>
<ant:replace
file="${secure.rampart.temp.path}/module/META-INF/module.xml"
@@ -231,33 +226,27 @@
<ant:jar
jarfile="${secure.rampart.server.path}/modules/${mar.name}"
basedir="${secure.rampart.temp.path}/module"/>
- <!-- Creating the service for UsernameToken+RM -->
<ant:mkdir dir="${secure.rampart.temp.path}/service1" />
<ant:unjar
src="${build.repo.dir}/server/services/${test.service.name}"
dest="${secure.rampart.temp.path}/service1"/>
<ant:copy
file="${dir.test.resources}/rampart-config/UT-services.xml"
toFile="${secure.rampart.temp.path}/service1/META-INF/services.xml"
overwrite="true" />
<ant:copy file="${dir.interop}/conf/store.jks"
todir="${secure.rampart.temp.path}/service1" />
<ant:jar
jarfile="${secure.rampart.server.path}/services/UTRMTestService.aar"
basedir="${secure.rampart.temp.path}/service1"/>
- <!-- Creating the service for Assymetric+RM -->
<ant:mkdir dir="${secure.rampart.temp.path}/service2" />
<ant:unjar
src="${build.repo.dir}/server/services/${test.service.name}"
dest="${secure.rampart.temp.path}/service2"/>
<ant:copy
file="${dir.test.resources}/rampart-config/Asymmetric-services.xml"
toFile="${secure.rampart.temp.path}/service2/META-INF/services.xml"
overwrite="true" />
<ant:copy file="${dir.interop}/conf/store.jks"
todir="${secure.rampart.temp.path}/service2" />
<ant:jar
jarfile="${secure.rampart.server.path}/services/AsymmetricRMTestService.aar"
basedir="${secure.rampart.temp.path}/service2"/>
-
- <!-- Creating the service for SecCon+RM -->
<ant:mkdir dir="${secure.rampart.temp.path}/service3" />
<ant:unjar
src="${build.repo.dir}/server/services/${test.service.name}"
dest="${secure.rampart.temp.path}/service3"/>
<ant:copy
file="${dir.test.resources}/rampart-config/SecCon-services.xml"
toFile="${secure.rampart.temp.path}/service3/META-INF/services.xml"
overwrite="true" />
<ant:copy file="${dir.interop}/conf/store.jks"
todir="${secure.rampart.temp.path}/service3" />
<ant:jar
jarfile="${secure.rampart.server.path}/services/SecConRMTestService.aar"
basedir="${secure.rampart.temp.path}/service3"/>
- <!--
- <delete dir="${build.temp.dir}"/>
- -->
</goal>
-
+ -->
+
<goal name="serialize:create" prereqs="server:create,client:create">
<ant:property name="serialize.client.path"
value="${build.repo.dir}/serialize-client"/>
<ant:property name="serialize.server.path"
value="${build.repo.dir}/serialize-server"/>
@@ -306,7 +295,6 @@
<!-- Copying addressing mar file-->
<ant:copy file="${repo.addressing.mar}"
toDir="${server.dist.path}/modules/" />
- <ant:copy file="${repo.rampart.mar}"
toDir="${server.dist.path}/modules/" />
</goal>
<goal name="sample:compile" prereqs="client:jar">
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/distribution/src/main/assembly/bin.xml
Sun Jun 3 23:14:09 2007
@@ -39,6 +39,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../../modules/rampart-integration/target</directory>
+ <outputDirectory>sandesha2-${version}-bin</outputDirectory>
+ <includes>
+ <include>sandesha2-rampart-integration-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../../modules/mar/target</directory>
<outputDirectory>sandesha2-${version}-bin</outputDirectory>
<includes>
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoClient.java
Sun Jun 3 23:14:09 2007
@@ -121,17 +121,17 @@
serviceClient.setOptions(clientOptions);
-// Callback callback1 = new TestCallback ("Callback 1");
-// serviceClient.sendReceiveNonBlocking
(getEchoOMBlock("echo1",sequenceKey),callback1);
-//
-// Callback callback2 = new TestCallback ("Callback 2");
-//
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo2",sequenceKey),callback2);
-//
-// Callback callback3 = new TestCallback ("Callback 3");
-//
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo3",sequenceKey),callback3);
-//
-// Callback callback4 = new TestCallback ("Callback 4");
-//
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo4",sequenceKey),callback4);
+ Callback callback1 = new TestCallback ("Callback 1");
+ serviceClient.sendReceiveNonBlocking
(getEchoOMBlock("echo1",sequenceKey),callback1);
+
+ Callback callback2 = new TestCallback ("Callback 2");
+
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo2",sequenceKey),callback2);
+
+ Callback callback3 = new TestCallback ("Callback 3");
+
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo3",sequenceKey),callback3);
+
+ Callback callback4 = new TestCallback ("Callback 4");
+
serviceClient.sendReceiveNonBlocking(getEchoOMBlock("echo4",sequenceKey),callback4);
clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE,
"true");
Callback callback5 = new TestCallback ("Callback 5");
@@ -143,7 +143,7 @@
Thread.sleep(4000);
- configContext.getListenerManager().stop();
+ configContext.terminate();
serviceClient.cleanup();
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncEchoWithPollingClient.java
Sun Jun 3 23:14:09 2007
@@ -140,6 +140,9 @@
SandeshaClient.terminateSequence(serviceClient);
+ configContext.terminate();
+ serviceClient.cleanup();
+
}
private static OMElement getEchoOMBlock(String text, String
sequenceKey) {
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java
Sun Jun 3 23:14:09 2007
@@ -117,6 +117,7 @@
}
}
+ configContext.terminate();
serviceClient.cleanup();
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java
Sun Jun 3 23:14:09 2007
@@ -107,6 +107,7 @@
serviceClient.fireAndForget(getPingOMBlock());
SandeshaClient.waitUntilSequenceCompleted(serviceClient);
+ configContext.terminate();
serviceClient.cleanup();
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncEchoClient.java
Sun Jun 3 23:14:09 2007
@@ -117,6 +117,11 @@
while (!callback3.isComplete()) {
Thread.sleep(1000);
}
+
+ Thread.sleep(4000);
+
+ configContext.terminate();
+ serviceClient.cleanup();
}
private static OMElement getEchoOMBlock(String text, String
sequenceKey) {
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/SyncPingClient.java
Sun Jun 3 23:14:09 2007
@@ -106,7 +106,6 @@
serviceClient.fireAndForget(getPingOMBlock("ping2"));
clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE,
"true");
-
serviceClient.fireAndForget(getPingOMBlock("ping3"));
SequenceReport sequenceReport = null;
@@ -125,6 +124,7 @@
}
}
+ configContext.terminate();
serviceClient.cleanup();
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguideEchoClient.java
Sun Jun 3 23:14:09 2007
@@ -71,6 +71,9 @@
}
Thread.sleep(4000);
+
+ configContext.terminate();
+ serviceClient.cleanup();
}
private static OMElement getEchoOMBlock(String text, String
sequenceKey) {
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_2/modules/samples/src/main/java/sandesha2/samples/userguide/UserguidePingClient.java
Sun Jun 3 23:14:09 2007
@@ -58,6 +58,7 @@
clientOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE,
"true");
serviceClient.fireAndForget(getPingOMBlock("ping3"));
+ configContext.terminate();
serviceClient.cleanup();
}
Modified: webservices/sandesha/branches/sandesha2/java/1_2/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/pom.xml?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/pom.xml Sun Jun 3
23:14:09 2007
@@ -184,10 +184,16 @@
<!-- Axis2 -->
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
+ <artifactId>axis2-kernel</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>addressing</artifactId>
Modified: webservices/sandesha/branches/sandesha2/java/1_2/project.properties
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/project.properties?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/project.properties
(original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/project.properties Sun Jun
3 23:14:09 2007
@@ -31,13 +31,9 @@
addressing.version=${axis2.version}
rampart.version=1.2
-axis2.security.version=1.2
-axis2.rahas.version=1.2
-axis2.secpolicy.version=1.2
neethi.version=2.0.1
XmlSchema.version=1.3.1
-wss4j.version=1.5.2
annogen.version=0.1.0
backport_util_concurrent.version=2.2
@@ -53,11 +49,9 @@
jakarta.httpcore.version=4.0-alpha4
activation.version=1.1
javamail.version=1.4
-xmlsec.version=1.4-SNAPSHOT
-bcprov.version=jdk13-133
repo.addressing.mar.name=addressing
axis2.jar.groupid=org.apache.axis2
axis2.mar.groupid=org.apache.axis2
-commons.fileupload.version=1.1.1
+commons.fileupload.version=1.1.1
\ No newline at end of file
Modified: webservices/sandesha/branches/sandesha2/java/1_2/project.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/project.xml?view=diff&rev=544062&r1=544061&r2=544062
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/project.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/project.xml Sun Jun 3
23:14:09 2007
@@ -136,12 +136,6 @@
<type>mar</type>
</dependency>
<dependency>
- <groupId>${axis2.mar.groupid}</groupId>
- <artifactId>rampart</artifactId>
- <version>${rampart.version}</version>
- <type>mar</type>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
@@ -225,45 +219,6 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javamail.version}</version>
- </dependency>
- <dependency>
- <groupId>${axis2.jar.groupid}</groupId>
- <artifactId>axis2-security</artifactId>
- <version>${axis2.security.version}</version>
- </dependency>
- <dependency>
- <groupId>${axis2.jar.groupid}</groupId>
- <artifactId>axis2-rahas</artifactId>
- <version>${axis2.rahas.version}</version>
- </dependency>
- <dependency>
- <groupId>${axis2.jar.groupid}</groupId>
- <artifactId>axis2-secpolicy</artifactId>
- <version>${axis2.secpolicy.version}</version>
- </dependency>
- <dependency>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>${xmlsec.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov</artifactId>
- <version>${bcprov.version}</version>
- <properties>
- <module>true</module>
- </properties>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
