svn commit: r1051436 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder: AsymmetricBindingBuilder.java BindingBuilder.java TransportBindingBuilder.java

[shankar]

Author: shankar
Date: Tue Dec 21 09:51:10 2010
New Revision: 1051436

URL: http://svn.apache.org/viewvc?rev=1051436&view=rev
Log:
Fixing issue RAMPART-307

Deprecating getSignatureBuider and creating a new method getSignatureBuilder

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1051436&r1=1051435&r2=1051436&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 Tue Dec 21 09:51:10 2010
@@ -616,7 +616,7 @@ public class AsymmetricBindingBuilder ex
 if (!(supportingSigToken instanceof X509Token)) {
 return;
 }
-supportingSig = this.getSignatureBuider(rmd, supportingSigToken,
+supportingSig = this.getSignatureBuilder(rmd, supportingSigToken,
 ((X509Token) supportingSigToken).getUserCertAlias());
 Element bstElem = supportingSig.getBinarySecurityTokenElement();
 if (bstElem != null) {
@@ -719,7 +719,7 @@ public class AsymmetricBindingBuilder ex
 }
 
 } else {
-sig = this.getSignatureBuider(rmd, sigToken);
+sig = this.getSignatureBuilder(rmd, sigToken);
 Element bstElem = sig.getBinarySecurityTokenElement();
 if(bstElem != null) {
 bstElem = RampartUtil.insertSiblingAfter(rmd, this

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1051436&r1=1051435&r2=1051436&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 Tue Dec 21 09:51:10 2010
@@ -231,13 +231,27 @@ public abstract class BindingBuilder {
 }
 }
 
-protected WSSecSignature getSignatureBuider(RampartMessageData rmd, Token 
token)
-throws RampartException {
-return getSignatureBuider(rmd, token, null);
+//Deprecated after 1.5 release
+@Deprecated 
+protected WSSecSignature getSignatureBuider(RampartMessageData rmd, 
+Token token) throws 
RampartException {
+   return getSignatureBuilder(rmd, token, null);
 }
-
+
+//Deprecated after 1.5 release
+@Deprecated
 protected WSSecSignature getSignatureBuider(RampartMessageData rmd, Token 
token,
-String userCertAlias) throws RampartException {
+String userCertAlias) throws 
RampartException {
+   return getSignatureBuilder(rmd, token, userCertAlias);
+}
+
+protected WSSecSignature getSignatureBuilder(RampartMessageData rmd, 
+ Token token)throws 
RampartException {
+return getSignatureBuilder(rmd, token, null);
+}
+
+protected WSSecSignature getSignatureBuilder(RampartMessageData rmd, Token 
token,
+ String userCertAlias) throws 
RampartException {
 
 RampartPolicyData rpd = rmd.getPolicyData();
 
@@ -370,7 +384,7 @@ public abstract class BindingBuilder {
 
 //We have to use a cert
 //Prepare X509 signature
-WSSecSignature sig = this.getSignatureBuider(rmd, 
token);
+WSSecSignature sig = this.getSignatureBuilder(rmd, 
token);
 Element bstElem = sig.getBinarySecurityTokenElement();
 if(bstElem != null) {   
 bstElem = RampartUtil.insertSiblingAfter(rmd, 

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/a

svn commit: r1051445 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml

[shankar]

Author: shankar
Date: Tue Dec 21 10:16:31 2010
New Revision: 1051445

URL: http://svn.apache.org/viewvc?rev=1051445&view=rev
Log:
Applying patch from RAMPART-306

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml?rev=1051445&r1=1051444&r2=1051445&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
 Tue Dec 21 10:16:31 2010
@@ -43,14 +43,14 @@

 encryptionCyptoproperties to needed perform 
signature, such as crypto
 provider, keystore and its password
-
+
 <encryptionCypto>
 crypto element ..
 </encryptionCypto>
 
 decryptionCryptoproperties to needed perform 
signature, such as crypto
 provider, keystore and its password
-  
+
 <decryptionCrypto>
 crypto element ..
 </decryptionCrypto>
@@ -67,10 +67,66 @@
 the org.apache.ws.security.components.crypto.Crypto interface to provide the
 crypto information required by WSS4J. The other properties defined are the
 configuration properties used by the implementation class
-(org.apache.ws.security.components.crypto.Merlin). 
+(org.apache.ws.security.components.crypto.Merlin).
 
-
-
-References1. http://ws.apache.org/wss4j";>Apache WSS4J 
-Home
+  
+  
+  
+  
+  Crypto Caching
+  Enabling caching of crypto objects will improve the performance of 
security processing.
+  After
+  enabling crypto caching, the crypto objects will be read from a 
cache instead of
+  constructing them by reading the keystore files.
+  
+  To enable caching of Crypto objects, two attributes should be added 
to the crypto elements
+  of signatureCrypto/encryptionCrypto of RampartConfig.
+  
+  
+  http://www.w3.org/1999/xhtml"; xml:space="preserve">
+  cryptoKey - As the value of this attribute, specify 
the property of a Crypto
+  implementation which points to the location of the keystore. For 
example in
+  Merlin, the
+  property "org.apache.ws.security.crypto.merlin.file" is unique 
and its pointing to
+  the
+  location of the keystore. Absence of this attribute will not 
enable caching.
+  
+  http://www.w3.org/1999/xhtml"; xml:space="preserve">
+  cacheRefreshInterval - This is the cache refresh 
interval specified in
+  milliseconds. Any
+  object that resides in the cache longer than this period will be 
considered as
+  expired.
+  Cache will not be refreshed if this attribute is not present in 
the configuration.
+  If you
+  do not want to refresh the cache, provide only the "cryptoKey" 
attribute.
+  
+  
+  
+  A sample configuration is provided below. It uses the Merlin crypto 
implementation for
+  signing and encryption. Here, the value of the cryptoKey attribute 
is eqaul to
+  "org.apache.ws.security.crypto.merlin.file" and the cache refresh 
interval is 30
+  milliseconds.
+  
+  http://www.w3.org/1999/xhtml"; xml:space="preserve">
+  <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";>;
+<ramp:signatureCrypto>
+<ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin" 
cryptoKey="org.apache.ws.security.crypto.merlin.file" 
cacheRefreshInterval="30">
+<ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+<ramp:property 
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
+<ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">servicePW</ramp:property>
+</ramp:crypto>
+</ramp:signatureCrypto>
+<ramp:encryptionCypto>
+<ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin" 
cryptoKey="org.apache.ws.security.crypto.merlin.file" 
cacheRefreshInterval="30>
+<ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JK

svn commit: r1051448 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas: client/STSClient.java errors.properties

[shankar]

Author: shankar
Date: Tue Dec 21 11:07:07 2010
New Revision: 1051448

URL: http://svn.apache.org/viewvc?rev=1051448&view=rev
Log:
Applying patch from RAMPART-280

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=1051448&r1=1051447&r2=1051448&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
 Tue Dec 21 11:07:07 2010
@@ -17,10 +17,9 @@
 package org.apache.rahas.client;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
+import java.util.*;
+import java.text.DateFormat;
+import java.text.ParseException;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -29,6 +28,7 @@ import javax.xml.namespace.QName;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
 import org.apache.axiom.om.util.Base64;
@@ -66,6 +66,7 @@ import org.apache.ws.security.conversati
 import org.apache.ws.security.message.token.Reference;
 import org.apache.ws.security.processor.EncryptedKeyProcessor;
 import org.apache.ws.security.util.WSSecurityUtil;
+import org.apache.ws.security.util.XmlSchemaDateFormat;
 import org.w3c.dom.Element;
 
 public class STSClient {
@@ -247,7 +248,120 @@ public class STSClient {
 }
 
 }
-
+
+/**
+ * Renews the token referenced by the token id, updates the token store
+ * @param tokenId
+ * @param issuerAddress
+ * @param issuerPolicy
+ * @param store
+ * @return status
+ * @throws TrustException
+ */
+public boolean renewToken(String tokenId,
+  String issuerAddress,
+  Policy issuerPolicy, TokenStorage store) throws 
TrustException {
+
+try {
+QName rstQn = new QName("requestSecurityToken");
+
+ServiceClient client = getServiceClient(rstQn, issuerAddress);
+
+client.getServiceContext().setProperty(RAMPART_POLICY, 
issuerPolicy);
+client.getOptions().setSoapVersionURI(this.soapVersion);
+if (this.addressingNs != null) {
+
client.getOptions().setProperty(AddressingConstants.WS_ADDRESSING_VERSION, 
this.addressingNs);
+}
+client.engageModule("addressing");
+client.engageModule("rampart");
+
+this.processPolicy(issuerPolicy, null);
+
+String tokenType = RahasConstants.TOK_TYPE_SAML_10;
+
+OMElement response = client.sendReceive(rstQn,
+createRenewRequest(tokenType, tokenId));
+store.update(processRenewResponse(version, response, store, 
tokenId));
+
+return true;
+
+} catch (AxisFault e) {
+log.error("errorInRenewingToken", e);
+throw new TrustException("errorInRenewingToken", new 
String[]{issuerAddress}, e);
+}
+
+}
+
+/**
+ * Processes the response and update the token store
+ * @param version
+ * @param elem
+ * @param store
+ * @param id
+ * @return
+ * @throws TrustException
+ */
+private Token processRenewResponse(int version, OMElement elem, 
TokenStorage store, String id) throws TrustException {
+OMElement rstr = elem;
+if (version == RahasConstants.VERSION_05_12) {
+//The WS-SX result will be an RSTRC
+rstr = elem.getFirstElement();
+}
+//get the corresponding WS-Trust NS
+String ns = TrustUtil.getWSTNamespace(version);
+
+//Get the RequestedAttachedReference
+OMElement reqSecToken = rstr.getFirstChildWithName(new QName(
+ns, 
RahasConstants.IssuanceBindingLocalNames.REQUESTED_SECURITY_TOKEN));
+
+if (reqSecToken == null) {
+throw new TrustException("reqestedSecTokMissing");
+}
+
+//Extract the life-time element
+OMElement lifeTimeEle = rstr.getFirstChildWithName(new QName(
+ns, RahasConstants.IssuanceBindingLocalNames.LIFETIME));
+
+if (lifeT

svn commit: r1051455 - in /axis/axis2/java/rampart/trunk/modules/rampart-samples: ./ policy/ policy/sample08/ policy/sample08/src/ policy/sample08/src/org/ policy/sample08/src/org/apache/ policy/sampl

[shankar]

Author: shankar
Date: Tue Dec 21 11:14:14 2010
New Revision: 1051455

URL: http://svn.apache.org/viewvc?rev=1051455&view=rev
Log:
Applying patch from RAMPART-258

Added:
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/README.txt
   (with props)

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/policy.xml
   (with props)

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/services.xml
   (with props)
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/apache/

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/apache/rampart/

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/Client.java
   (with props)

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/PWCBHandler.java
   (with props)

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/SimpleService.java
   (with props)

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/sts_policy.xml
   (with props)
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt?rev=1051455&r1=1051454&r2=1051455&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/README.txt Tue Dec 21 
11:14:14 2010
@@ -15,3 +15,7 @@ Please use Apache Ant with the build.xml
 and mars to required places.
 
 - Please copy log4j.jar to AXIS2_HOME/lib directory before trying out 
samples.
+
+- Please follow the instructions on endorsing the default JAXP 
implementation
+  available in README.txt of this distribution before invoking 
+  Sample 08.(Issuing a SAML 2.0 Token)

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml?rev=1051455&r1=1051454&r2=1051455&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml 
(original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/build.xml Tue 
Dec 21 11:14:14 2010
@@ -109,6 +109,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+




Added: 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/README.txt?rev=1051455&view=auto
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/README.txt
 (added)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/README.txt
 Tue Dec 21 11:14:14 2010
@@ -0,0 +1,8 @@
+WS-Trust - RST - Resquest Security Token Service - Issuing a SAML 2.0 token - 
issuing a token
+
+When using this sample with the TCPMon to monitor the soap messages, you have 
to use the 
+correct URL in the client code before build the sample 08.
+
+You have to endorse the default JAXP implementation of your JDK before 
invoking this sample.
+Please follow the instructions available in the README.txt of this 
distribution to endorse 
+the default JAXP implementation.

Propchange: 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/README.txt
--
svn:eol-style = native

Added: 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/policy.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/policy.xml?rev=1051455&view=auto
===

svn commit: r1051474 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: errors.properties util/RampartUtil.java

[shankar]

Author: shankar
Date: Tue Dec 21 12:44:56 2010
New Revision: 1051474

URL: http://svn.apache.org/viewvc?rev=1051474&view=rev
Log:
Fixing RAMPART-310

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties?rev=1051474&r1=1051473&r2=1051474&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
 Tue Dec 21 12:44:56 2010
@@ -97,4 +97,5 @@ unexprectedSignature = Unexpected signat
 invalidTransport = Expected transport is "https" but incoming transport found 
: \"{0}\" 
 requiredElementsMissing = Required Elements not found in the incoming message 
: {0}
 repeatingNonceValue = Nonce value : {0}, already seen before for user name : 
{1}. Possibly this could be a replay attack.
-invalidNonceLifeTime = Invalid value for nonceLifeTime in rampart 
configuration file.
\ No newline at end of file
+invalidNonceLifeTime = Invalid value for nonceLifeTime in rampart 
configuration file.
+invalidIssuerAddress = Invalid value for Issuer
\ No newline at end of file

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1051474&r1=1051473&r2=1051474&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 Tue Dec 21 12:44:56 2010
@@ -438,18 +438,18 @@ public class RampartUtil {
  */
 public static String processIssuerAddress(OMElement issuerAddress) 
 throws RampartException {
-if(issuerAddress != null && issuerAddress.getText() != null && 
-!"".equals(issuerAddress.getText())) {
-return issuerAddress.getText().trim();
-} else {
-if(issuerAddress != null) {
-throw new RampartException("invalidIssuerAddress",
-new String[] { issuerAddress.toString() });
-} else {
-throw new RampartException("invalidIssuerAddress",
-new String[] { "Issuer address null" });
-}
+
+   if(issuerAddress == null){
+   throw new RampartException("invalidIssuerAddress", 
+  new String[] { "Issuer address null" 
});
+   }
+   
+   if(issuerAddress.getText() == null || 
!"".equals(issuerAddress.getText())) {
+   throw new RampartException("invalidIssuerAddress", 
+  new String[] { 
issuerAddress.toString() });
 }
+
+   return issuerAddress.getText().trim();
 }
 
 /**

svn commit: r1051483 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/policy/ rampart-core/src/main/java/org/apache/rampart/util/ rampart-policy/src/main/java

[shankar]

Author: shankar
Date: Tue Dec 21 13:06:19 2010
New Revision: 1051483

URL: http://svn.apache.org/viewvc?rev=1051483&view=rev
Log:
Applying patch from RAMPART-119

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=1051483&r1=1051482&r2=1051483&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
 Tue Dec 21 13:06:19 2010
@@ -233,6 +233,7 @@ public class RampartPolicyBuilder {
 if (sep.isSignedParts()) {
 rpd.setSignBody(sep.isBody());
 rpd.setSignAttachments(sep.isAttachments());
+rpd.setSignAllHeaders(sep.isSignAllHeaders());
rpd.setSignBodyOptional(sep.isOptional());
rpd.setSignAttachmentsOptional(sep.isOptional());
 while (it.hasNext()) {

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java?rev=1051483&r1=1051482&r2=1051483&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java
 Tue Dec 21 13:06:19 2010
@@ -107,6 +107,8 @@ public class RampartPolicyData {
 
 private boolean encryptAttachmentsOptional;
 
+private boolean signAllHeaders;
+
 private Vector signedParts = new Vector();
 
 private Vector signedElements = new Vector();
@@ -926,6 +928,14 @@ public class RampartPolicyData {
 public MTOMAssertion getMTOMAssertion(){
return mtomAssertion;
 }
+
+public boolean isSignAllHeaders() {
+return signAllHeaders;
+}
+
+public void setSignAllHeaders(boolean signAllHeaders) {
+this.signAllHeaders = signAllHeaders;
+}
 
 public boolean isMTOMSerialize(){
if(mtomAssertion == null){

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1051483&r1=1051482&r2=1051483&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 Tue Dec 21 13:06:19 2010
@@ -881,6 +881,19 @@ public class RampartUtil {
public static Vector getSignedParts(RampartMessageData rmd) {
RampartPolicyData rpd = rmd.getPolicyData();
SOAPEnvelope envelope = rmd.getMsgContext().getEnvelope();
+
+//"signAllHeaders" indicates that all the headers should be signed.
+if (rpd.isSignAllHeaders()) {
+Iterator childHeaders = envelope.getHeader().getChildElements();
+while (childHeaders.hasNext()) {
+   OMElement hb = (OMElement) childHeaders.next();
+if (!(hb.getLocalName().equals(WSConstants.WSSE_LN)
+&& 
hb.getNamespace().getNamespaceURI().equals(WSConstants.WSSE_NS))) {
+
rpd.addSignedPart(hb.getNamespace().getNamespaceURI(),hb.getLocalName());
+}
+   }
+}
+
   

svn commit: r1051498 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java

[shankar]

Author: shankar
Date: Tue Dec 21 14:03:03 2010
New Revision: 1051498

URL: http://svn.apache.org/viewvc?rev=1051498&view=rev
Log:
Fixing issue RAMPART-290

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1051498&r1=1051497&r2=1051498&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
 Tue Dec 21 14:03:03 2010
@@ -327,46 +327,41 @@ public class RampartEngine {
 

private boolean isSecurityFault(RampartMessageData rmd) {
-   
-   SOAPEnvelope soapEnvelope = rmd.getMsgContext().getEnvelope();
-   
-   SOAPFault soapFault = soapEnvelope.getBody().getFault();
-
-// This is not a soap fault
-if (soapFault == null) {
-return false;
-}
-
-String soapVersionURI =  
rmd.getMsgContext().getEnvelope().getNamespace().getNamespaceURI();
-   
-   if 
(soapVersionURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI) ) {
-   
-   SOAPFaultCode faultCode = soapFault.getCode();
-   
-   // This is a fault processing the security header 
-if 
(faultCode.getTextAsQName().getNamespaceURI().equals(WSConstants.WSSE_NS)) {
-   return true;
-}
-   
-   
-   } else if 
(soapVersionURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
-   
-   //TODO AXIOM API returns only one fault sub code, there can be 
many
-   SOAPFaultSubCode faultSubCode = 
soapFault.getCode().getSubCode();
-   
-   if (faultSubCode != null) {
-   SOAPFaultValue faultSubCodeValue = 
faultSubCode.getValue();
-   
-   // This is a fault processing the security header 
-   if (faultSubCodeValue != null &&
-   
faultSubCodeValue.getTextAsQName().getNamespaceURI().equals(WSConstants.WSSE_NS))
 {
-  return true;
-   }
-   }
-   
-   }
-   
-   return false;
-   }
 
+   SOAPEnvelope soapEnvelope = rmd.getMsgContext().getEnvelope();
+   SOAPFault soapFault = soapEnvelope.getBody().getFault();
+
+   // This is not a soap fault
+   if (soapFault == null) {
+   return false;
+   }
+
+   String soapVersionURI = 
rmd.getMsgContext().getEnvelope().getNamespace().getNamespaceURI();
+   SOAPFaultCode faultCode = soapFault.getCode();
+   if(faultCode == null){
+   //If no fault code is given, then it can't be security 
fault
+   return false;
+   }
+   
+   if 
(soapVersionURI.equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+   // This is a fault processing the security header
+   if 
(faultCode.getTextAsQName().getNamespaceURI().equals(WSConstants.WSSE_NS)) {
+   return true;
+   }
+   } else if 
(soapVersionURI.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
+   // TODO AXIOM API returns only one fault sub code, 
there can be many
+   SOAPFaultSubCode faultSubCode = faultCode.getSubCode();
+   if (faultSubCode != null) {
+   SOAPFaultValue faultSubCodeValue = 
faultSubCode.getValue();
+
+   // This is a fault processing the security 
header
+   if (faultSubCodeValue != null && 
faultSubCodeValue.getTextAsQName().
+   
getNamespaceURI().equals(WSConstants.WSSE_NS)) {
+   return true;
+   }
+   }
+   }
+
+   return false;
+   }
 }

svn commit: r1051508 - /axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java

[shankar]

Author: shankar
Date: Tue Dec 21 14:32:04 2010
New Revision: 1051508

URL: http://svn.apache.org/viewvc?rev=1051508&view=rev
Log:
Fixing RAMPART-276

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java?rev=1051508&r1=1051507&r2=1051508&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
 Tue Dec 21 14:32:04 2010
@@ -122,9 +122,9 @@ public class SignedEncryptedElements ext
 Iterator namespaces = 
declaredNamespaces.keySet().iterator();
 
 while(namespaces.hasNext()) {
-prefix = (String) namespaces.next();
-namespaceURI = (String) declaredNamespaces.get(prefix);
-writer.writeNamespace(prefix,namespaceURI);
+   final String declaredPrefix = namespaces.next();
+   final String declaredNamespaceURI = (String) 
declaredNamespaces.get(declaredPrefix);
+writer.writeNamespace(declaredPrefix,declaredNamespaceURI); 
 }
 
 writer.writeCharacters(xpathExpression);

svn commit: r1051766 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/rampart-config.xsd

[shankar]

Author: shankar
Date: Wed Dec 22 06:12:40 2010
New Revision: 1051766

URL: http://svn.apache.org/viewvc?rev=1051766&view=rev
Log:
Fixing issue RAMPART-224

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/rampart-config.xsd

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/rampart-config.xsd
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/rampart-config.xsd?rev=1051766&r1=1051765&r2=1051766&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/rampart-config.xsd
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/rampart-config.xsd
 Wed Dec 22 06:12:40 2010
@@ -20,18 +20,29 @@


   
-   
+   




-   
-   
http://ws.apache.org/wss4j/apidocs/org/apache/ws/security/components/crypto/Crypto.html
-   
-   
-   
-   
-   
+  
+  
+  
+   
+
+   
+   
+   
+ 
+   
+   
+   
+
+   
+   
+
+  
+  

svn commit: r1051768 - /axis/axis2/java/rampart/trunk/pom.xml

[shankar]

Author: shankar
Date: Wed Dec 22 06:26:27 2010
New Revision: 1051768

URL: http://svn.apache.org/viewvc?rev=1051768&view=rev
Log:
Applying patch from RAMPART-314

Modified:
axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1051768&r1=1051767&r2=1051768&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Wed Dec 22 06:26:27 2010
@@ -223,8 +223,8 @@
 ${xmlsec.version}
 
 
-org.opensaml
-opensaml1
+opensaml
+opensaml
 1.1
 

svn commit: r1051769 - in /axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources: css/ images/

[shankar]

Author: shankar
Date: Wed Dec 22 06:38:05 2010
New Revision: 1051769

URL: http://svn.apache.org/viewvc?rev=1051769&view=rev
Log:
Applying patch from RAMPART-313

Added:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/axis.jpg
   (with props)

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/axis.png
   (with props)

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/breadcrumbs-bg.gif
   (with props)

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/h2-bg.gif
   (with props)

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/home-top.gif
   (with props)

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/leftcolumn-bg.gif
   (with props)

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/menu-back.gif
   (with props)
Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/apache-rampart-banner.jpg

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css?rev=1051769&r1=1051768&r2=1051769&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css
 Wed Dec 22 06:38:05 2010
@@ -1,297 +1,288 @@
-/* page general styles */
-body{
-padding:0px;
-margin:0px;
-width:1000px;
-}
-a{
-color:#557f95;
-text-decoration:none;
-}
-a:hover{
-color:#00;
-text-decoration:underline;
-}
-body, td, tr, input,h1,h2,h3,h4,h5,h6,a{
-font: 12px Verdana, Arial, Helvetica, sans-serif;
-line-height:18px;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+.img-title {
+text-align: center
 }
-pre{
-overflow-x:auto;   
+
+.img {
+text-align: center
 }
-h1 {
-color:#575757;
-   font-size:24px;
-   font-weight:bold;
-   line-height:normal;
-   margin:5px 0px;
-   padding:2px;
+
+.special-td {
+font-family: Arial;
+font-size: 10pt;
+font-weight: bold
 }
+
+.special {
+font-family: Arial;
+font-weight: bold;
+border-style: solid;
+border-width: 1;
+padding-left: 4;
+padding-right: 4;
+padding-top: 1;
+padding-bottom: 1;
+background-color: #C0C0C0;
+font-size: 10pt
 }
-h2{
-padding:0px;
-margin:0px;
-font-size:14px;
-font-weight:bold;
-height:22px;
-background-color:#bcbcbc;
-text-indent:10px;
-color:#00;
+
+.xml {
+font-family: Arial;
+font-size: 10pt;
+color: #FF;
+font-style: italic
+}
+
+/*
+.code {
+font-family: Courier New;
+font-size: 10pt;
+color: #80
 }
-h3{
-padding:0px;
-margin:0px;
-font-weight:bold;
-}
-h4{
-font-weight:bold;
-color:#77;
-}
-p{
-padding-top:5px;
-padding-bottom:5px;
-line-height:18px;
-}
-/* page styles */
-.page-padding{
-padding-left:10px;
-padding-right:10px;
-}
-.composite{
-/* Uncomment these lines to give a fixed width with centered positioning */
-position:absolute;
-left:50%;
-width:980px;
-margin-left:-490px;
-border:solid 1px #83b0c0;
-margin-top:5px;
+*/
+
+/*
+---
+Generic element styles
+--- */
+body {
+color: #111;
+font-family: "Trebuchet MS", Verdana, sans-serif;
+font-size: 1em;
+padding: 5;
+padding-bottom:0px;
+border-width: 0;
+outline-width: 0;
+list-style-position: outside;
+display: block;
+
+margin: 0 auto; /* center, not i

svn commit: r1051777 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart: builder/AsymmetricBindingBuilder.java builder/BindingBuilder.java util/RampartUtil.java

[shankar]

Author: shankar
Date: Wed Dec 22 07:07:05 2010
New Revision: 1051777

URL: http://svn.apache.org/viewvc?rev=1051777&view=rev
Log:
Applying patch from RAMPART-277

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1051777&r1=1051776&r2=1051777&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 Wed Dec 22 07:07:05 2010
@@ -175,7 +175,7 @@ public class AsymmetricBindingBuilder ex
 encr.setDocument(doc);
 RampartUtil.setEncryptionUser(rmd, encr);
 
encr.setSymmetricEncAlgorithm(rpd.getAlgorithmSuite().getEncryption());
-RampartUtil.setKeyIdentifierType(rpd,encr, 
encryptionToken);
+RampartUtil.setKeyIdentifierType(rmd, encr, 
encryptionToken);
 
encr.setKeyEncAlgo(rpd.getAlgorithmSuite().getAsymmetricKeyWrap());
 encr.prepare(doc, RampartUtil.getEncryptionCrypto(config, 
rmd.getCustomClassLoader()));
 
@@ -528,7 +528,7 @@ public class AsymmetricBindingBuilder ex
 
 WSSecEncrypt encr = new WSSecEncrypt();
 
-RampartUtil.setKeyIdentifierType(rpd, encr, encrToken);
+RampartUtil.setKeyIdentifierType(rmd, encr, encrToken);
 
 encr.setWsConfig(rmd.getConfig());
 
@@ -765,7 +765,7 @@ public class AsymmetricBindingBuilder ex
 
 WSSecEncrypt encr = new WSSecEncrypt();
 
-RampartUtil.setKeyIdentifierType(rpd, encr, encrToken);
+RampartUtil.setKeyIdentifierType(rmd, encr, encrToken);
 
 encr.setWsConfig(rmd.getConfig());
 

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1051777&r1=1051776&r2=1051777&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 Wed Dec 22 07:07:05 2010
@@ -218,7 +218,7 @@ public abstract class BindingBuilder {
 WSSecEncryptedKey encrKey = new WSSecEncryptedKey();
 
 try {
-RampartUtil.setKeyIdentifierType(rpd, encrKey, token);
+RampartUtil.setKeyIdentifierType(rmd, encrKey, token);
 RampartUtil.setEncryptionUser(rmd, encrKey);
 
encrKey.setKeySize(rpd.getAlgorithmSuite().getMaximumSymmetricKeyLength());
 
encrKey.setKeyEncAlgo(rpd.getAlgorithmSuite().getAsymmetricKeyWrap());
@@ -261,7 +261,7 @@ public abstract class BindingBuilder {
 
 log.debug("Token inclusion: " + token.getInclusion());
 
-RampartUtil.setKeyIdentifierType(rpd, sig, token);
+RampartUtil.setKeyIdentifierType(rmd, sig, token);
 
 String user = null;
 
@@ -345,7 +345,6 @@ public abstract class BindingBuilder {
 //Create the list to hold the tokens
 HashMap endSuppTokMap = new HashMap();
 
-
 if(suppTokens != null && suppTokens.getTokens() != null &&
 suppTokens.getTokens().size() > 0) {
 log.debug("Processing supporting tokens");
@@ -412,10 +411,8 @@ public abstract class BindingBuilder {
 //Add the UT
 Element elem = utBuilder.getUsernameTokenElement();
 elem = RampartUtil.insertSiblingAfter(rmd, 
this.getInsertionLocation(), elem);
-
-if (suppTokens.isEncryptedToken()) {
-encryptedTokensIdList.add(utBuilder.getId());
-}
+
+encryptedTokensIdList.add(utBuilder.get

svn commit: r1051784 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl: SAML2TokenIssuer.java SAMLTokenIssuer.java SAMLTokenIssuerConfig.java

[shankar]

Author: shankar
Date: Wed Dec 22 08:15:09 2010
New Revision: 1051784

URL: http://svn.apache.org/viewvc?rev=1051784&view=rev
Log:
Applying patch from RAMPART-254

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java?rev=1051784&r1=1051783&r2=1051784&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
 Wed Dec 22 08:15:09 2010
@@ -660,9 +660,9 @@ public class SAML2TokenIssuer implements
 Attribute[] attributes = null;
 
 //Call the attribute callback handlers to get any attributes if exists
-if (config.getCallbackHander() != null) {
+if (config.getCallbackHandler() != null) {
 SAMLAttributeCallback cb = new SAMLAttributeCallback(data);
-SAMLCallbackHandler handler = config.getCallbackHander();
+SAMLCallbackHandler handler = config.getCallbackHandler();
 handler.handle(cb);
 attributes = cb.getSAML2Attributes();
 }

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=1051784&r1=1051783&r2=1051784&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
 Wed Dec 22 08:15:09 2010
@@ -254,10 +254,10 @@ public class SAMLTokenIssuer implements 
 // In the case where the principal is a UT
 if (principal instanceof WSUsernameTokenPrincipal) {
SAMLNameIdentifier nameId = null;
-   if(config.getCallbackHander() != null){
+   if(config.getCallbackHandler() != null){
SAMLNameIdentifierCallback cb = new 
SAMLNameIdentifierCallback(data);
cb.setUserId(principal.getName());
-   SAMLCallbackHandler callbackHandler = 
config.getCallbackHander();
+   SAMLCallbackHandler callbackHandler = 
config.getCallbackHandler();
callbackHandler.handle(cb);
nameId = cb.getNameId();
}else{
@@ -432,9 +432,9 @@ public class SAMLTokenIssuer implements 
 

 SAMLAttribute[] attrs = null;
-if(config.getCallbackHander() != null){
+if(config.getCallbackHandler() != null){
SAMLAttributeCallback cb = new SAMLAttributeCallback(data);
-   SAMLCallbackHandler handler = config.getCallbackHander();
+   SAMLCallbackHandler handler = config.getCallbackHandler();
handler.handle(cb);
attrs = cb.getAttributes();
 } else if (config.getCallbackHandlerName() != null

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java?rev=1051784&r1=1051783&r2=1051784&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
 Wed Dec 22 08:15:09 2010
@@ -98,7 +98,7 @@ public class SAMLTokenIssuerConfig exten
 protected String issuerName;
 protected Map trustedServices = new HashMap();
 protected String trustStorePropFile;
-protected SAMLCallbackHandler callbackHander;
+protected SAMLCallbackHandler callbackHandler;
 protected String callbackHandlerName;
   
 /**
@@ -258,7 +258,7 @@ public class SAMLTokenIssuerConfig e

svn commit: r1051796 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

[shankar]

Author: shankar
Date: Wed Dec 22 08:56:40 2010
New Revision: 1051796

URL: http://svn.apache.org/viewvc?rev=1051796&view=rev
Log:
Fixing a logic error. 

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1051796&r1=1051795&r2=1051796&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 Wed Dec 22 08:56:40 2010
@@ -444,7 +444,7 @@ public class RampartUtil {
   new String[] { "Issuer address null" 
});
}

-   if(issuerAddress.getText() == null || 
!"".equals(issuerAddress.getText())) {
+   if(issuerAddress.getText() == null || 
"".equals(issuerAddress.getText())) {
throw new RampartException("invalidIssuerAddress", 
   new String[] { 
issuerAddress.toString() });
 }

svn commit: r1051797 - in /axis/axis2/java/rampart/trunk/modules/rampart-samples/keys: client.jks service.jks sts.jks

[shankar]

Author: shankar
Date: Wed Dec 22 09:09:11 2010
New Revision: 1051797

URL: http://svn.apache.org/viewvc?rev=1051797&view=rev
Log:
Fixing issue RAMPART-273

Modified:
axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/client.jks
axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/service.jks
axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/sts.jks

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/client.jks
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/client.jks?rev=1051797&r1=1051796&r2=1051797&view=diff
==
Binary files - no diff available.

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/service.jks
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/service.jks?rev=1051797&r1=1051796&r2=1051797&view=diff
==
Binary files - no diff available.

Modified: axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/sts.jks
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/keys/sts.jks?rev=1051797&r1=1051796&r2=1051797&view=diff
==
Binary files - no diff available.

svn commit: r1051799 - in /axis/axis2/java/core/trunk/src/site/resources: css/site.css images/home-top.gif images/menu-back.gif

[shankar]

Author: shankar
Date: Wed Dec 22 09:16:19 2010
New Revision: 1051799

URL: http://svn.apache.org/viewvc?rev=1051799&view=rev
Log:
Applying patch from AXIS2-4912

Added:
axis/axis2/java/core/trunk/src/site/resources/images/home-top.gif   (with 
props)
axis/axis2/java/core/trunk/src/site/resources/images/menu-back.gif   (with 
props)
Modified:
axis/axis2/java/core/trunk/src/site/resources/css/site.css

Modified: axis/axis2/java/core/trunk/src/site/resources/css/site.css
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/resources/css/site.css?rev=1051799&r1=1051798&r2=1051799&view=diff
==
--- axis/axis2/java/core/trunk/src/site/resources/css/site.css (original)
+++ axis/axis2/java/core/trunk/src/site/resources/css/site.css Wed Dec 22 
09:16:19 2010
@@ -78,17 +78,28 @@ body {
 
 min-height: 100%; /* real browsers */
 width: 980px;
+background-image: url(../images/home-top.gif);
+background-position: left top;
+background-repeat: repeat-x;
 }
 
 #breadcrumbs {
+background-image: url(../images/menu-back.gif);
+background-position: left top;
+background-repeat: repeat-x;
+border-bottom: solid 1px #d4d4d4;
+height: 28px;
 font-size: 0.8em;
 background-color: transparent;
-border-top: 2px solid #6895c2;
-border-bottom: 2px solid #6895c2;
+border: 1px solid #6895c2;
 }
 
+#banner{
+margin-top:10px;
+}
 .xleft, #bannerLeft img {
 text-shadow: none;
+margin-top:10px;
 }
 
 .xright, #bannerRight {
@@ -220,31 +231,6 @@ table {
 background-position: left top;
 }
 
-dl {
-background-color: transparent;
-border: none;
-padding: 0;
-}
-
-dt {
-color: #33;
-font-weight: bolder;
-margin-top: 1.5em;
-margin-bottom: 1em;
-}
-
-dd {
-border-left: 1px dotted black;
-margin-left: 1em;
-padding-left: 1em;
-}
-
-hr {
-border: none;
-height: 1px;
-background-color: black;
-}
-
 pre, div.source {
 border: 1px dotted;
 background-color: #e2ecf6;
@@ -261,3 +247,12 @@ div.source pre {
 background-color: transparent;
 padding: none;
 }
+#footer{
+background-color:#E9E9E9;
+color:#828282;
+left:0;
+padding-top:10px;
+text-indent:10px;
+width:100%;
+height:100px;
+}

Added: axis/axis2/java/core/trunk/src/site/resources/images/home-top.gif
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/resources/images/home-top.gif?rev=1051799&view=auto
==
Binary file - no diff available.

Propchange: axis/axis2/java/core/trunk/src/site/resources/images/home-top.gif
--
svn:mime-type = image/gif

Added: axis/axis2/java/core/trunk/src/site/resources/images/menu-back.gif
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/resources/images/menu-back.gif?rev=1051799&view=auto
==
Binary file - no diff available.

Propchange: axis/axis2/java/core/trunk/src/site/resources/images/menu-back.gif
--
svn:mime-type = image/gif

svn commit: r1051834 - /axis/axis2/java/core/trunk/src/site/resources/css/site.css

[shankar]

Author: shankar
Date: Wed Dec 22 11:03:59 2010
New Revision: 1051834

URL: http://svn.apache.org/viewvc?rev=1051834&view=rev
Log:
including dl, dt, dd and hr as per the comment in AXIS2-4912

Modified:
axis/axis2/java/core/trunk/src/site/resources/css/site.css

Modified: axis/axis2/java/core/trunk/src/site/resources/css/site.css
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/resources/css/site.css?rev=1051834&r1=1051833&r2=1051834&view=diff
==
--- axis/axis2/java/core/trunk/src/site/resources/css/site.css (original)
+++ axis/axis2/java/core/trunk/src/site/resources/css/site.css Wed Dec 22 
11:03:59 2010
@@ -231,6 +231,31 @@ table {
 background-position: left top;
 }
 
+dl {
+background-color: transparent;
+border: none;
+padding: 0;
+}
+
+dt {
+color: #33;
+font-weight: bolder;
+margin-top: 1.5em;
+margin-bottom: 1em;
+}
+
+dd {
+border-left: 1px dotted black;
+margin-left: 1em;
+padding-left: 1em;
+}
+
+hr {
+border: none;
+height: 1px;
+background-color: black;
+}
+
 pre, div.source {
 border: 1px dotted;
 background-color: #e2ecf6;

svn commit: r1051839 - /axis/axis2/java/rampart/trunk/pom.xml

[shankar]

Author: shankar
Date: Wed Dec 22 11:10:43 2010
New Revision: 1051839

URL: http://svn.apache.org/viewvc?rev=1051839&view=rev
Log:
Fixing build error in trunk. 

Applying patch from RAMPART-314

Modified:
axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1051839&r1=1051838&r2=1051839&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Wed Dec 22 11:10:43 2010
@@ -93,6 +93,20 @@
 
 
 
+   
+   
+wso2-maven2-repository
+WSO2 Maven2 Repository
+http://dist.wso2.org/maven2
+
+false
+
+
+true
+never
+fail
+
+
 
 
 
@@ -225,7 +239,7 @@
 
 opensaml
 opensaml
-1.1
+1.1.406
 

org.opensaml

svn commit: r1051853 - in /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy: builders/RampartConfigBuilder.java model/OptimizePartsConfig.java

[shankar]

Author: shankar
Date: Wed Dec 22 11:38:46 2010
New Revision: 1051853

URL: http://svn.apache.org/viewvc?rev=1051853&view=rev
Log:
Applying patch from RAMPART-181

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java?rev=1051853&r1=1051852&r2=1051853&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
 Wed Dec 22 11:38:46 2010
@@ -103,6 +103,13 @@ public class RampartConfigBuilder implem
 }
 
 childElement = element.getFirstChildWithName(new QName(
+RampartConfig.NS, RampartConfig.DEC_CRYPTO_LN));
+if (childElement != null) {
+rampartConfig.setDecCryptoConfig((CryptoConfig) factory
+.build(childElement.getFirstElement()));
+}
+
+childElement = element.getFirstChildWithName(new QName(
 RampartConfig.NS, RampartConfig.STS_CRYPTO_LN));
 if (childElement != null) {
 rampartConfig.setStsCryptoConfig((CryptoConfig) factory
@@ -133,6 +140,12 @@ public class RampartConfigBuilder implem
 rampartConfig.setNonceLifeTime(childElement.getText().trim());
 }
 
+childElement = element.getFirstChildWithName(new QName(
+RampartConfig.NS, RampartConfig.TOKEN_STORE_CLASS_LN));
+if (childElement != null) {
+rampartConfig.setTokenStoreClass(childElement.getText().trim());
+}
+
childElement = element.getFirstChildWithName(new QName(
 RampartConfig.NS, RampartConfig.OPTIMISE_PARTS));
 if (childElement != null) {

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java?rev=1051853&r1=1051852&r2=1051853&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java
 Wed Dec 22 11:38:46 2010
@@ -100,6 +100,7 @@ public class OptimizePartsConfig impleme
  while(ite.hasNext()){
  String strPrefix = (String)ite.next();
  String strURI = (String) namespaces.get(strPrefix);
+ writer.writeStartElement(RampartConfig.NS, 
NAMESPACE_LN);
  writer.writeAttribute(URI_ATTR , strURI);
  writer.writeAttribute(PREFIX_ATTR, strPrefix);
  writer.writeEndElement();

svn commit: r1051861 - in /axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06: policy.xml services.xml

[shankar]

Author: shankar
Date: Wed Dec 22 11:50:45 2010
New Revision: 1051861

URL: http://svn.apache.org/viewvc?rev=1051861&view=rev
Log:
Applying patch from RAMPART-315

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml?rev=1051861&r1=1051860&r2=1051861&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/policy.xml
 Wed Dec 22 11:50:45 2010
@@ -58,9 +58,6 @@




-   
-   http://www.w3.org/2005/08/addressing"/>
-   

 


Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml?rev=1051861&r1=1051860&r2=1051861&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/services.xml
 Wed Dec 22 11:50:45 2010
@@ -198,9 +198,6 @@




-   
-   http://www.w3.org/2005/08/addressing"/>
-   

 

svn commit: r1051893 - in /axis/axis2/java/rampart/trunk: modules/distribution/bin.xml pom.xml

[shankar]

Author: shankar
Date: Wed Dec 22 13:39:35 2010
New Revision: 1051893

URL: http://svn.apache.org/viewvc?rev=1051893&view=rev
Log:
Applying patch from RAMPART-316

Modified:
axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1051893&r1=1051892&r2=1051893&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Wed Dec 22 
13:39:35 2010
@@ -22,14 +22,15 @@
 org.apache.rampart:rampart-core:jar
 org.apache.rampart:rampart-policy:jar
 org.apache.rampart:rampart-trust:jar
-   org.opensaml:opensaml:jar
-   org.opensaml:xmltooling:jar
-   joda-time:joda-time:jar
-   org.slf4j:slf4j-api:jar
-   org.slf4j:slf4j-jdk14:jar
-   velocity:velocity:jar
-   commons-collections:commons-collections:jar
-   org.opensaml:openws:jar
+org.opensaml:opensaml:jar
+org.opensaml:xmltooling:jar
+joda-time:joda-time:jar
+org.slf4j:slf4j-api:jar
+org.slf4j:slf4j-jdk14:jar
+velocity:velocity:jar
+commons-collections:commons-collections:jar
+org.opensaml:openws:jar
+commons-lang:commons-lang:jar
 
 
 

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1051893&r1=1051892&r2=1051893&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Wed Dec 22 13:39:35 2010
@@ -241,16 +241,21 @@
 opensaml
 1.1.406
 
-   
-   org.opensaml
-   opensaml
-   2.2.3
-   
-   
-   org.slf4j
-   slf4j-jdk14
-   1.5.2
-   
+
+org.opensaml
+opensaml
+2.2.3
+
+
+org.slf4j
+slf4j-jdk14
+1.5.2
+
+
+commons-lang
+commons-lang
+2.3
+
 
 
 log4j

svn commit: r1051908 - /axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt

[shankar]

Author: shankar
Date: Wed Dec 22 14:16:49 2010
New Revision: 1051908

URL: http://svn.apache.org/viewvc?rev=1051908&view=rev
Log:
Including fixed jiras in change log

Modified:
axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt

Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt?rev=1051908&r1=1051907&r2=1051908&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt (original)
+++ axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt Wed Dec 
22 14:16:49 2010
@@ -1,6 +1,71 @@
 This file contains a listing of all Jira issues that have been closed
 for a given release.
 
+Release 1.5.1
+=
+ 
+** Bug
+* [RAMPART-316] - commons-lang jar is not available with Axis2 which 
breaks Sample-08
+* [RAMPART-315] - Sample-06 is not working in the current trunk
+* [RAMPART-181] - OptimizePartsConfig does not open namespace tag when 
serializing the assertion
+* [RAMPART-186] - Password call back not copied over when the call back is 
set via a parameter to the axis Service (Secure conversation)
+* [RAMPART-174] - Rampart module says true to all assertions when 
canSupportAssertion is called
+* [RAMPART-202] - RampartEngine throws ClassCastException retrieving 
SOAPHeaderBlocks
+* [RAMPART-212] - WSSecurityException: Error in converting SOAP Envelope 
to Document
+* [RAMPART-314] - Rampart distribution does not contain OpenSAML 1.1 jars
+* [RAMPART-198] - Rampart 1.4 assumes WSS10 or WSS11 to be present in the 
policy
+* [RAMPART-273] - multiple rampart samples doesn't work
+* [RAMPART-254] - Public getter/setter setCallbackHander/getCallbackHander 
mis-spelled [ hander --> handler] in SAMLTokenIssuerConfig
+* [RAMPART-259] - SAML2TokenIssuer calls DefaultBootstrap.bootstrap() per 
every request and attribute call back handler not being called
+* [RAMPART-277] - Rampart ignores token inclusion settings when using the 
asymmetric security binding
+* [RAMPART-267] - div class="xleft" does not work
+* [RAMPART-224] - Error in Rampart configuration schema
+* [RAMPART-283] - sp:ProtectTokens Assertion Ignored w/ Transport Security 
Binding
+* [RAMPART-288] - Supporting Tokens Not Encrypted When Protection Order is 
Sign Before Encrypting
+* [RAMPART-300] - Rampart automaticaly tries to load an "Encryption user" 
if the security policy defines the use of a UsernameToken with a 
AsymmetricBinding
+* [RAMPART-225] - SupportingToken UsernameToken is always encrypted
+* [RAMPART-303] - Incorrect XML Passed to Digest Algorithm when XML 
Elements Belong to Empty Namespace
+* [RAMPART-309] - Incorrect XML Passed to Digest Algorithm
+* [RAMPART-116] - Policy Sample 04 on application scope fails with "Error 
in key derivation"
+* [RAMPART-253] - TTL doesn't serialized in to saml-issuer-config from 
SAMLTokenIssuerConfig
+* [RAMPART-270] - NPE in RampartMessageData
+* [RAMPART-274] - renewing a sts token doesn't work
+* [RAMPART-180] - Wrong NameIdentifier format
+* [RAMPART-276] - SignedEncryptedElements can incorrectly set the 
namespace of child xpaths during serialization
+* [RAMPART-293] - NPE in RampartMessageData prevents fault being returned 
to service consumer
+* [RAMPART-308] - All security exceptions reported as wsse:InvalidSecurity
+* [RAMPART-290] - NullPointerException in RampartEngine.isSecurityFault if 
the incoming fault message contains an invalid fault code element
+* [RAMPART-311] - Error AxisFault: A required message part [body] is not 
signed.
+* [RAMPART-239] - Axis2: Rampart module should not check the order of 
WS-Security header tags
+* [RAMPART-119] - Invalid behavior when empty  element 
present in the policy
+* [RAMPART-310] - Property 'invalidIssuerAddress' missing from 
error.properties
+* [RAMPART-154] - 
org.apache.rahas.client.STSClient.org.apache.rahas.processIssueResponse fails 
if SamlAssertion is issued.
+* [RAMPART-130] - MTOM with WS-Security
+* [RAMPART-97 ] - interop(WSE3.0 + Rampart1.3) Signature varification 
failed,When request with Non-English Character
+* [RAMPART-210] - samples/basic/sample11 does not exist in distro 
rampart-dist-1.4-bin.zip
+* [RAMPART-22 ] - Exception handling in 
UsernameTokenProcessor.handleUsernameToken
+* [RAMPART-111] - Rampart won't send certificate serial + issuer. Only 
either BinaryToken or Identity, but not always as it should
+* [RAMPART-187] - Secure conversation clients do not work when the 
bootstrap policy requires Username Token
+* [RAMPART-195] - Maven metadata are invalid in official repo preventing 
the use of rampart in offline mode

svn commit: r1051928 - in /axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site: resources/css/site.css site.xml

[shankar]

Author: shankar
Date: Wed Dec 22 14:50:59 2010
New Revision: 1051928

URL: http://svn.apache.org/viewvc?rev=1051928&view=rev
Log:
Applying patch from RAMPART-313 (rampart-site-newupdate.patch)

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/resources/css/site.css

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/resources/css/site.css
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/resources/css/site.css?rev=1051928&r1=1051927&r2=1051928&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/resources/css/site.css
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/resources/css/site.css
 Wed Dec 22 14:50:59 2010
@@ -269,20 +269,4 @@ div.source pre {
 text-indent:10px;
 width:100%;
 height:100px;
-}
-li.expanded a{
-background-color: #e8f4ff;
-border-left: solid 1px #ff2700;
-border-bottom: none;
-font-size: 0.9em;
-padding: 5px;
-color: #33;
-font-weight: normal;
-display:block;
-}
-li.expanded li.none a{
-background-color: #fff;
-border-left: none;
-border-bottom: none;
-font-weight: normal;
 }
\ No newline at end of file

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml?rev=1051928&r1=1051927&r2=1051928&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml 
(original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml 
Wed Dec 22 14:50:59 2010
@@ -44,36 +44,36 @@



-
-   
-   
-   
-   
-   
-   
-   
-   http://wiki.apache.org/ws/FrontPage/Rampart/FAQ"/> 
-   
-   
-   
-
-   
-   
- 
- 
- 
+   
+   
+   
+   

-   
-   
-   http://issues.apache.org/jira/browse/Rampart"; />
-   
-   http://svn.apache.org/viewvc/axis/axis2/java/rampart/"; />
-   
-   http://www.apache.org/licenses/LICENSE-2.0.html"; 
/>
-   
-
+   
+   
+   
+   
+   http://wiki.apache.org/ws/FrontPage/Rampart/FAQ"/> 
+   
+   
+   
+
+   
+   
+ 
+ 
+ 
+   
+   
+   
+   http://issues.apache.org/jira/browse/Rampart"; />
+   
+   http://svn.apache.org/viewvc/axis/axis2/java/rampart/"; />
+   
+   http://www.apache.org/licenses/LICENSE-2.0.html"; 
/>
+   
 

 

svn commit: r1051930 - in /axis/axis2/java/rampart/trunk/modules/documentation/src/site: resources/css/site.css site.xml

[shankar]

Author: shankar
Date: Wed Dec 22 14:52:33 2010
New Revision: 1051930

URL: http://svn.apache.org/viewvc?rev=1051930&view=rev
Log:
Applying patch from RAMPART-313 (rampart-site-newupdate.patch)

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css
axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css?rev=1051930&r1=1051929&r2=1051930&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/css/site.css
 Wed Dec 22 14:52:33 2010
@@ -269,20 +269,4 @@ div.source pre {
 text-indent:10px;
 width:100%;
 height:100px;
-}
-li.expanded a{
-background-color: #e8f4ff;
-border-left: solid 1px #ff2700;
-border-bottom: none;
-font-size: 0.9em;
-padding: 5px;
-color: #33;
-font-weight: normal;
-display:block;
-}
-li.expanded li.none a{
-background-color: #fff;
-border-left: none;
-border-bottom: none;
-font-weight: normal;
 }
\ No newline at end of file

Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml?rev=1051930&r1=1051929&r2=1051930&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml 
(original)
+++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml Wed 
Dec 22 14:52:33 2010
@@ -44,36 +44,36 @@



-
-   
-   
-   
-   
-   
-   
-   
-   http://wiki.apache.org/ws/FrontPage/Rampart/FAQ"/> 
-   
-   
-   
-
-   
-   
- 
- 
- 
+   
+   
+   
+   

-   
-   
-   http://issues.apache.org/jira/browse/Rampart"; />
-   
-   http://svn.apache.org/viewvc/axis/axis2/java/rampart/"; />
-   
-   http://www.apache.org/licenses/LICENSE-2.0.html"; 
/>
-   
-
+   
+   
+   
+   
+   http://wiki.apache.org/ws/FrontPage/Rampart/FAQ"/> 
+   
+   
+   
+
+   
+   
+ 
+ 
+ 
+   
+   
+   
+   http://issues.apache.org/jira/browse/Rampart"; />
+   
+   http://svn.apache.org/viewvc/axis/axis2/java/rampart/"; />
+   
+   http://www.apache.org/licenses/LICENSE-2.0.html"; 
/>
+   
 

 

svn commit: r1051943 - /axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java

[shankar]

Author: shankar
Date: Wed Dec 22 15:20:00 2010
New Revision: 1051943

URL: http://svn.apache.org/viewvc?rev=1051943&view=rev
Log:
Adding License header

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java?rev=1051943&r1=1051942&r2=1051943&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java
 Wed Dec 22 15:20:00 2010
@@ -1,3 +1,19 @@
+/*
+ * 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.rampart.samples.policy.sample06;
 
 import java.io.File;

svn commit: r1051944 - /axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java

[shankar]

Author: shankar
Date: Wed Dec 22 15:20:49 2010
New Revision: 1051944

URL: http://svn.apache.org/viewvc?rev=1051944&view=rev
Log:
Adding License header

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java?rev=1051944&r1=1051943&r2=1051944&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java
 Wed Dec 22 15:20:49 2010
@@ -1,3 +1,19 @@
+/*
+ * 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.rampart.samples.policy.sample06;
 
 import java.io.File;

svn commit: r1051954 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Wed Dec 22 15:34:04 2010
New Revision: 1051954

URL: http://svn.apache.org/viewvc?rev=1051954&view=rev
Log:
Creating tag for 1.5.1 release

Added:
axis/axis2/java/rampart/tags/v1.5.1/
  - copied from r1051944, axis/axis2/java/rampart/branches/1_5_x/

svn commit: r1051998 - /axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5/download.xml

[shankar]

Author: shankar
Date: Wed Dec 22 17:27:33 2010
New Revision: 1051998

URL: http://svn.apache.org/viewvc?rev=1051998&view=rev
Log:
changing the archive location

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5/download.xml

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5/download.xml?rev=1051998&r1=1051997&r2=1051998&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5/download.xml
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5/download.xml
 Wed Dec 22 17:27:33 2010
@@ -51,29 +51,29 @@ urchinTracker();
 Distribution
 This is the complete version of Apache Rampart and will contain samples
 as well.
-http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip"; 
title=
-"http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip"; 
onClick=
+http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip";
 title=
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip";
 onClick=
 "javascript:urchinTracker ('/downloads/rampart-1.5.zip');">zip
-http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip.md5";
-title="http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip.md5";>MD5
-http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip.asc";
-title="http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip.asc";>PGP
+http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip.md5";
+title="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip.md5";>MD5
+http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip.asc";
+title="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip.asc";>PGP
 
 
  Source
 Distribution
 This will contain the sources of Apache Rampart distribution.
-http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip"; 
title=
-"http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip"; 
onClick=
+http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip";
 title=
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip";
 onClick=
 "javascript:urchinTracker ('/downloads/rampart-dist-1.5-src.zip');">zip
 http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip.md5";
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip.md5";
 title=
-"http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip.md5";>MD5
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip.md5";>MD5
 http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip.asc";
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip.asc";
 title=
-"http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip.asc";>PGP
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip.asc";>PGP
 
 
 

svn commit: r1051999 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5/download.xml

[shankar]

Author: shankar
Date: Wed Dec 22 17:28:17 2010
New Revision: 1051999

URL: http://svn.apache.org/viewvc?rev=1051999&view=rev
Log:
changing the archive location

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5/download.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5/download.xml?rev=1051999&r1=1051998&r2=1051999&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5/download.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5/download.xml
 Wed Dec 22 17:28:17 2010
@@ -51,29 +51,29 @@ urchinTracker();
 Distribution
 This is the complete version of Apache Rampart and will contain samples
 as well.
-http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip"; 
title=
-"http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip"; 
onClick=
+http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip";
 title=
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip";
 onClick=
 "javascript:urchinTracker ('/downloads/rampart-1.5.zip');">zip
-http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip.md5";
-title="http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip.md5";>MD5
-http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip.asc";
-title="http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-bin.zip.asc";>PGP
+http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip.md5";
+title="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip.md5";>MD5
+http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip.asc";
+title="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-bin.zip.asc";>PGP
 
 
  Source
 Distribution
 This will contain the sources of Apache Rampart distribution.
-http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip"; 
title=
-"http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip"; 
onClick=
+http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip";
 title=
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip";
 onClick=
 "javascript:urchinTracker ('/downloads/rampart-dist-1.5-src.zip');">zip
 http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip.md5";
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip.md5";
 title=
-"http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip.md5";>MD5
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip.md5";>MD5
 http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip.asc";
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip.asc";
 title=
-"http://archive.apache.org/dist/ws/rampart/1_5/rampart-dist-1.5-src.zip.asc";>PGP
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5/rampart-dist-1.5-src.zip.asc";>PGP
 
 
 

svn commit: r1052000 - /axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

[shankar]

Author: shankar
Date: Wed Dec 22 17:30:30 2010
New Revision: 1052000

URL: http://svn.apache.org/viewvc?rev=1052000&view=rev
Log:
Removing link for document pack

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1052000&r1=1051999&r2=1052000&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 Wed Dec 22 17:30:30 2010
@@ -75,21 +75,6 @@ title=
 title=
 
"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc";>PGP
 
-
-Documents Distribution
-This will contain all the documentation in one package.
-zip
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-docs.zip.md5";
-title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-docs.zip.md5";>MD5
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-docs.zip.asc";
-title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-docs.zip.asc";>PGP
-
 
 
 

svn commit: r1052001 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

[shankar]

Author: shankar
Date: Wed Dec 22 17:31:26 2010
New Revision: 1052001

URL: http://svn.apache.org/viewvc?rev=1052001&view=rev
Log:
Removing link for document pack

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1052001&r1=1052000&r2=1052001&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 Wed Dec 22 17:31:26 2010
@@ -75,21 +75,6 @@ title=
 title=
 
"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc";>PGP
 
-
-Documents Distribution
-This will contain all the documentation in one package.
-zip
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-docs.zip.md5";
-title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-docs.zip.md5";>MD5
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-docs.zip.asc";
-title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-docs.zip.asc";>PGP
-
 
 
 

svn commit: r1052006 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml

[shankar]

Author: shankar
Date: Wed Dec 22 17:42:42 2010
New Revision: 1052006

URL: http://svn.apache.org/viewvc?rev=1052006&view=rev
Log:
Linking to svn.html

Modified:
axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml

Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml?rev=1052006&r1=1052005&r2=1052006&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml 
(original)
+++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/site.xml Wed 
Dec 22 17:42:42 2010
@@ -47,7 +47,7 @@



-   
+   

svn commit: r1052007 - /axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml

[shankar]

Author: shankar
Date: Wed Dec 22 17:43:34 2010
New Revision: 1052007

URL: http://svn.apache.org/viewvc?rev=1052007&view=rev
Log:
Linking to svn.html

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml?rev=1052007&r1=1052006&r2=1052007&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml 
(original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/site.xml 
Wed Dec 22 17:43:34 2010
@@ -47,7 +47,7 @@



-   
+   

svn commit: r1052146 - /axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

[shankar]

Author: shankar
Date: Thu Dec 23 02:46:18 2010
New Revision: 1052146

URL: http://svn.apache.org/viewvc?rev=1052146&view=rev
Log:
Applying patch from commit 1052082 by Nandana 

(RAMPART-136 now the XPath expression is evaluated against the SOAP header)

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1052146&r1=1052145&r2=1052146&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 Thu Dec 23 02:46:18 2010
@@ -1164,9 +1164,12 @@ public class RampartUtil {
  * @return
  */
 public static boolean checkRequiredElements(SOAPEnvelope envelope, HashMap 
decNamespaces, String expression ) {
+
+// The XPath expression must be evaluated against the SOAP header
+// 
http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/ws-securitypolicy-1.2-spec-os.html#_Toc161826519
+SOAPHeader header = envelope.getHeader();
 
-
-Set namespaces = findAllPrefixNamespaces(envelope, decNamespaces);
+Set namespaces = findAllPrefixNamespaces(header, decNamespaces);
 
 try {
 XPath xp = new AXIOMXPath(expression);
@@ -1178,7 +1181,7 @@ public class RampartUtil {
 xp.addNamespace(tmpNs.getPrefix(), 
tmpNs.getNamespaceURI());
 }
 
-List selectedNodes = xp.selectNodes(envelope);
+List selectedNodes = xp.selectNodes(header);
 
 if (selectedNodes.size() == 0 ) {
 return false;

svn commit: r1052154 - in /axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests: src/test/java/org/apache/rampart/ test-resources/policy/

[shankar]

Author: shankar
Date: Thu Dec 23 02:51:13 2010
New Revision: 1052154

URL: http://svn.apache.org/viewvc?rev=1052154&view=rev
Log:
Applying patch of commits (1052087, 1052085) to branch .

(RAMPART-136 test case to verify the fix)
(adding the license header)

Added:

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
   (with props)

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/test-resources/policy/rampart-asymm-required-elements-2.xml
   (with props)

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/test-resources/policy/rampart-asymm-required-elements.xml
   (with props)
Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/NonceCacheTest.java

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/NonceCacheTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/NonceCacheTest.java?rev=1052154&r1=1052153&r2=1052154&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/NonceCacheTest.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/NonceCacheTest.java
 Thu Dec 23 02:51:13 2010
@@ -1,3 +1,17 @@
+/*
+ * 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.rampart;
 
 import junit.framework.TestCase;

Added: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java?rev=1052154&view=auto
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
 (added)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
 Thu Dec 23 02:51:13 2010
@@ -0,0 +1,83 @@
+/* 
+ * 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.rampart;
+
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axis2.builder.SOAPBuilder;
+import org.apache.axis2.context.MessageContext;
+import org.apache.neethi.Policy;
+
+import java.io.ByteArrayInputStream;
+
+public class PolicyAssertionsTest extends MessageBuilderTestBase {
+
+public PolicyAssertionsTest(String name) {
+super(name);
+}
+
+public void testRequiredElementsValid() throws Exception {
+
+MessageContext ctx = getMsgCtx();
+
+String policyXml = 
"test-resources/policy/rampart-asymm-required-elements.xml";
+Policy policy = loadPolicy(policyXml);
+
+ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+MessageBuilder builder = new MessageBuilder();
+builder.build(ctx);
+
+// Building the SOAP envelope from the OMElement
+SOAPBuilder soapBuilder = new SOAPBuilder();
+SOAPEnvelope env = ctx.getEnvelope();
+ByteArrayInputStream inStream = new 
ByteArrayInputStream(env.toString().getBytes());
+env = (SOAPEnvelope) soapBuilder.processDocument(inStream, "text/xml", 
ctx);
+ctx.setEnvelope(env);
+
+RampartEngine engine = new RampartEngine();
+engine.process(ctx);
+
+}
+
+public void testRequiredElementsInvalid() throws Exception {
+
+MessageContext ctx = getMsgCtx();
+
+String policyXml = 
"test-resources/policy/rampart-asymm-required-elemen

svn commit: r1052156 - in /axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration: pom.xml src/test/java/org/apache/rampart/RampartTest.java src/test/resources/rampart/policy/30.xml src/te

[shankar]

Author: shankar
Date: Thu Dec 23 02:55:08 2010
New Revision: 1052156

URL: http://svn.apache.org/viewvc?rev=1052156&view=rev
Log:
Applying patch from commit 1052119 to branch. 

(RAMPART-218 a test case to verify the fix)

Added:

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
   (with props)

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/services-30.xml
   (with props)
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml

axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1052156&r1=1052155&r2=1052156&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Thu Dec 23 02:55:08 2010
@@ -5,14 +5,14 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+SNAPSHOT
 ../../pom.xml
 
 
 4.0.0
 rampart-integration
 jar
-1.5.1
+SNAPSHOT
 Rampart - Integration
 
 
@@ -332,6 +332,12 @@
   
tofile="target/temp-ramp/META-INF/services.xml"/>
 
+
+
+
 
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1052156&r1=1052155&r2=1052156&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
 Thu Dec 23 02:55:08 2010
@@ -77,7 +77,7 @@ public class RampartTest extends TestCas
 "Unlimited Strength Jurisdiction Policy !!!");
 }
 
-for (int i = 1; i <= 29; i++) { //<-The number of tests we have
+for (int i = 1; i <= 30; i++) { //<-The number of tests we have
 if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
 //Skip the Basic256 tests
 continue;

Added: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml?rev=1052156&view=auto
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
 Thu Dec 23 02:55:08 2010
@@ -0,0 +1,77 @@
+http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing";
+
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";>
+
+
+http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+
+
+
+http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+
+
+
+
+
+
+  

svn commit: r1052157 - /axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml

[shankar]

Author: shankar
Date: Thu Dec 23 02:57:53 2010
New Revision: 1052157

URL: http://svn.apache.org/viewvc?rev=1052157&view=rev
Log:
Changing version number

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1052157&r1=1052156&r2=1052157&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Thu Dec 23 02:57:53 2010
@@ -5,14 +5,14 @@
 
 org.apache.rampart
 rampart-project
-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 
 4.0.0
 rampart-integration
 jar
-SNAPSHOT
+1.5.1
 Rampart - Integration
 
 

svn commit: r1052159 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Thu Dec 23 03:02:10 2010
New Revision: 1052159

URL: http://svn.apache.org/viewvc?rev=1052159&view=rev
Log:
Deleting the tag to recreate 1.5.1 tag

Removed:
axis/axis2/java/rampart/tags/v1.5.1/

svn commit: r1052160 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Thu Dec 23 03:05:15 2010
New Revision: 1052160

URL: http://svn.apache.org/viewvc?rev=1052160&view=rev
Log:
Creating tag for 1.5.1 release

Added:
axis/axis2/java/rampart/tags/v1.5.1/
  - copied from r1052157, axis/axis2/java/rampart/branches/1_5_x/

svn commit: r1054589 - in /axis/axis2/java/rampart/branches/1_5_x: modules/distribution/bin.xml pom.xml

[shankar]

Author: shankar
Date: Mon Jan  3 12:14:08 2011
New Revision: 1054589

URL: http://svn.apache.org/viewvc?rev=1054589&view=rev
Log:
(1) changing opensaml version and removing unwanted repos
(2) Modifications to use nexus

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml?rev=1054589&r1=1054588&r2=1054589&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml Mon Jan 
 3 12:14:08 2011
@@ -22,7 +22,7 @@
 org.apache.rampart:rampart-core:jar
 org.apache.rampart:rampart-policy:jar
 org.apache.rampart:rampart-trust:jar
-org.opensaml:opensaml:jar
+org.opensaml:opensaml1:jar
 org.opensaml:xmltooling:jar
 joda-time:joda-time:jar
 org.slf4j:slf4j-api:jar

Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1054589&r1=1054588&r2=1054589&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Mon Jan  3 12:14:08 2011
@@ -2,13 +2,13 @@
  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";>
 
-4.0.0
 
 org.apache
 apache
-7
+8
 
 org.apache.rampart
+4.0.0
 rampart-project
 pom
  WS-Security, WS-Trust and WS-SecureConversation 
implementaion for Apache Axis2 
@@ -94,20 +94,6 @@
 
 

-   
-wso2-maven2-repository
-WSO2 Maven2 Repository
-http://dist.wso2.org/maven2
-
-false
-
-
-true
-never
-fail
-
-
-
 
 
 true
@@ -237,9 +223,9 @@
 ${xmlsec.version}
 
 
-opensaml
-opensaml
-1.1.406
+org.opensaml
+opensaml1
+1.1
 
 
 org.opensaml
@@ -353,7 +339,7 @@
 
 
 
-distribution
+apache-release
 
 
 release
@@ -386,7 +372,7 @@
 1.2.10
 
 1.5.10
-   1.4.2
+   1.4.2
 1.1
 
 140
@@ -402,23 +388,12 @@
 
 
 
-
-apache-repo
-Maven Central Repository
-
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
-
-
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
+   
+apache.snapshots.https
+${distMgmtSnapshotsName}
+${distMgmtSnapshotsUrl}
 false
 
-
-website
-scpexe://people.apache.org/www/ws.apache.org/rampart
-
 
 
 

svn commit: r1054590 - in /axis/axis2/java/rampart/trunk: modules/distribution/bin.xml pom.xml

[shankar]

Author: shankar
Date: Mon Jan  3 12:15:10 2011
New Revision: 1054590

URL: http://svn.apache.org/viewvc?rev=1054590&view=rev
Log:
(1) changing opensaml version and removing unwanted repos
(2) Modifications to use nexus

Modified:
axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1054590&r1=1054589&r2=1054590&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Mon Jan  3 
12:15:10 2011
@@ -22,7 +22,7 @@
 org.apache.rampart:rampart-core:jar
 org.apache.rampart:rampart-policy:jar
 org.apache.rampart:rampart-trust:jar
-org.opensaml:opensaml:jar
+org.opensaml:opensaml1:jar
 org.opensaml:xmltooling:jar
 joda-time:joda-time:jar
 org.slf4j:slf4j-api:jar

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1054590&r1=1054589&r2=1054590&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Mon Jan  3 12:15:10 2011
@@ -2,13 +2,14 @@
  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";>
 
-4.0.0
 
 org.apache
 apache
-7
+8
 
+
 org.apache.rampart
+4.0.0
 rampart-project
 pom
  WS-Security, WS-Trust and WS-SecureConversation 
implementaion for Apache Axis2 
@@ -93,21 +94,6 @@
 
 
 
-   
-   
-wso2-maven2-repository
-WSO2 Maven2 Repository
-http://dist.wso2.org/maven2
-
-false
-
-
-true
-never
-fail
-
-
-
 
 
 true
@@ -236,10 +222,10 @@
 xmlsec
 ${xmlsec.version}
 
-
-opensaml
-opensaml
-1.1.406
+   
+org.opensaml
+opensaml1
+1.1
 
 
 org.opensaml
@@ -353,7 +339,7 @@
 
 
 
-distribution
+apache-release
 
 
 release
@@ -401,24 +387,13 @@
 
 
 
-
-
-apache-repo
-Maven Central Repository
-
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
-
+   
 
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
+apache.snapshots.https
+${distMgmtSnapshotsName}
+${distMgmtSnapshotsUrl}
 false
 
-
-website
-scpexe://people.apache.org/www/ws.apache.org/rampart
-
-
+ 
 
 

svn commit: r1054595 - in /axis/axis2/java/rampart/branches/1_5_x: modules/distribution/pom.xml pom.xml

[shankar]

Author: shankar
Date: Mon Jan  3 12:37:02 2011
New Revision: 1054595

URL: http://svn.apache.org/viewvc?rev=1054595&view=rev
Log:
Modifying to use org.apache.apache version 8 as the parent

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1054595&r1=1054594&r2=1054595&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Mon Jan 
 3 12:37:02 2011
@@ -57,13 +57,12 @@
 
 org.apache.maven.plugins
 maven-assembly-plugin
-2.2-beta-1
 
 
 distribution-package
 package
 
-attached
+single
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1054595&r1=1054594&r2=1054595&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Mon Jan  3 12:37:02 2011
@@ -349,6 +349,28 @@
 modules/documentation
 modules/distribution
 
+   
+
+
+maven-assembly-plugin
+
+
+
+source-release-assembly
+
+package
+
+single
+
+true
+
+
+
+
+
+
 
 
 

svn commit: r1054596 - in /axis/axis2/java/rampart/trunk: modules/distribution/pom.xml pom.xml

[shankar]

Author: shankar
Date: Mon Jan  3 12:37:23 2011
New Revision: 1054596

URL: http://svn.apache.org/viewvc?rev=1054596&view=rev
Log:
Modifying to use org.apache.apache version 8 as the parent

Modified:
axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1054596&r1=1054595&r2=1054596&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Mon Jan  3 
12:37:23 2011
@@ -57,13 +57,12 @@
 
 org.apache.maven.plugins
 maven-assembly-plugin
-2.2-beta-1
 
 
 distribution-package
 package
 
-attached
+single
 
 
 

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1054596&r1=1054595&r2=1054596&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Mon Jan  3 12:37:23 2011
@@ -349,6 +349,28 @@
 modules/documentation
 modules/distribution
 
+   
+
+
+maven-assembly-plugin
+
+
+
+source-release-assembly
+
+package
+
+single
+
+true
+
+
+
+
+
+
 
 
 

svn commit: r1054887 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampart-policy/ modules/rampart-tests/ modules/ram

[shankar]

Author: shankar
Date: Tue Jan  4 04:00:45 2011
New Revision: 1054887

URL: http://svn.apache.org/viewvc?rev=1054887&view=rev
Log:
Adding LICENSE header

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1054887&r1=1054886&r2=1054887&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Tue Jan 
 4 04:00:45 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1054887&r1=1054886&r2=1054887&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Tue Jan  4 04:00:45 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1054887&r1=1054886&r2=1054887&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan  
4 04:00:45 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml?rev=1054887&r1=1054886&r2=1054887&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml Tue 
Jan  4 04:00:45 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml?rev=1054887&r1=1054886&r2=1054887&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml Tue 
Jan  4 04:00:45 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml?rev=1054887&r1=1054886&r2=1054887&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-

svn commit: r1054889 - in /axis/axis2/java/rampart/trunk: ./ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampart-policy/ modules/rampart-tests/ modules/rampart-trus

[shankar]

Author: shankar
Date: Tue Jan  4 04:03:42 2011
New Revision: 1054889

URL: http://svn.apache.org/viewvc?rev=1054889&view=rev
Log:
Adding LICENSE header

Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml?rev=1054889&r1=1054888&r2=1054889&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml Tue Jan  4 
04:03:42 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1054889&r1=1054888&r2=1054889&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Tue Jan  
4 04:03:42 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1054889&r1=1054888&r2=1054889&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Tue Jan  4 
04:03:42 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml?rev=1054889&r1=1054888&r2=1054889&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-policy/pom.xml Tue Jan  4 
04:03:42 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml?rev=1054889&r1=1054888&r2=1054889&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-tests/pom.xml Tue Jan  4 
04:03:42 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1054889&r1=1054888&r2=1054889&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Tue Jan  4 
04:03:42 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 http://maven.apache.org/POM/4.0.0";
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  xsi:schemaLocation=

svn commit: r1054892 - in /axis/axis2/java/rampart/branches/1_5_x: modules/rampart-mar/pom.xml modules/rampart-trust-mar/pom.xml pom.xml

[shankar]

Author: shankar
Date: Tue Jan  4 04:25:44 2011
New Revision: 1054892

URL: http://svn.apache.org/viewvc?rev=1054892&view=rev
Log:
Removing unwanted version numbers

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1054892&r1=1054891&r2=1054892&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan  
4 04:25:44 2011
@@ -34,8 +34,6 @@
 org.apache.rampart
 rampart
 mar
-${rampart.mar.version}
-
 Rampart - Mar
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml?rev=1054892&r1=1054891&r2=1054892&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml 
Tue Jan  4 04:25:44 2011
@@ -35,7 +35,6 @@
 org.apache.rampart
 rahas
 mar
-${rahas.mar.version}   
 Rampart - Trust-Mar
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1054892&r1=1054891&r2=1054892&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Tue Jan  4 04:25:44 2011
@@ -409,8 +409,8 @@
 
 
 ${pom.version}
-1.5.1
-1.5.1
+${pom.version}
+${pom.version}
 
 1.5.4
 1.2.10

svn commit: r1054895 - in /axis/axis2/java/rampart/trunk: modules/rampart-mar/pom.xml modules/rampart-trust-mar/pom.xml pom.xml

[shankar]

Author: shankar
Date: Tue Jan  4 04:38:30 2011
New Revision: 1054895

URL: http://svn.apache.org/viewvc?rev=1054895&view=rev
Log:
Removing unwanted version numbers

Modified:
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1054895&r1=1054894&r2=1054895&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Tue Jan  4 
04:38:30 2011
@@ -34,8 +34,6 @@
 org.apache.rampart
 rampart
 mar
-${rampart.mar.version}
-
 Rampart - Mar
 
 

Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1054895&r1=1054894&r2=1054895&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Tue Jan  4 
04:38:30 2011
@@ -35,7 +35,6 @@
 org.apache.rampart
 rahas
 mar
-${rahas.mar.version}   
 Rampart - Trust-Mar
 
 

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1054895&r1=1054894&r2=1054895&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Tue Jan  4 04:38:30 2011
@@ -409,8 +409,8 @@
 
 
 ${pom.version}
-SNAPSHOT
-SNAPSHOT
+${pom.version}
+${pom.version}
 
 SNAPSHOT
 1.2.11-SNAPSHOT

svn commit: r1054911 - in /axis/axis2/java/rampart/branches/1_5_x/modules: documentation/pom.xml rampart-integration/pom.xml

[shankar]

Author: shankar
Date: Tue Jan  4 06:09:08 2011
New Revision: 1054911

URL: http://svn.apache.org/viewvc?rev=1054911&view=rev
Log:
Adding LICENSE header and removing unwanted version numbers

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1054911&r1=1054910&r2=1054911&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Tue 
Jan  4 06:09:08 2011
@@ -1,3 +1,24 @@
+
+
+
+
 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";>

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1054911&r1=1054910&r2=1054911&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Tue Jan  4 06:09:08 2011
@@ -34,7 +34,6 @@
 4.0.0
 rampart-integration
 jar
-1.5.1
 Rampart - Integration
 
 

svn commit: r1054912 - in /axis/axis2/java/rampart/trunk/modules: documentation/pom.xml rampart-integration/pom.xml

[shankar]

Author: shankar
Date: Tue Jan  4 06:10:53 2011
New Revision: 1054912

URL: http://svn.apache.org/viewvc?rev=1054912&view=rev
Log:
Adding LICENSE header and removing unwanted version numbers

Modified:
axis/axis2/java/rampart/trunk/modules/documentation/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/pom.xml?rev=1054912&r1=1054911&r2=1054912&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/documentation/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/documentation/pom.xml Tue Jan  4 
06:10:53 2011
@@ -1,3 +1,24 @@
+
+
+
+
 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";>

Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1054912&r1=1054911&r2=1054912&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Tue Jan  
4 06:10:53 2011
@@ -34,7 +34,6 @@
 4.0.0
 rampart-integration
 jar
-SNAPSHOT
 Rampart - Integration
 
 

svn commit: r1054914 - /axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml

[shankar]

Author: shankar
Date: Tue Jan  4 06:17:41 2011
New Revision: 1054914

URL: http://svn.apache.org/viewvc?rev=1054914&view=rev
Log:
Adding LICENSE header

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1054914&r1=1054913&r2=1054914&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 
 4 06:17:41 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

svn commit: r1054915 - /axis/axis2/java/rampart/trunk/modules/distribution/pom.xml

[shankar]

Author: shankar
Date: Tue Jan  4 06:18:13 2011
New Revision: 1054915

URL: http://svn.apache.org/viewvc?rev=1054915&view=rev
Log:
Adding LICENSE header

Modified:
axis/axis2/java/rampart/trunk/modules/distribution/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/pom.xml?rev=1054915&r1=1054914&r2=1054915&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/pom.xml Tue Jan  4 
06:18:13 2011
@@ -1,3 +1,25 @@
+
+
+
+
+
 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";>

svn commit: r1054918 - /axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml

[shankar]

Author: shankar
Date: Tue Jan  4 06:57:55 2011
New Revision: 1054918

URL: http://svn.apache.org/viewvc?rev=1054918&view=rev
Log:
Changing versions so that release:prepare can run without problem

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1054918&r1=1054917&r2=1054918&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 
 4 06:57:55 2011
@@ -102,13 +102,13 @@
 
 org.apache.rampart
 rampart
-${rampart.mar.version}
+${pom.version}
 mar
 
 
 org.apache.rampart
 rahas
-${rahas.mar.version}
+${pom.version}
 mar
 
 

svn commit: r1054922 - /axis/axis2/java/rampart/trunk/build.xml

[shankar]

Author: shankar
Date: Tue Jan  4 07:13:52 2011
New Revision: 1054922

URL: http://svn.apache.org/viewvc?rev=1054922&view=rev
Log:
adding license comment

Modified:
axis/axis2/java/rampart/trunk/build.xml

Modified: axis/axis2/java/rampart/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/build.xml?rev=1054922&r1=1054921&r2=1054922&view=diff
==
--- axis/axis2/java/rampart/trunk/build.xml (original)
+++ axis/axis2/java/rampart/trunk/build.xml Tue Jan  4 07:13:52 2011
@@ -1,3 +1,24 @@
+
+
+
+
 
 
 

svn commit: r1054923 [1/3] - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules

[shankar]

Author: shankar
Date: Tue Jan  4 07:14:32 2011
New Revision: 1054923

URL: http://svn.apache.org/viewvc?rev=1054923&view=rev
Log:
[maven-release-plugin] prepare release vv1.5.1

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1054923&r1=1054922&r2=1054923&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 
 4 07:14:32 2011
@@ -1,141 +1,133 @@
-
-
-
-
-
-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";>
-
-
-org.apache.rampart
-rampart-project
-1.5.1
-../../pom.xml
-
-4.0.0
-rampart-dist
-pom
-Rampart - Distribution
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-1.1
-
-
-build-javadoc
-package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-run
-
-
-
-
-
-org.apache.maven.plugins
-maven-assembly-plugin
-
-
-distribution-package
-package
-
-single
-
-
-
-bin.xml
-src.xml
-
-
-
-
-
-
-
-
-
-
-org.apache.rampart
-rampart
-${pom.version}
-mar
-
-
-org.apache.rampart
-rahas
-${pom.version}
-mar
-
-
-org.apache.rampart
-rampart-core
-${pom.version}
-
-
-org.apache.rampart
-rampart-policy
-${pom.version}
-
-
-org.apache.rampart
-rampart-trust
-${pom.version}
-
-
-bouncycastle
-bcprov-jdk14
-${bcprov.jdk14.version}
-
-
-bouncycastle
-bcprov-jdk15
-${bcprov.jdk15.version}
-
-
-
-
+
+
+
+
+
+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";>
+
+
+org.apache.rampart
+rampart-project
+1.5.1
+../../pom.xml
+
+4.0.0
+rampart-dist
+pom
+Rampart - Distribution
+
+
+
+
+org.apache.maven.plugins
+maven-antrun-plugin
+1.1
+
+

svn commit: r1054924 - /axis/axis2/java/rampart/tags/vv1.5.1/

[shankar]

Author: shankar
Date: Tue Jan  4 07:14:49 2011
New Revision: 1054924

URL: http://svn.apache.org/viewvc?rev=1054924&view=rev
Log:
[maven-scm] copy for tag vv1.5.1

Added:
axis/axis2/java/rampart/tags/vv1.5.1/
  - copied from r1054923, axis/axis2/java/rampart/trunk/

svn commit: r1054925 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa

[shankar]

Author: shankar
Date: Tue Jan  4 07:15:03 2011
New Revision: 1054925

URL: http://svn.apache.org/viewvc?rev=1054925&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1054925&r1=1054924&r2=1054925&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 
 4 07:15:03 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1054925&r1=1054924&r2=1054925&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Tue 
Jan  4 07:15:03 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1054925&r1=1054924&r2=1054925&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Tue Jan 
 4 07:15:03 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1054925&r1=1054924&r2=1054925&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Tue Jan  4 07:15:03 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1054925&r1=1054924&r2=1054925&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan  
4 07:15:03 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 
@@ -35,11 +35,11 @@
 Rampart - Mar
 
 
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/tags/vv1.5.1
+
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
 
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/tags/vv1.5.1
+
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
 
-
https://svn.apache.org/repos/asf/webservices/rampart/tags/vv1.5.1
+
https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/ra

svn commit: r1055001 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa

[shankar]

Author: shankar
Date: Tue Jan  4 12:46:46 2011
New Revision: 1055001

URL: http://svn.apache.org/viewvc?rev=1055001&view=rev
Log:
Reverting version numbers and fixing branch svn url

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 
 4 12:46:46 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Tue 
Jan  4 12:46:46 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Tue Jan 
 4 12:46:46 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1-SNAPSHOT
 ../../pom.xml
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Tue Jan  4 12:46:46 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1-SNAPSHOT
 ../../pom.xml
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055001&r1=1055000&r2=1055001&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan  
4 12:46:46 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1-SNAPSHOT
 ../../pom.xml
 
 
@@ -35,11 +35,11 @@
 Rampart - Mar
 
 
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
 
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
 
-
https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/ra

svn commit: r1055016 - in /axis/axis2/java/rampart/trunk: modules/rampart-mar/pom.xml modules/rampart-trust-mar/pom.xml pom.xml

[shankar]

Author: shankar
Date: Tue Jan  4 12:51:21 2011
New Revision: 1055016

URL: http://svn.apache.org/viewvc?rev=1055016&view=rev
Log:
fixing svn url

Modified:
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/trunk/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1055016&r1=1055015&r2=1055016&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Tue Jan  4 
12:51:21 2011
@@ -37,11 +37,11 @@
 Rampart - Mar
 
 
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+   
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
 
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
 
-
https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+   
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk
 
 
 

Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1055016&r1=1055015&r2=1055016&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Tue Jan  4 
12:51:21 2011
@@ -38,10 +38,10 @@
 Rampart - Trust-Mar
 
 
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
 
-
scm:svn:https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
-
https://svn.apache.org/repos/asf/webservices/rampart/trunk/java
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
+http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk
 
 
 

Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1055016&r1=1055015&r2=1055016&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Tue Jan  4 12:51:21 2011
@@ -106,12 +106,12 @@
 
 
 
-
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
 
 
 
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
 
-
https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk
+http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk
 
 
 

svn commit: r1055042 - /axis/axis2/java/rampart/tags/vv1.5.1/

[shankar]

Author: shankar
Date: Tue Jan  4 14:07:11 2011
New Revision: 1055042

URL: http://svn.apache.org/viewvc?rev=1055042&view=rev
Log:
Removing unwanted tag

Removed:
axis/axis2/java/rampart/tags/vv1.5.1/

svn commit: r1055044 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Tue Jan  4 14:07:48 2011
New Revision: 1055044

URL: http://svn.apache.org/viewvc?rev=1055044&view=rev
Log:
Removing 1.5.1 tag to recreate it

Removed:
axis/axis2/java/rampart/tags/v1.5.1/

svn commit: r1055048 - in /axis/axis2/java/rampart/branches/1_5_x/release-docs: ChangeLog.txt NOTICE.txt README.txt

[shankar]

Author: shankar
Date: Tue Jan  4 14:13:09 2011
New Revision: 1055048

URL: http://svn.apache.org/viewvc?rev=1055048&view=rev
Log:
Changing release dates

Modified:
axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt
axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt
axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt

Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt?rev=1055048&r1=1055047&r2=1055048&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt (original)
+++ axis/axis2/java/rampart/branches/1_5_x/release-docs/ChangeLog.txt Tue Jan  
4 14:13:09 2011
@@ -1,7 +1,7 @@
 This file contains a listing of all Jira issues that have been closed
 for a given release.
 
-Release 1.5.1 - 23 Dec 2010
+Release 1.5.1 - 04 Jan 2011
 ===
  
 ** Bug

Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt?rev=1055048&r1=1055047&r2=1055048&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt (original)
+++ axis/axis2/java/rampart/branches/1_5_x/release-docs/NOTICE.txt Tue Jan  4 
14:13:09 2011
@@ -1,5 +1,5 @@
 Apache Rampart
-Copyright 2010 The Apache Software Foundation
+Copyright 2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt?rev=1055048&r1=1055047&r2=1055048&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt (original)
+++ axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt Tue Jan  4 
14:13:09 2011
@@ -1,5 +1,5 @@
 ==
-Apache Rampart-1.5.1 build  (Dec 23, 2010)
+Apache Rampart-1.5.1 build  (Jan 04, 2011)
 
 http://axis.apache.org/axis2/java/rampart
 --

svn commit: r1055058 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa

[shankar]

Author: shankar
Date: Tue Jan  4 14:35:22 2011
New Revision: 1055058

URL: http://svn.apache.org/viewvc?rev=1055058&view=rev
Log:
[maven-release-plugin] prepare release v1.5.1

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 
 4 14:35:22 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Tue 
Jan  4 14:35:22 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Tue Jan 
 4 14:35:22 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Tue Jan  4 14:35:22 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055058&r1=1055057&r2=1055058&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan  
4 14:35:22 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 
@@ -35,11 +35,11 @@
 Rampart - Mar
 
 
-
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
 
-
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
 
-
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x
+
http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/ra

svn commit: r1055060 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Tue Jan  4 14:35:36 2011
New Revision: 1055060

URL: http://svn.apache.org/viewvc?rev=1055060&view=rev
Log:
[maven-scm] copy for tag v1.5.1

Added:
axis/axis2/java/rampart/tags/v1.5.1/
  - copied from r1055058, axis/axis2/java/rampart/branches/1_5_x/

svn commit: r1055061 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa

[shankar]

Author: shankar
Date: Tue Jan  4 14:35:48 2011
New Revision: 1055061

URL: http://svn.apache.org/viewvc?rev=1055061&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Tue Jan 
 4 14:35:48 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Tue 
Jan  4 14:35:48 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Tue Jan 
 4 14:35:48 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Tue Jan  4 14:35:48 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055061&r1=1055060&r2=1055061&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Tue Jan  
4 14:35:48 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 
@@ -35,11 +35,11 @@
 Rampart - Mar
 
 
-
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
 
-
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
 
-
http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1
+
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/ra

svn commit: r1055352 - in /axis/axis2/java/rampart/branches/1_5_x/modules: rampart-mar/pom.xml rampart-trust-mar/pom.xml

[shankar]

Author: shankar
Date: Wed Jan  5 08:29:13 2011
New Revision: 1055352

URL: http://svn.apache.org/viewvc?rev=1055352&view=rev
Log:
Removing contradicting releaseManagement properties 

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055352&r1=1055351&r2=1055352&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Wed Jan  
5 08:29:13 2011
@@ -106,47 +106,4 @@
 
 
 
-
-
-apache-m2
-Apache M2 Repository
-
http://people.apache.org/repo/m2-ibiblio-rsync-repository
-default
-
-false
-daily
-ignore
-
-
-true
-
-
-
-apache-snapshots
-Apache Snapshots Repository
-http://people.apache.org/repo/m2-snapshot-repository
-default
-
-true
-daily
-ignore
-
-
-false
-
-
-
-
-
-apache-repo
-Maven Central Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
-
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
-false
-
-
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml?rev=1055352&r1=1055351&r2=1055352&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml 
Wed Jan  5 08:29:13 2011
@@ -83,48 +83,4 @@
 ${pom.version}
 
 
-
-
-
-apache-m2
-Apache M2 Repository
-
http://people.apache.org/repo/m2-ibiblio-rsync-repository
-default
-
-false
-daily
-ignore
-
-
-true
-
-
-
-apache-snapshots
-Apache Snapshots Repository
-http://people.apache.org/repo/m2-snapshot-repository
-default
-
-true
-daily
-ignore
-
-
-false
-
-
-
-   
-
-apache-repo
-Maven Central Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
-
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
-false
-
-
 

svn commit: r1055354 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Wed Jan  5 08:37:52 2011
New Revision: 1055354

URL: http://svn.apache.org/viewvc?rev=1055354&view=rev
Log:
Removing 1.5.1 tag to recreate it

Removed:
axis/axis2/java/rampart/tags/v1.5.1/

svn commit: r1055360 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa

[shankar]

Author: shankar
Date: Wed Jan  5 08:52:06 2011
New Revision: 1055360

URL: http://svn.apache.org/viewvc?rev=1055360&view=rev
Log:
[maven-release-plugin] prepare release v1.5.1

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Wed Jan 
 5 08:52:06 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Wed 
Jan  5 08:52:06 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Wed Jan 
 5 08:52:06 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Wed Jan  5 08:52:06 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055360&r1=1055359&r2=1055360&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Wed Jan  
5 08:52:06 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 
@@ -35,11 +35,11 @@
 Rampart - Mar
 
 
-
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
 
-
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
 
-
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x
+
http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/ra

svn commit: r1055361 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Wed Jan  5 08:52:22 2011
New Revision: 1055361

URL: http://svn.apache.org/viewvc?rev=1055361&view=rev
Log:
[maven-scm] copy for tag v1.5.1

Added:
axis/axis2/java/rampart/tags/v1.5.1/
  - copied from r1055360, axis/axis2/java/rampart/branches/1_5_x/

svn commit: r1055362 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa

[shankar]

Author: shankar
Date: Wed Jan  5 08:52:34 2011
New Revision: 1055362

URL: http://svn.apache.org/viewvc?rev=1055362&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Wed Jan 
 5 08:52:34 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Wed 
Jan  5 08:52:34 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Wed Jan 
 5 08:52:34 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Wed Jan  5 08:52:34 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055362&r1=1055361&r2=1055362&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Wed Jan  
5 08:52:34 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 
@@ -35,11 +35,11 @@
 Rampart - Mar
 
 
-
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
 
-
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
 
-
http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1
+
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/ra

svn commit: r1055376 - in /axis/axis2/java/rampart/trunk/modules: rampart-mar/pom.xml rampart-trust-mar/pom.xml

[shankar]

Author: shankar
Date: Wed Jan  5 09:39:40 2011
New Revision: 1055376

URL: http://svn.apache.org/viewvc?rev=1055376&view=rev
Log:
Removing contradicting releaseManagement properties 

Modified:
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1055376&r1=1055375&r2=1055376&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Wed Jan  5 
09:39:40 2011
@@ -138,16 +138,11 @@
 
 
 
-
-
-apache-repo
-Maven Central Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
+   
 
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
+apache.snapshots.https
+${distMgmtSnapshotsName}
+${distMgmtSnapshotsUrl}
 false
 
 

Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1055376&r1=1055375&r2=1055376&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Wed Jan  5 
09:39:40 2011
@@ -117,15 +117,10 @@
 
 

-
-apache-repo
-Maven Central Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-repository
-
 
-apache-snapshots
-Apache Development Repository
-
scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository
+apache.snapshots.https
+${distMgmtSnapshotsName}
+${distMgmtSnapshotsUrl}
 false
 
 

svn commit: r1055759 - /axis/axis2/java/rampart/trunk/modules/distribution/bin.xml

[shankar]

Author: shankar
Date: Thu Jan  6 06:39:42 2011
New Revision: 1055759

URL: http://svn.apache.org/viewvc?rev=1055759&view=rev
Log:
Including opensaml libraries 

Modified:
axis/axis2/java/rampart/trunk/modules/distribution/bin.xml

Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1055759&r1=1055758&r2=1055759&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Thu Jan  6 
06:39:42 2011
@@ -23,6 +23,7 @@
 org.apache.rampart:rampart-policy:jar
 org.apache.rampart:rampart-trust:jar
 org.opensaml:opensaml1:jar
+org.opensaml:opensaml:jar
 org.opensaml:xmltooling:jar
 joda-time:joda-time:jar
 org.slf4j:slf4j-api:jar

svn commit: r1055762 - /axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml

[shankar]

Author: shankar
Date: Thu Jan  6 06:57:44 2011
New Revision: 1055762

URL: http://svn.apache.org/viewvc?rev=1055762&view=rev
Log:
Packing opensaml2 libraries

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml?rev=1055762&r1=1055761&r2=1055762&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml Thu Jan 
 6 06:57:44 2011
@@ -23,6 +23,7 @@
 org.apache.rampart:rampart-policy:jar
 org.apache.rampart:rampart-trust:jar
 org.opensaml:opensaml1:jar
+org.opensaml:opensaml:jar
 org.opensaml:xmltooling:jar
 joda-time:joda-time:jar
 org.slf4j:slf4j-api:jar

svn commit: r1055782 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Thu Jan  6 08:10:49 2011
New Revision: 1055782

URL: http://svn.apache.org/viewvc?rev=1055782&view=rev
Log:
Deleting tag to recreate 1.5.1 take3

Removed:
axis/axis2/java/rampart/tags/v1.5.1/

svn commit: r1055784 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa

[shankar]

Author: shankar
Date: Thu Jan  6 08:23:54 2011
New Revision: 1055784

URL: http://svn.apache.org/viewvc?rev=1055784&view=rev
Log:
[maven-release-plugin] prepare release v1.5.1

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055784&r1=1055783&r2=1055784&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Thu Jan 
 6 08:23:54 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055784&r1=1055783&r2=1055784&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Thu 
Jan  6 08:23:54 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055784&r1=1055783&r2=1055784&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Thu Jan 
 6 08:23:54 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055784&r1=1055783&r2=1055784&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Thu Jan  6 08:23:54 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055784&r1=1055783&r2=1055784&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Thu Jan  
6 08:23:54 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.2-SNAPSHOT
+1.5.1
 ../../pom.xml
 
 
@@ -35,11 +35,11 @@
 Rampart - Mar
 
 
-
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
 
-
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
 
-
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x
+
http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/ra

svn commit: r1055785 - /axis/axis2/java/rampart/tags/v1.5.1/

[shankar]

Author: shankar
Date: Thu Jan  6 08:24:08 2011
New Revision: 1055785

URL: http://svn.apache.org/viewvc?rev=1055785&view=rev
Log:
[maven-scm] copy for tag v1.5.1

Added:
axis/axis2/java/rampart/tags/v1.5.1/
  - copied from r1055784, axis/axis2/java/rampart/branches/1_5_x/

svn commit: r1055786 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules/rampa

[shankar]

Author: shankar
Date: Thu Jan  6 08:24:20 2011
New Revision: 1055786

URL: http://svn.apache.org/viewvc?rev=1055786&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1055786&r1=1055785&r2=1055786&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Thu Jan 
 6 08:24:20 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml?rev=1055786&r1=1055785&r2=1055786&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml Thu 
Jan  6 08:24:20 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 4.0.0

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml?rev=1055786&r1=1055785&r2=1055786&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml Thu Jan 
 6 08:24:20 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1055786&r1=1055785&r2=1055786&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml 
Thu Jan  6 08:24:20 2011
@@ -25,7 +25,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1055786&r1=1055785&r2=1055786&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml 
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Thu Jan  
6 08:24:20 2011
@@ -24,7 +24,7 @@
 
 org.apache.rampart
 rampart-project
-1.5.1
+1.5.2-SNAPSHOT
 ../../pom.xml
 
 
@@ -35,11 +35,11 @@
 Rampart - Mar
 
 
-
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
 
-
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/tags/v1.5.1
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/rampart/branches/1_5_x
 
-
http://svn.apache.org/viewvc/axis/axis2/java/rampart/tags/v1.5.1
+
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x
 
 
 

Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/ra

svn commit: r1055819 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/ rampart-trust/src/main/java/org/apache/rahas/

[shankar]

Author: shankar
Date: Thu Jan  6 10:28:05 2011
New Revision: 1055819

URL: http://svn.apache.org/viewvc?rev=1055819&view=rev
Log:
Applying patch from RAMPART-298

Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/TokenCallbackHandler.java

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenStorage.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1055819&r1=1055818&r2=1055819&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
 Thu Jan  6 10:28:05 2011
@@ -148,6 +148,14 @@ public class RampartEngine {
signatureCrypto, 

RampartUtil.getEncryptionCrypto(rpd.getRampartConfig(), 

msgCtx.getAxisService().getClassLoader()));
+
+// Remove encryption tokens if this is the initiator and if 
initiator is receiving a message
+
+if (rmd.isInitiator() && (msgCtx.getFLOW() == 
MessageContext.IN_FLOW ||
+msgCtx.getFLOW() == MessageContext.IN_FAULT_FLOW)) {
+tokenCallbackHandler.removeEncryptedToken();
+}
+
} else {
if(doDebug){
log.debug("Processing security header in normal 
path");

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/TokenCallbackHandler.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/TokenCallbackHandler.java?rev=1055819&r1=1055818&r2=1055819&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/TokenCallbackHandler.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/TokenCallbackHandler.java
 Thu Jan  6 10:28:05 2011
@@ -34,15 +34,19 @@ public class TokenCallbackHandler implem
 
 private TokenStorage store;
 private CallbackHandler handler;
-
+private String tokenIdentifier;
+
 public TokenCallbackHandler(TokenStorage store, CallbackHandler handler) {
 this.store = store;
 this.handler = handler;
+this.tokenIdentifier = null;
 }
+
+
 
 public void handle(Callback[] callbacks) 
 throws IOException, UnsupportedCallbackException {
-
+
 for (int i = 0; i < callbacks.length; i++) {
 
 if (callbacks[i] instanceof WSPasswordCallback) {
@@ -67,8 +71,10 @@ public class TokenCallbackHandler implem
 }
 } else if (pc.getUsage() == 
WSPasswordCallback.ENCRYPTED_KEY_TOKEN){
try {
-   String[] tokenIdentifiers = 
this.store.getTokenIdentifiers();
+
+String[] tokenIdentifiers = 
this.store.getTokenIdentifiers();
Token tok;
+
for (int j = 0 ; j < tokenIdentifiers.length ; 
j++) {

tok = 
this.store.getToken(tokenIdentifiers[j]);
@@ -77,6 +83,8 @@ public class TokenCallbackHandler implem

((EncryptedKeyToken)tok).getSHA1().equals(id)){ 

pc.setKey(tok.getSecret());

pc.setCustomToken((Element)tok.getToken());
+
+tokenIdentifier = tokenIdentifiers[j];
}
}

@@ -97,6 +105,14 @@ public class TokenCallbackHandler implem
 }
 }
 }
+
+public void removeEncryptedToken() {
+
+if (tokenIdentifier != null) {
+this.store.removeToken(tokenIdentifier);
+}
+
+}
 
 
 

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Simp

svn commit: r1057089 - in /axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc: download.xml download/1.5.1/download.xml index.xml

[shankar]

Author: shankar
Date: Mon Jan 10 06:47:04 2011
New Revision: 1057089

URL: http://svn.apache.org/viewvc?rev=1057089&view=rev
Log:
Documentation changes for 1.5.1

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/index.xml

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml?rev=1057089&r1=1057088&r2=1057089&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download.xml
 Mon Jan 10 06:47:04 2011
@@ -36,7 +36,7 @@
 1.5.1
 
 
-
+10 Jan 2011
 1.5.1 Release (Mirrored)
 
 

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1057089&r1=1057088&r2=1057089&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 Mon Jan 10 06:47:04 2011
@@ -100,7 +100,7 @@ verify the http://www.apache.org/dev/release-signing#openpgp";>OpenPGP
 compatible signature from the main Apache site. These can be
 downloaded by following the links above. This http://www.apache.org/dist/ws/axis2/KEYS";>KEYS file contains
+"http://www.apache.org/dist/axis/axis2/java/rampart/KEYS";>KEYS file 
contains
 the public keys that can be used for verifying signatures. It is
 recommended that (when possible)a http://www.apache.org/dev/release-signing#web-of-trust";>Web of

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/index.xml?rev=1057089&r1=1057088&r2=1057089&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/index.xml
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/index.xml
 Mon Jan 10 06:47:04 2011
@@ -45,6 +45,18 @@ following specifications:
 
  
 Apache Rampart News
+   Jan 10, 2011 : Apache Rampart 1.5.1 released
+Apache Rampart 1.5.1 was released with lots of bug fixes.
+
+   Feb 01, 2010 : Apache Rampart 1.5 released
+Apache Rampart 1.5 was released with lots of bug fixes and new 
features.
+New features include
+
+SAML 2.0 support - Issuance 
+Key store caching
+Signing / Encrypting with multiple keys
+Tests for negative scenarios
+
 Jun 12, 2008 : Apache Rampart 1.4 released  
 Apache Rampart 1.4 was released with lots of bug fixes and new 
features.
 New features include

svn commit: r1057090 - in /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc: download.xml download/1.5.1/download.xml index.xml

[shankar]

Author: shankar
Date: Mon Jan 10 06:47:47 2011
New Revision: 1057090

URL: http://svn.apache.org/viewvc?rev=1057090&view=rev
Log:
Documentation changes for 1.5.1

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml

axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml?rev=1057090&r1=1057089&r2=1057090&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml 
(original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download.xml 
Mon Jan 10 06:47:47 2011
@@ -36,7 +36,7 @@
 1.5.1
 
 
-
+10 Jan 2011
 1.5.1 Release (Mirrored)
 
 

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1057090&r1=1057089&r2=1057090&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 Mon Jan 10 06:47:47 2011
@@ -100,7 +100,7 @@ verify the http://www.apache.org/dev/release-signing#openpgp";>OpenPGP
 compatible signature from the main Apache site. These can be
 downloaded by following the links above. This http://www.apache.org/dist/ws/axis2/KEYS";>KEYS file contains
+"http://www.apache.org/dist/axis/axis2/java/rampart/KEYS";>KEYS file 
contains
 the public keys that can be used for verifying signatures. It is
 recommended that (when possible)a http://www.apache.org/dev/release-signing#web-of-trust";>Web of

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml?rev=1057090&r1=1057089&r2=1057090&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml 
(original)
+++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/index.xml 
Mon Jan 10 06:47:47 2011
@@ -45,6 +45,18 @@ following specifications:
 
  
 Apache Rampart News
+   Jan 10, 2011 : Apache Rampart 1.5.1 released
+Apache Rampart 1.5.1 was released with lots of bug fixes.
+
+   Feb 01, 2010 : Apache Rampart 1.5 released
+Apache Rampart 1.5 was released with lots of bug fixes and new 
features.
+New features include
+
+SAML 2.0 support - Issuance 
+Key store caching
+Signing / Encrypting with multiple keys
+Tests for negative scenarios
+
 Jun 12, 2008 : Apache Rampart 1.4 released  
 Apache Rampart 1.4 was released with lots of bug fixes and new 
features.
 New features include

svn commit: r1057113 - in /axis/axis2/java/rampart/site: ./ apidocs/ apidocs/org/apache/rahas/ apidocs/org/apache/rahas/class-use/ apidocs/org/apache/rahas/client/ apidocs/org/apache/rahas/client/clas

[shankar]

Author: shankar
Date: Mon Jan 10 08:15:56 2011
New Revision: 1057113

URL: http://svn.apache.org/viewvc?rev=1057113&view=rev
Log:
Site Documents for 1.5.1 release


[This commit notification would consist of 82 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1057126 - /axis/axis2/java/rampart/site/download/1.5.1/download.html

[shankar]

Author: shankar
Date: Mon Jan 10 08:51:59 2011
New Revision: 1057126

URL: http://svn.apache.org/viewvc?rev=1057126&view=rev
Log:
Changing binary, source artifact links

Modified:
axis/axis2/java/rampart/site/download/1.5.1/download.html

Modified: axis/axis2/java/rampart/site/download/1.5.1/download.html
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/site/download/1.5.1/download.html?rev=1057126&r1=1057125&r2=1057126&view=diff
==
--- axis/axis2/java/rampart/site/download/1.5.1/download.html (original)
+++ axis/axis2/java/rampart/site/download/1.5.1/download.html Mon Jan 10 
08:51:59 2011
@@ -214,17 +214,17 @@ urchinTracker();
 Distribution
 This is the complete version of Apache Rampart and will contain samples
 as well.
-zip
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.md5";>MD5
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.asc";>PGP
+zip
+http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.md5";>MD5
+http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.asc";>PGP
 
 
  Source
 Distribution
 This will contain the sources of Apache Rampart distribution.
-zip
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.md5";>MD5
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc";>PGP
+zip
+http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.md5";>MD5
+http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.asc";>PGP
 
 
 

svn commit: r1057131 - /axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

[shankar]

Author: shankar
Date: Mon Jan 10 09:00:36 2011
New Revision: 1057131

URL: http://svn.apache.org/viewvc?rev=1057131&view=rev
Log:
Changing binary, source artifact links

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1057131&r1=1057130&r2=1057131&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 Mon Jan 10 09:00:36 2011
@@ -51,29 +51,29 @@ urchinTracker();
 Distribution
 This is the complete version of Apache Rampart and will contain samples
 as well.
-zip
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.md5";
-   
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.md5";>MD5
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.asc";
-   
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.asc";>PGP
+zip
+http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.md5";
+   
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.md5";>MD5
+http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.asc";
+   
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.asc";>PGP
 
 
  Source
 Distribution
 This will contain the sources of Apache Rampart distribution.
-zip
+zip
 http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.md5";
+   
"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.md5";
 title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.md5";>MD5
+"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.md5";>MD5
 http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc";
+   
"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.asc";
 title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc";>PGP
+"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.asc";>PGP
 
 
 

svn commit: r1057132 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

[shankar]

Author: shankar
Date: Mon Jan 10 09:01:15 2011
New Revision: 1057132

URL: http://svn.apache.org/viewvc?rev=1057132&view=rev
Log:
Changing binary, source artifact links

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1057132&r1=1057131&r2=1057132&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 Mon Jan 10 09:01:15 2011
@@ -51,29 +51,29 @@ urchinTracker();
 Distribution
 This is the complete version of Apache Rampart and will contain samples
 as well.
-zip
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.md5";
-   
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.md5";>MD5
-http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.asc";
-   
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.asc";>PGP
+zip
+http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.md5";
+   
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.md5";>MD5
+http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.asc";
+   
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.asc";>PGP
 
 
  Source
 Distribution
 This will contain the sources of Apache Rampart distribution.
-zip
+zip
 http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.md5";
+   
"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.md5";
 title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.md5";>MD5
+"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.md5";>MD5
 http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc";
+   
"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.asc";
 title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc";>PGP
+"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.asc";>PGP
 
 
 

svn commit: r1057445 - /axis/axis2/java/rampart/site/download/1.5.1/download.html

[shankar]

Author: shankar
Date: Tue Jan 11 01:59:14 2011
New Revision: 1057445

URL: http://svn.apache.org/viewvc?rev=1057445&view=rev
Log:
Fixing broken mirror sites

Modified:
axis/axis2/java/rampart/site/download/1.5.1/download.html

Modified: axis/axis2/java/rampart/site/download/1.5.1/download.html
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/site/download/1.5.1/download.html?rev=1057445&r1=1057444&r2=1057445&view=diff
==
--- axis/axis2/java/rampart/site/download/1.5.1/download.html (original)
+++ axis/axis2/java/rampart/site/download/1.5.1/download.html Tue Jan 11 
01:59:14 2011
@@ -235,12 +235,19 @@ Distribution
 please select another mirror. If all mirrors are failing, there are
 backup mirrors (at the end of the mirrors list) that should
 be available.
-Other mirrors: 
-[http]
-[ftp]
-[backup] (backup)
- 
-You may also consult the http://www.apache.org/mirrors/";>complete 
list of mirrors.
+
+Other mirrors: 
+[if-any http]
+  [for http][http][end]
+[end]  
+[if-any ftp]
+  [for ftp][ftp][end]
+[end]
+[if-any backup]
+  [for backup][backup] (backup)[end]
+[end]
+You may also consult 
the http://www.apache.org/mirrors/";>complete list 
of mirrors
+.
 Note: when downloading from a mirror please
 check the http://www.apache.org/dev/release-signing#md5";>md5sum 
and
 verify the http://www.apache.org/dev/release-signing#openpgp";>OpenPGP

svn commit: r1057446 - /axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

[shankar]

Author: shankar
Date: Tue Jan 11 02:07:41 2011
New Revision: 1057446

URL: http://svn.apache.org/viewvc?rev=1057446&view=rev
Log:
Fixing the mirror sites functionality

Modified:

axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1057446&r1=1057445&r2=1057446&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 Tue Jan 11 02:07:41 2011
@@ -85,14 +85,19 @@ border="0" />[end] The currently sel
 please select another mirror. If all mirrors are failing, there are
 backup mirrors (at the end of the mirrors list) that should
 be available.
-Other mirrors: 
-[http]
-[ftp]
-[backup] (backup)
- 
-You may also consult the http://www.apache.org/mirrors/";>complete list of mirrors.
+
+Other mirrors: 
+[if-any http]
+  [for http][http][end]
+[end]  
+[if-any ftp]
+  [for ftp][ftp][end]
+[end]
+[if-any backup]
+  [for backup][backup] (backup)[end]
+[end]
+You may also consult 
the http://www.apache.org/mirrors/";>complete list 
of mirrors
+.
 Note: when downloading from a mirror please
 check the http://www.apache.org/dev/release-signing#md5";>md5sum and

svn commit: r1057447 - /axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

[shankar]

Author: shankar
Date: Tue Jan 11 02:09:05 2011
New Revision: 1057447

URL: http://svn.apache.org/viewvc?rev=1057447&view=rev
Log:
Fixing the mirror sites functionality

Modified:

axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1057447&r1=1057446&r2=1057447&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
 Tue Jan 11 02:09:05 2011
@@ -85,14 +85,19 @@ border="0" />[end] The currently sel
 please select another mirror. If all mirrors are failing, there are
 backup mirrors (at the end of the mirrors list) that should
 be available.
-Other mirrors: 
-[http]
-[ftp]
-[backup] (backup)
- 
-You may also consult the http://www.apache.org/mirrors/";>complete list of mirrors.
+
+Other mirrors: 
+[if-any http]
+  [for http][http][end]
+[end]  
+[if-any ftp]
+  [for ftp][ftp][end]
+[end]
+[if-any backup]
+  [for backup][backup] (backup)[end]
+[end]
+You may also consult 
the http://www.apache.org/mirrors/";>complete list 
of mirrors
+.
 Note: when downloading from a mirror please
 check the http://www.apache.org/dev/release-signing#md5";>md5sum and

svn commit: r1305728 - in /axis/axis2/java/core/trunk/modules/kernel: src/org/apache/axis2/util/XMLPrettyPrinter.java test/org/apache/axis2/util/XMLPrettyPrinterTest.java

[shankar]

Author: shankar
Date: Tue Mar 27 04:14:37 2012
New Revision: 1305728

URL: http://svn.apache.org/viewvc?rev=1305728&view=rev
Log:
Closing the streams properly. If the streams are not closed properly, after 
using, file can't be deleted in windows. 

Added:

axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/XMLPrettyPrinterTest.java
Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java?rev=1305728&r1=1305727&r2=1305728&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
 Tue Mar 27 04:14:37 2012
@@ -58,7 +58,9 @@ public class XMLPrettyPrinter {
 FileOutputStream outputStream = null;
 byte[] byteArray = null;
 try {
-byteArray = IOUtils.getStreamAsByteArray(new 
FileInputStream(file));
+FileInputStream fin = new FileInputStream(file);
+byteArray = IOUtils.getStreamAsByteArray(fin);
+fin.close();
 inputStream = new ByteArrayInputStream(byteArray);
 outputStream = new FileOutputStream(file);
 
@@ -88,6 +90,18 @@ public class XMLPrettyPrinter {
 log.debug("Pretty printed file : " + file);
 } catch (Throwable t) {
 log.debug("Exception occurred while trying to pretty print file " 
+ file, t);
+
+/* if outputStream is already created, close them, because we are 
going reassign
+ * different value to that. It will leak the file handle 
(specially in windows, since
+ * deleting is going to be an issue)
+ */
+if (outputStream != null) {
+try {
+outputStream.close();
+} catch (IOException e) {
+log.debug(e.getMessage(), e);
+}
+}
 try {
 if (byteArray != null) {
 outputStream = new FileOutputStream(file);

Added: 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/XMLPrettyPrinterTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/XMLPrettyPrinterTest.java?rev=1305728&view=auto
==
--- 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/XMLPrettyPrinterTest.java
 (added)
+++ 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/XMLPrettyPrinterTest.java
 Tue Mar 27 04:14:37 2012
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.axis2.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import junit.framework.TestCase;
+
+public class XMLPrettyPrinterTest extends TestCase {
+/**
+ * This method checks whether the file can be deleted after using 
PrettyPrinter. 
+ * It normally works fine in linux, but if the pretty printer doesn't 
close the streams properly
+ * it will fail in windows. 
+ * @throws IOException
+ */
+public void testPrettifyStreamClose() throws IOException{
+String filePath = new File(".").getAbsolutePath() + File.separator + 
+"target" + File.separator + "test.xml";
+
+//Create new file
+File outputFile = new File(filePath);
+outputFile.createNewFile();
+OutputStream outStream = new FileOutputStream(outputFile);
+outStream.write("test".getBytes());
+outStream.close();
+
+//Prettyfy the output
+XMLPrettyPrinter.prettify(outputFile);
+
+//Delete file
+assertTrue(outputFile.delete());
+}
+
+}