You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2007/05/23 04:22:32 UTC
svn commit: r540805 - in /webservices/sandesha/branches/sandesha2/java/1_2:
./ modules/core/src/main/java/org/apache/sandesha2/security/rampart/
modules/interop/ modules/policy/ modules/tests/
Author: chamikara
Date: Tue May 22 19:22:31 2007
New Revision: 540805
URL: http://svn.apache.org/viewvc?view=rev&rev=540805
Log:
Added the commit '540804' to the branch.
Removed:
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java
webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/security/rampart/RampartSecurityToken.java
Modified:
webservices/sandesha/branches/sandesha2/java/1_2/modules/interop/pom.xml
webservices/sandesha/branches/sandesha2/java/1_2/modules/policy/pom.xml
webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/pom.xml
webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/tests.build.xml
webservices/sandesha/branches/sandesha2/java/1_2/pom.xml
Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/interop/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/interop/pom.xml?view=diff&rev=540805&r1=540804&r2=540805
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/modules/interop/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/modules/interop/pom.xml Tue May 22 19:22:31 2007
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.sandesha2</groupId>
+ <groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
<version>SNAPSHOT</version>
</parent>
@@ -33,13 +33,37 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <!-- Rampart -->
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${rampart.version}</version>
</dependency>
</dependencies>
+ <properties>
+ <rampart.version>SNAPSHOT</rampart.version>
+ </properties>
+
</project>
Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/policy/pom.xml?view=diff&rev=540805&r1=540804&r2=540805
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/modules/policy/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/modules/policy/pom.xml Tue May 22 19:22:31 2007
@@ -1,27 +1,27 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
- <groupId>org.apache.sandesha2</groupId>
+ <groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
<version>SNAPSHOT</version>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-policy</artifactId>
- <packaging>jar</packaging>
- <name>Sandesha2 - Policy</name>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/main/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-policy</artifactId>
+ <packaging>jar</packaging>
+ <name>Sandesha2 - Policy</name>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/main/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
@@ -50,25 +50,27 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
</plugins>
-
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.sandesha2</groupId>
- <artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/pom.xml?view=diff&rev=540805&r1=540804&r2=540805
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/pom.xml Tue May 22 19:22:31 2007
@@ -72,11 +72,8 @@
</plugins>
</build>
- <properties>
- <test.property>2.8.1</test.property>
- </properties>
-
<dependencies>
+
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
@@ -87,13 +84,32 @@
<artifactId>sandesha2-policy</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-samples</artifactId>
<version>${pom.version}</version>
</dependency>
-
-
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart</artifactId>
+ <version>${rampart.version}</version>
+ <type>mar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>${rampart.version}</version>
+ </dependency>
</dependencies>
+ <properties>
+ <test.property>2.8.1</test.property>
+ <rampart.version>SNAPSHOT</rampart.version>
+ </properties>
+
</project>
Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/tests.build.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/tests.build.xml?view=diff&rev=540805&r1=540804&r2=540805
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/tests.build.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/modules/tests/tests.build.xml Tue May 22 19:22:31 2007
@@ -9,9 +9,7 @@
<property name="build.repo.dir" value="${build.dir}/repos" />
<property name="server.dist.path" value="${build.repo.dir}/server" />
-
<property name="repo.addressing.mar" value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar" />
- <property name="repo.rampart.mar" value="${local.repo}/org/apache/rampart/rampart/${rampart.version}/rampart-${rampart.version}.mar" />
<mkdir dir="${server.dist.path}" />
<mkdir dir="${server.dist.path}/modules" />
@@ -28,7 +26,6 @@
<!-- Copying dependent mar files -->
<copy file="${repo.addressing.mar}" toDir="${server.dist.path}/modules/" />
- <copy file="${repo.rampart.mar}" toDir="${server.dist.path}/modules/" />
</target>
@@ -36,9 +33,7 @@
<property name="build.repo.dir" value="${build.dir}/repos" />
<property name="client.dist.path" value="${build.repo.dir}/client" />
-
<property name="repo.addressing.mar" value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar" />
- <property name="repo.rampart.mar" value="${local.repo}/org/apache/rampart/rampart/${rampart.version}/rampart-${rampart.version}.mar" />
<mkdir dir="${client.dist.path}" />
<mkdir dir="${client.dist.path}/modules" />
@@ -48,7 +43,6 @@
<!-- Copying dependent mar files -->
<copy file="${repo.addressing.mar}" toDir="${client.dist.path}/modules/" />
- <copy file="${repo.rampart.mar}" toDir="${client.dist.path}/modules/" />
</target>
@@ -89,6 +83,11 @@
<property name="secure.client.path" value="${build.dir}/repos/secure-client"/>
<property name="secure.server.path" value="${build.dir}/repos/secure-server"/>
+ <property name="repo.addressing.mar" value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar" />
+ <property name="repo.rampart.mar" value="${local.repo}/org/apache/rampart/rampart/${rampart.version}/rampart-${rampart.version}.mar" />
+ <property name="repo.rampart.core.jar" value="${local.repo}/org/apache/rampart/rampart-core/${rampart.version}/rampart-core-${rampart.version}.jar" />
+ <property name="repo.rampart.policy.jar" value="${local.repo}/org/apache/rampart/rampart-policy/${rampart.version}/rampart-policy-${rampart.version}.jar" />
+
<property name="secure.temp.path" value="${build.dir}/temp/secure" />
<mkdir dir="${secure.temp.path}" />
@@ -113,6 +112,14 @@
<delete dir="${build.temp.dir}"/>
+ <copy file="${repo.rampart.mar}" toDir="${secure.client.path}/modules/" />
+ <copy file="${repo.rampart.core.jar}" toDir="${secure.client.path}/modules/" />
+ <copy file="${repo.rampart.policy.jar}" toDir="${secure.client.path}/modules/" />
+
+ <copy file="${repo.rampart.mar}" toDir="${secure.server.path}/modules/" />
+ <copy file="${repo.rampart.core.jar}" toDir="${secure.server.path}/modules/" />
+ <copy file="${repo.rampart.policy.jar}" toDir="${secure.server.path}/modules/" />
+
</target>
</project>
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=540805&r1=540804&r2=540805
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_2/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_2/pom.xml Tue May 22 19:22:31 2007
@@ -88,30 +88,30 @@
<id>mlovett</id>
<email>MLOVETT AT uk.ibm.com</email>
<organization>IBM</organization>
- </developer>
- </developers>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
+ </developer>
+ </developers>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.2</version>
</plugin>
- </plugins>
- </build>
-
+ </plugins>
+ </build>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</developerConnection>
@@ -187,80 +187,41 @@
<artifactId>axis2</artifactId>
<version>${axis2.version}</version>
</dependency>
- <dependency>
+
+ <dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-mtompolicy</artifactId>
+ <artifactId>addressing</artifactId>
<version>${axis2.version}</version>
+ <type>mar</type>
</dependency>
- <!-- Rampart -->
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- <version>${rampart.version}</version>
- </dependency>
<dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-trust</artifactId>
- <version>${rampart.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>${rampart.version}</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ <version>${axis2.version}</version>
</dependency>
+
</dependencies>
- <profiles>
- <profile>
- <id>jdk14</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>1.4</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk13</artifactId>
- <version>${bcprov.jdk13.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jdk15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>${bcprov.jdk15.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
<modules>
- <module>modules/samples</module>
- <module>modules/interop</module>
- <module>modules/core</module>
+ <module>modules/core</module>
<module>modules/mar</module>
<module>modules/client</module>
<module>modules/policy</module>
+ <module>modules/rampart-integration</module>
<module>modules/tests</module>
+ <module>modules/samples</module>
+ <module>modules/interop</module>
<module>modules/distribution</module>
</modules>
-
+
<properties>
- <sandesha2.version>SNAPSHOT</sandesha2.version>
- <rampart.version>SNAPSHOT</rampart.version>
- <axis2.version>1.2</axis2.version>
- <axiom.version>1.2.3</axiom.version>
+
+ <sandesha2.version>SNAPSHOT</sandesha2.version>
+ <axis2.version>1.2</axis2.version>
+
+ <!--
<addressing.mar.version>SNAPSHOT</addressing.mar.version>
- <wss4j.version>SNAPSHOT</wss4j.version>
<xmlsec.version>1.3.0</xmlsec.version>
<opensaml.version>1.1</opensaml.version>
<XmlSchema.version>SNAPSHOT</XmlSchema.version>
@@ -277,8 +238,6 @@
<stax.impl.version>3.2.0</stax.impl.version>
<stax.api.version>1.0.1</stax.api.version>
<xml.apis.version>1.3.03</xml.apis.version>
- <bcprov.jdk13.version>132</bcprov.jdk13.version>
- <bcprov.jdk15.version>132</bcprov.jdk15.version>
<commons.codec.version>1.3</commons.codec.version>
<commons.httpclient.version>3.0.1</commons.httpclient.version>
<commons.logging.version>1.1</commons.logging.version>
@@ -294,7 +253,9 @@
<ant.version>1.7.0</ant.version>
<xalan.version>2.7.0</xalan.version>
<xerces.version>2.8.1</xerces.version>
- </properties>
+ -->
+
+ </properties>
<distributionManagement>
<repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org