Author: chamikara
Date: Sun Jun 3 23:30:27 2007
New Revision: 544072
URL: http://svn.apache.org/viewvc?view=rev&rev=544072
Log:
merged the previous commits to the trunk
Modified:
webservices/sandesha/trunk/java/maven.xml
webservices/sandesha/trunk/java/modules/distribution/src/main/assembly/bin.xml
webservices/sandesha/trunk/java/pom.xml
webservices/sandesha/trunk/java/project.properties
webservices/sandesha/trunk/java/project.xml
Modified: webservices/sandesha/trunk/java/maven.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/maven.xml?view=diff&rev=544072&r1=544071&r2=544072
==============================================================================
--- webservices/sandesha/trunk/java/maven.xml (original)
+++ webservices/sandesha/trunk/java/maven.xml Sun Jun 3 23:30:27 2007
@@ -17,8 +17,8 @@
<ant:property name="mar.name" value="${dist.module.name}.mar"/>
<ant:property name="policy.jar.name"
value="${pom.artifactId}-policy-${sandesha2.version}.jar"/>
- <ant:property name="jar.name" value="${dist.name}.jar"/>
- <ant:property name="client.jar.name"
value="${pom.artifactId}-client-${sandesha2.version}.jar"/>
+ <ant:property name="jar.name"
value="${pom.artifactId}-core-${sandesha2.module.version}.jar"/>
+ <ant:property name="client.jar.name"
value="${pom.artifactId}-client-constants-${sandesha2.version}.jar"/>
<ant:property name="dir.samples" value="modules/samples"/>
<ant:property name="dir.test.resources" value="modules/tests/resources"/>
@@ -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"/>
@@ -277,14 +266,11 @@
</fileset>
</copy>
- <!-- Switch on serialization in the module.xml file, and use
the unit test context plugin -->
+ <!-- Switch on serialization in the module.xml file -->
<ant:unjar src="${maven.build.dir}/${mar.name}"
dest="${serialize.temp.path}"/>
<ant:replace file="${serialize.temp.path}/META-INF/module.xml"
token="<!--
<sandesha2:UseMessageSerialization>true</sandesha2:UseMessageSerialization>
-->"
value="<sandesha2:UseMessageSerialization>true</sandesha2:UseMessageSerialization>"/>
- <ant:replace file="${serialize.temp.path}/META-INF/module.xml"
- token="context.DummyContextManager"
- value="scenarios.UnitTestContextManager"/>
<ant:jar
jarfile="${serialize.client.path}/modules/${test.module.name}.mar"
basedir="${serialize.temp.path}"/>
<ant:jar
jarfile="${serialize.server.path}/modules/${test.module.name}.mar"
basedir="${serialize.temp.path}"/>
@@ -309,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/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/distribution/src/main/assembly/bin.xml?view=diff&rev=544072&r1=544071&r2=544072
==============================================================================
---
webservices/sandesha/trunk/java/modules/distribution/src/main/assembly/bin.xml
(original)
+++
webservices/sandesha/trunk/java/modules/distribution/src/main/assembly/bin.xml
Sun Jun 3 23:30:27 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/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/pom.xml?view=diff&rev=544072&r1=544071&r2=544072
==============================================================================
--- webservices/sandesha/trunk/java/pom.xml (original)
+++ webservices/sandesha/trunk/java/pom.xml Sun Jun 3 23:30:27 2007
@@ -184,7 +184,13 @@
<!-- 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>
Modified: webservices/sandesha/trunk/java/project.properties
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.properties?view=diff&rev=544072&r1=544071&r2=544072
==============================================================================
--- webservices/sandesha/trunk/java/project.properties (original)
+++ webservices/sandesha/trunk/java/project.properties Sun Jun 3 23:30:27 2007
@@ -30,14 +30,9 @@
axiom.version=1.2.4
addressing.version=${axis2.version}
-rampart.version=SNAPSHOT
-axis2.security.version=SNAPSHOT
-axis2.rahas.version=SNAPSHOT
-axis2.secpolicy.version=SNAPSHOT
neethi.version=SNAPSHOT
XmlSchema.version=SNAPSHOT
-wss4j.version=SNAPSHOT
annogen.version=0.1.0
backport_util_concurrent.version=2.2
@@ -53,8 +48,6 @@
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
Modified: webservices/sandesha/trunk/java/project.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.xml?view=diff&rev=544072&r1=544071&r2=544072
==============================================================================
--- webservices/sandesha/trunk/java/project.xml (original)
+++ webservices/sandesha/trunk/java/project.xml Sun Jun 3 23:30:27 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]
