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 ch...@apache.org on 2007/05/23 04:19:18 UTC
svn commit: r540804 - in /webservices/sandesha/trunk/java: ./
modules/core/src/main/java/org/apache/sandesha2/security/rampart/
modules/interop/ modules/policy/ modules/rampart-integration/
modules/rampart-integration/src/ modules/rampart-integration/s...
Author: chamikara
Date: Tue May 22 19:19:17 2007
New Revision: 540804
URL: http://svn.apache.org/viewvc?view=rev&rev=540804
Log:
Moved the sandesha2-rampart integration code to a new maven module, named rampart-integration
Cleaned the pom.xml files.
Added:
webservices/sandesha/trunk/java/modules/rampart-integration/
webservices/sandesha/trunk/java/modules/rampart-integration/pom.xml
webservices/sandesha/trunk/java/modules/rampart-integration/src/
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java
webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartSecurityToken.java
Removed:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/security/rampart/
Modified:
webservices/sandesha/trunk/java/modules/interop/pom.xml
webservices/sandesha/trunk/java/modules/policy/pom.xml
webservices/sandesha/trunk/java/modules/tests/pom.xml
webservices/sandesha/trunk/java/modules/tests/tests.build.xml
webservices/sandesha/trunk/java/pom.xml
Modified: webservices/sandesha/trunk/java/modules/interop/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/interop/pom.xml?view=diff&rev=540804&r1=540803&r2=540804
==============================================================================
--- webservices/sandesha/trunk/java/modules/interop/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/interop/pom.xml Tue May 22 19:19:17 2007
@@ -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/trunk/java/modules/policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/policy/pom.xml?view=diff&rev=540804&r1=540803&r2=540804
==============================================================================
--- webservices/sandesha/trunk/java/modules/policy/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/policy/pom.xml Tue May 22 19:19:17 2007
@@ -63,12 +63,14 @@
</build>
- <dependencies>
+ <dependencies>
+
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
<version>SNAPSHOT</version>
- </dependency>
+ </dependency>
+
</dependencies>
</project>
Added: webservices/sandesha/trunk/java/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/rampart-integration/pom.xml?view=auto&rev=540804
==============================================================================
--- webservices/sandesha/trunk/java/modules/rampart-integration/pom.xml (added)
+++ webservices/sandesha/trunk/java/modules/rampart-integration/pom.xml Tue May 22 19:19:17 2007
@@ -0,0 +1,70 @@
+<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>
+ <artifactId>sandesha2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-rampart-integration</artifactId>
+ <packaging>jar</packaging>
+ <name>Sandesha2 - Rampart Integration</name>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/main/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <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>
+
+ <!-- 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>
Added: webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java?view=auto&rev=540804
==============================================================================
--- webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java (added)
+++ webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartBasedSecurityManager.java Tue May 22 19:19:17 2007
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2004,2005 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.
+ */
+
+package org.apache.sandesha2.security.rampart;
+
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axis2.Constants;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisModule;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.neethi.Policy;
+import org.apache.rahas.RahasConstants;
+import org.apache.rahas.SimpleTokenStore;
+import org.apache.rahas.Token;
+import org.apache.rahas.TokenStorage;
+import org.apache.rahas.TrustException;
+import org.apache.rahas.TrustUtil;
+import org.apache.rahas.client.STSClient;
+import org.apache.rampart.RampartException;
+import org.apache.rampart.RampartMessageData;
+import org.apache.rampart.policy.RampartPolicyBuilder;
+import org.apache.rampart.policy.RampartPolicyData;
+import org.apache.rampart.util.RampartUtil;
+import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
+import org.apache.sandesha2.security.SecurityManager;
+import org.apache.sandesha2.security.SecurityToken;
+import org.apache.ws.secpolicy.WSSPolicyException;
+import org.apache.ws.secpolicy.model.SecureConversationToken;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSDerivedKeyTokenPrincipal;
+import org.apache.ws.security.WSSecurityEngineResult;
+import org.apache.ws.security.conversation.ConversationConstants;
+import org.apache.ws.security.handler.WSHandlerConstants;
+import org.apache.ws.security.handler.WSHandlerResult;
+import org.apache.ws.security.message.token.Reference;
+import org.apache.ws.security.message.token.SecurityTokenReference;
+
+import javax.xml.namespace.QName;
+
+import java.security.Principal;
+import java.util.List;
+import java.util.Vector;
+
+
+public class RampartBasedSecurityManager extends SecurityManager {
+
+ private static final Log log = LogFactory.getLog(RampartBasedSecurityManager.class);
+
+ TokenStorage storage = null;
+
+ /**
+ * @param context
+ */
+ public RampartBasedSecurityManager(ConfigurationContext context) {
+ super(context);
+
+ this.storage = (TokenStorage) context
+ .getProperty(TokenStorage.TOKEN_STORAGE_KEY);
+ if (this.storage == null) {
+ this.storage = new SimpleTokenStore();
+ context.setProperty(TokenStorage.TOKEN_STORAGE_KEY, this.storage);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.sandesha2.security.SecurityManager#checkProofOfPossession(org.apache.sandesha2.security.SecurityToken, org.apache.axiom.om.OMElement, org.apache.axis2.context.MessageContext)
+ */
+ public void checkProofOfPossession(SecurityToken token,
+ OMElement messagePart, MessageContext message)
+ throws SandeshaException {
+
+ Vector results = null;
+ if ((results = (Vector) message
+ .getProperty(WSHandlerConstants.RECV_RESULTS)) == null) {
+ String msg = SandeshaMessageHelper
+ .getMessage(SandeshaMessageKeys.noSecurityResults);
+ throw new SandeshaException(msg);
+ } else {
+ boolean verified = false;
+ for (int i = 0; i < results.size() && !verified; i++) {
+ WSHandlerResult rResult = (WSHandlerResult) results.get(i);
+ Vector wsSecEngineResults = rResult.getResults();
+
+ for (int j = 0; j < wsSecEngineResults.size() && !verified; j++) {
+ WSSecurityEngineResult wser = (WSSecurityEngineResult) wsSecEngineResults
+ .get(j);
+ if (wser.getAction() == WSConstants.SIGN
+ && wser.getPrincipal() != null) {
+
+ // first verify the base token
+ Principal principal = wser.getPrincipal();
+ if (principal instanceof WSDerivedKeyTokenPrincipal) {
+ //Get the id of the SCT that was used to create the DKT
+ String baseTokenId = ((WSDerivedKeyTokenPrincipal) principal)
+ .getBasetokenId();
+ //Get the token that matches the id
+ SecurityToken recoveredToken = this
+ .recoverSecurityToken(baseTokenId);
+ if (recoveredToken != null) {
+ Token rahasToken = ((RampartSecurityToken) recoveredToken)
+ .getToken();
+ //check whether the SCT used in the message is
+ //similar to the one given into the method
+ String recoverdTokenId = rahasToken.getId();
+ String attRefId = null;
+ String unattrefId = null;
+ if (rahasToken.getAttachedReference() != null) {
+ attRefId = this.getUriFromSTR(rahasToken
+ .getAttachedReference());
+ }
+ if (rahasToken.getUnattachedReference() != null) {
+ unattrefId = this.getUriFromSTR(rahasToken
+ .getUnattachedReference());
+ }
+
+ String id = ((RampartSecurityToken) token)
+ .getToken().getId();
+ if (recoverdTokenId.equals(id)
+ || attRefId.equals(id)
+ || unattrefId.equals(id)) {
+ //Token matched with a token that signed the message part
+ //Now check signature parts
+ OMAttribute idattr = messagePart
+ .getAttribute(new QName(
+ WSConstants.WSU_NS, "Id"));
+ verified = wser.getSignedElements()
+ .contains(
+ idattr.getAttributeValue());
+ if (verified) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (!verified) {
+ String msg = SandeshaMessageHelper
+ .getMessage(SandeshaMessageKeys.proofOfPossessionNotVerified);
+ throw new SandeshaException(msg);
+ }
+ }
+
+ }
+
+ private String getUriFromSTR(OMElement str) {
+ OMElement refElem = str.getFirstChildWithName(Reference.TOKEN);
+ return refElem.getAttributeValue(new QName("URI")).substring(1);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.sandesha2.security.SecurityManager#createSecurityTokenReference(org.apache.sandesha2.security.SecurityToken, org.apache.axis2.context.MessageContext)
+ */
+ public OMElement createSecurityTokenReference(SecurityToken token,
+ MessageContext message) throws SandeshaException {
+
+ OMFactory fac = message.getEnvelope().getOMFactory();
+
+ RampartSecurityToken rampartToken = (RampartSecurityToken) token;
+ OMElement element = rampartToken.getToken().getAttachedReference();
+ if (element == null) {
+ element = rampartToken.getToken().getUnattachedReference();
+ }
+
+ if (element == null) {
+ //Now use the token id and construct the ref element
+ element = fac.createOMElement(
+ SecurityTokenReference.SECURITY_TOKEN_REFERENCE,
+ WSConstants.WSSE_LN, WSConstants.WSSE_PREFIX);
+ OMElement refElem = fac.createOMElement(Reference.TOKEN, element);
+ refElem.addAttribute("ValueType",
+ "http://schemas.xmlsoap.org/ws/2005/02/sc/sct", null);
+ refElem.addAttribute("URI", rampartToken.getToken().getId(), null);
+ }
+
+ return this.convertOMElement(fac, element);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.sandesha2.security.SecurityManager#getSecurityToken(org.apache.axis2.context.MessageContext)
+ */
+ public SecurityToken getSecurityToken(MessageContext message)
+ throws SandeshaException {
+ String contextIdentifierKey = RampartUtil
+ .getContextIdentifierKey(message);
+ String identifier = (String) RampartUtil.getContextMap(message).get(
+ contextIdentifierKey);
+
+ if (identifier == null && !message.isServerSide()) {
+ try {
+ OMElement rstTmpl = RampartUtil.createRSTTempalteForSCT(
+ ConversationConstants.VERSION_05_02,
+ RahasConstants.VERSION_05_02);
+
+ String action = TrustUtil.getActionValue(
+ RahasConstants.VERSION_05_02,
+ RahasConstants.RST_ACTION_SCT);
+
+ Policy servicePolicy = (Policy) message
+ .getProperty(RampartMessageData.KEY_RAMPART_POLICY);
+ if (servicePolicy == null) {
+ //Missing service policy means no security requirement
+ return null;
+ }
+ List it = (List) servicePolicy.getAlternatives().next();
+ RampartPolicyData rpd = RampartPolicyBuilder.build(it);
+
+ SecureConversationToken secConvTok = null;
+
+ org.apache.ws.secpolicy.model.Token encrtok = rpd
+ .getEncryptionToken();
+ secConvTok = (encrtok != null && encrtok instanceof SecureConversationToken) ? (SecureConversationToken) encrtok
+ : null;
+
+ if (secConvTok == null) {
+ org.apache.ws.secpolicy.model.Token sigtok = rpd
+ .getSignatureToken();
+ secConvTok = (sigtok != null && sigtok instanceof SecureConversationToken) ? (SecureConversationToken) sigtok
+ : null;
+ }
+
+ if (secConvTok != null) {
+
+ Policy issuerPolicy = secConvTok.getBootstrapPolicy();
+ issuerPolicy.addAssertion(rpd.getRampartConfig());
+
+ STSClient client = new STSClient(message
+ .getConfigurationContext());
+ Options op = new Options();
+ op.setProperty(SandeshaClientConstants.UNRELIABLE_MESSAGE,
+ Constants.VALUE_TRUE);
+ client.setOptions(op);
+ client.setAction(action);
+ client.setRstTemplate(rstTmpl);
+ client.setCryptoInfo(RampartUtil.getEncryptionCrypto(rpd
+ .getRampartConfig(), message.getAxisService()
+ .getClassLoader()), RampartUtil.getPasswordCB(
+ message, rpd));
+ String address = message.getTo().getAddress();
+ Token tok = client.requestSecurityToken(servicePolicy,
+ address, issuerPolicy, null);
+
+ tok.setState(Token.ISSUED);
+ this.storage.add(tok);
+
+ contextIdentifierKey = RampartUtil
+ .getContextIdentifierKey(message);
+ RampartUtil.getContextMap(message).put(
+ contextIdentifierKey, tok.getId());
+ identifier = tok.getId();
+
+ } else {
+ String msg = SandeshaMessageHelper
+ .getMessage(SandeshaMessageKeys.noSecConvTokenInPolicy);
+ log.debug(msg);
+ return null;
+ }
+
+ } catch (RampartException e) {
+ throw new SandeshaException(e.getMessage(), e);
+ } catch (TrustException e) {
+ throw new SandeshaException(e.getMessage(), e);
+ } catch (WSSPolicyException e) {
+ throw new SandeshaException(e.getMessage(), e);
+ }
+ }
+
+ return this.recoverSecurityToken(identifier);
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.sandesha2.security.SecurityManager#getSecurityToken(org.apache.axiom.om.OMElement, org.apache.axis2.context.MessageContext)
+ */
+ public SecurityToken getSecurityToken(OMElement theSTR,
+ MessageContext message) throws SandeshaException {
+
+ OMElement refElem = theSTR.getFirstChildWithName(Reference.TOKEN);
+ String id = refElem.getAttributeValue(new QName("URI"));
+ String tokenId = id;
+ if (!id.startsWith("urn:") && id.startsWith("#")) {
+ tokenId = tokenId.substring(1);
+ }
+ return this.recoverSecurityToken(tokenId);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.sandesha2.security.SecurityManager#getTokenRecoveryData(org.apache.sandesha2.security.SecurityToken)
+ */
+ public String getTokenRecoveryData(SecurityToken token)
+ throws SandeshaException {
+ String id = ((RampartSecurityToken) token).getToken().getId();
+ if (!id.startsWith("urn:") && id.startsWith("#")) {
+ id = id.substring(1);
+ }
+ return id;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.sandesha2.security.SecurityManager#initSecurity(org.apache.axis2.description.AxisModule)
+ */
+ public void initSecurity(AxisModule moduleDesc) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.sandesha2.security.SecurityManager#recoverSecurityToken(java.lang.String)
+ */
+ public SecurityToken recoverSecurityToken(String tokenData)
+ throws SandeshaException {
+ try {
+ Token token = this.storage.getToken(tokenData);
+ if (token != null) {
+ return new RampartSecurityToken(token);
+ } else {
+ String msg = SandeshaMessageHelper
+ .getMessage(SandeshaMessageKeys.errorRetrievingSecurityToken);
+ throw new SandeshaException(msg);
+ }
+ } catch (TrustException e) {
+ String msg = SandeshaMessageHelper
+ .getMessage(SandeshaMessageKeys.errorRetrievingSecurityToken);
+ throw new SandeshaException(msg);
+ }
+ }
+
+ private OMElement convertOMElement(OMFactory fac, OMElement elem) {
+ return new StAXOMBuilder(fac, elem.getXMLStreamReader())
+ .getDocumentElement();
+ }
+
+ public void applySecurityToken(SecurityToken token,
+ MessageContext outboundMessage) throws SandeshaException {
+ // TODO If there are any properties that should be put onto the outbound message
+ // to ensure that the correct token is used to secure it, then they should be
+ // added now.
+ }
+}
Added: webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartSecurityToken.java?view=auto&rev=540804
==============================================================================
--- webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartSecurityToken.java (added)
+++ webservices/sandesha/trunk/java/modules/rampart-integration/src/main/java/org/apache/sandesha2/security/rampart/RampartSecurityToken.java Tue May 22 19:19:17 2007
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2004,2005 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.
+ */
+
+package org.apache.sandesha2.security.rampart;
+
+import org.apache.rahas.Token;
+import org.apache.sandesha2.security.SecurityToken;
+
+
+public class RampartSecurityToken implements SecurityToken {
+
+ private Token token = null;
+
+ RampartSecurityToken(Token token) {
+ this.token = token;
+ }
+
+ public Token getToken() {
+ return token;
+ }
+
+ public void setToken(Token token) {
+ this.token = token;
+ }
+
+}
Modified: webservices/sandesha/trunk/java/modules/tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/pom.xml?view=diff&rev=540804&r1=540803&r2=540804
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/tests/pom.xml Tue May 22 19:19:17 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/trunk/java/modules/tests/tests.build.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/tests.build.xml?view=diff&rev=540804&r1=540803&r2=540804
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/tests.build.xml (original)
+++ webservices/sandesha/trunk/java/modules/tests/tests.build.xml Tue May 22 19:19:17 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/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/pom.xml?view=diff&rev=540804&r1=540803&r2=540804
==============================================================================
--- webservices/sandesha/trunk/java/pom.xml (original)
+++ webservices/sandesha/trunk/java/pom.xml Tue May 22 19:19:17 2007
@@ -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