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

2011-10-29 Thread veithen 
Author: veithen
Date: Sat Oct 29 09:21:45 2011
New Revision: 1194848

URL: http://svn.apache.org/viewvc?rev=1194848&view=rev
Log:
Bootstrap OpenSAML when the Rampart module is initialized, so that the success 
of the test suite no longer depends on the order in which the tests are 
executed.

Modified:

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

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java?rev=1194848&r1=1194847&r2=1194848&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
 Sat Oct 29 09:21:45 2011
@@ -26,11 +26,18 @@ import org.apache.neethi.Policy;
 import org.apache.rampart.policy.model.RampartConfig;
 import org.apache.ws.secpolicy.SP11Constants;
 import org.apache.ws.secpolicy.SP12Constants;
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
 
 public class Rampart implements Module /* , ModulePolicyExtension */  {
 
 public void init(ConfigurationContext configContext, AxisModule module)
 throws AxisFault {
+try {
+DefaultBootstrap.bootstrap();
+} catch (ConfigurationException ex) {
+throw new AxisFault("Failed to bootstrap OpenSAML", ex);
+}
 }
 
 public void engageNotify(AxisDescription axisDescription) throws AxisFault 
{

svn commit: r1194853 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java

2011-10-29 Thread veithen 
Author: veithen
Date: Sat Oct 29 09:37:49 2011
New Revision: 1194853

URL: http://svn.apache.org/viewvc?rev=1194853&view=rev
Log:
Merged r1194848 to the 1.6 branch.

Modified:
axis/axis2/java/rampart/branches/1_6/   (props changed)

axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java

Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 29 09:37:49 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java?rev=1194853&r1=1194852&r2=1194853&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
 Sat Oct 29 09:37:49 2011
@@ -26,11 +26,18 @@ import org.apache.neethi.Policy;
 import org.apache.rampart.policy.model.RampartConfig;
 import org.apache.ws.secpolicy.SP11Constants;
 import org.apache.ws.secpolicy.SP12Constants;
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
 
 public class Rampart implements Module /* , ModulePolicyExtension */  {
 
 public void init(ConfigurationContext configContext, AxisModule module)
 throws AxisFault {
+try {
+DefaultBootstrap.bootstrap();
+} catch (ConfigurationException ex) {
+throw new AxisFault("Failed to bootstrap OpenSAML", ex);
+}
 }
 
 public void engageNotify(AxisDescription axisDescription) throws AxisFault 
{

svn commit: r1194858 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/documentation/src/site/xdoc/download/1.5.1/download.xml modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java

2011-10-29 Thread veithen 
Author: veithen
Date: Sat Oct 29 09:46:26 2011
New Revision: 1194858

URL: http://svn.apache.org/viewvc?rev=1194858&view=rev
Log:
Merged r1194848 to the 1.5 branch.

Modified:
axis/axis2/java/rampart/branches/1_5_x/   (props changed)

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

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

Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 29 09:46:26 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600
+/axis/axis2/java/rampart/trunk:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848

Propchange: 
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 29 09:46:26 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600
+/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848

Modified: 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java?rev=1194858&r1=1194857&r2=1194858&view=diff
==
--- 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
 Sat Oct 29 09:46:26 2011
@@ -26,11 +26,18 @@ import org.apache.neethi.Policy;
 import org.apache.rampart.policy.model.RampartConfig;
 import org.apache.ws.secpolicy.SP11Constants;
 import org.apache.ws.secpolicy.SP12Constants;
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
 
 public class Rampart implements Module /* , ModulePolicyExtension */  {
 
 public void init(ConfigurationContext configContext, AxisModule module)
 throws AxisFault {
+try {
+DefaultBootstrap.bootstrap();
+} catch (ConfigurationException ex) {
+throw new AxisFault("Failed to bootstrap OpenSAML", ex);
+}
 }
 
 public void engageNotify(AxisDescription axisDescription) throws AxisFault 
{

svn commit: r1194977 - in /axis/axis2/java/core/trunk/modules/kernel: src/org/apache/axis2/transport/http/ src/org/apache/axis2/transport/http/util/ test/org/apache/axis2/transport/http/

2011-10-29 Thread sagara 
Author: sagara
Date: Sat Oct 29 19:08:15 2011
New Revision: 1194977

URL: http://svn.apache.org/viewvc?rev=1194977&view=rev
Log:
Fixed - AXIS2-3933
Ported MultipartFormDataFormatter to use Axiom MultipartWriter.
Deprecated ComplexPart class.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/ComplexPart.java

axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/MultipartFormDataFormatterTest.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java?rev=1194977&r1=1194976&r2=1194977&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
 Sat Oct 29 19:08:15 2011
@@ -23,19 +23,16 @@ import org.apache.axiom.om.OMAbstractFac
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.OMMultipartWriter;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.util.ComplexPart;
 import org.apache.axis2.transport.http.util.URLTemplatingUtil;
-import org.apache.commons.httpclient.methods.multipart.Part;
-import org.apache.commons.httpclient.methods.multipart.StringPart;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Iterator;
 
 /**
@@ -85,23 +82,14 @@ public class MultipartFormDataFormatter 
  * message format.
  */
 public byte[] getBytes(MessageContext messageContext, OMOutputFormat 
format) throws AxisFault {
-
 OMElement omElement = 
messageContext.getEnvelope().getBody().getFirstElement();
-
-Part[] parts = createMultipatFormDataRequest(omElement);
-if (parts.length > 0) {
-ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-try {
-
-// This is accessing a class of Commons-FlieUpload
-Part.sendParts(bytesOut, parts, 
format.getMimeBoundary().getBytes());
-} catch (IOException e) {
-throw AxisFault.makeFault(e);
-}
+ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+try {
+createMultipatFormDataRequest(omElement, bytesOut, format);
 return bytesOut.toByteArray();
-}
-
-return new byte[0];  //To change body of implemented methods use File 
| Settings | File Templates.
+} catch (IOException e) {
+throw new AxisFault(e.getMessage());
+} 
 }
 
 /**
@@ -175,14 +163,18 @@ public class MultipartFormDataFormatter 
 
 /**
  * @param dataOut
+ * @param bytesOut 
+ * @param format 
  * @return
+ * @throws IOException 
  */
-private Part[] createMultipatFormDataRequest(OMElement dataOut) {
-ArrayList parts = new ArrayList();
+private void createMultipatFormDataRequest(OMElement dataOut, 
ByteArrayOutputStream bytesOut,
+OMOutputFormat format) throws IOException {
 if (dataOut != null) {
 Iterator iter1 = dataOut.getChildElements();
 OMFactory omFactory = OMAbstractFactory.getOMFactory();
-while (iter1.hasNext()) {
+OMMultipartWriter writer = new OMMultipartWriter(bytesOut, format);
+while (iter1.hasNext()) {   
 OMElement ele = (OMElement) iter1.next();
 Iterator iter2 = ele.getChildElements();
 // check whether the element is a complex type
@@ -190,15 +182,20 @@ public class MultipartFormDataFormatter 
 OMElement omElement =
 
omFactory.createOMElement(ele.getQName().getLocalPart(), null);
 omElement.addChild(
-processComplexType(omElement, 
ele.getChildElements(), omFactory));
-parts.add(new ComplexPart(ele.getQName().getLocalPart(), 
omElement.toString()));
+processComplexType(omElement, 
ele.getChildElements(), omFactory));   
+OutputStream partOutputStream = 
writer.writePart(DEFAULT_CONTENT_TYPE, null,
+DISPOSITION_TYPE, "name=\"" + 
omElement.getLocalName() + "\"");
+

svn commit: r1194978 - in /axis/axis2/java/core/trunk/modules: kernel/pom.xml transport/http/pom.xml

2011-10-29 Thread sagara 
Author: sagara
Date: Sat Oct 29 19:08:53 2011
New Revision: 1194978

URL: http://svn.apache.org/viewvc?rev=1194978&view=rev
Log:
Moved Http client dependency from kernal module to HTTP module. 

Modified:
axis/axis2/java/core/trunk/modules/kernel/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml

Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=1194978&r1=1194977&r2=1194978&view=diff
==
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Sat Oct 29 19:08:53 2011
@@ -54,10 +54,6 @@
 servlet-api
 
 
-commons-httpclient
-commons-httpclient
-
-
 commons-fileupload
 commons-fileupload
 

Modified: axis/axis2/java/core/trunk/modules/transport/http/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=1194978&r1=1194977&r2=1194978&view=diff
==
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Sat Oct 29 
19:08:53 2011
@@ -105,5 +105,9 @@
 org.apache.httpcomponents
 httpcore
 
+
+commons-httpclient
+commons-httpclient
+

svn commit: r1194994 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/Rampart.java rampart-trust-mar/module.xml rampart-trust/src/main/java/org/apache/rahas/R

2011-10-29 Thread veithen 
Author: veithen
Date: Sat Oct 29 19:41:14 2011
New Revision: 1194994

URL: http://svn.apache.org/viewvc?rev=1194994&view=rev
Log:
Moved the OpenSAML initialization to the right place, i.e. the init method of 
the Rahas module.

Added:

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
   (with props)
Modified:

axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java?rev=1194994&r1=1194993&r2=1194994&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
 Sat Oct 29 19:41:14 2011
@@ -26,18 +26,11 @@ import org.apache.neethi.Policy;
 import org.apache.rampart.policy.model.RampartConfig;
 import org.apache.ws.secpolicy.SP11Constants;
 import org.apache.ws.secpolicy.SP12Constants;
-import org.opensaml.DefaultBootstrap;
-import org.opensaml.xml.ConfigurationException;
 
 public class Rampart implements Module /* , ModulePolicyExtension */  {
 
 public void init(ConfigurationContext configContext, AxisModule module)
 throws AxisFault {
-try {
-DefaultBootstrap.bootstrap();
-} catch (ConfigurationException ex) {
-throw new AxisFault("Failed to bootstrap OpenSAML", ex);
-}
 }
 
 public void engageNotify(AxisDescription axisDescription) throws AxisFault 
{

Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml?rev=1194994&r1=1194993&r2=1194994&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml 
(original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml Sat Oct 
29 19:41:14 2011
@@ -1,4 +1,4 @@
-
+
 This module is used to STS enable a service where it adds
 the RequestSecurityToken operation to a service that the module is 
engaged to
 

Added: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java?rev=1194994&view=auto
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
 (added)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
 Sat Oct 29 19:41:14 2011
@@ -0,0 +1,55 @@
+/*
+ * 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.rahas;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.modules.Module;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.Policy;
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
+
+public class Rahas implements Module {
+public void init(ConfigurationContext configContext, AxisModule module)
+throws AxisFault {
+try {
+DefaultBootstrap.bootstrap();
+} catch (ConfigurationException ex) {
+throw new AxisFault("Failed to bootstrap OpenSAML", ex);
+}
+}
+
+public void engageNotify(AxisDescription axisDescription) throws AxisFault 
{
+}
+
+public boolean canSupportAssertion(Assertion assertion) {
+return false;
+}
+
+public void applyPolicy(Policy policy, AxisDescription axisDescription)
+t

svn commit: r1195044 - in /axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas: ./ client/ impl/ impl/util/

2011-10-29 Thread veithen 
Author: veithen
Date: Sat Oct 29 21:40:27 2011
New Revision: 1195044

URL: http://svn.apache.org/viewvc?rev=1195044&view=rev
Log:
Replaced tabs by spaces and fixed some other formatting issues.

Modified:

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

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

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

axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/STSMessageReceiver.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/TokenRequestDispatcher.java

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

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/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

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

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

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

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

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

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

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

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==
--- 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
 Sat Oct 29 21:40:27 2011
@@ -33,7 +33,7 @@ import org.apache.axiom.om.OMElement;
  *
  */
 public class EncryptedKeyToken extends Token {
-   
+
 /**
  * SHA1 value of the encrypted key
  */
@@ -42,29 +42,29 @@ public class EncryptedKeyToken extends T
 public EncryptedKeyToken(){
 super();
 }
-   
-   public EncryptedKeyToken (String id,Date created, Date expires) {
-   super(id,created,expires);
-   }
-   
-   public EncryptedKeyToken (String id, OMElement tokenElem, 
-   Date created, Date expires)throws 
TrustException{
-   super(id,tokenElem,created,expires);
-   }
-   
-   /**
-* @param sha SHA1 of the encrypted key
-*/
-   public void setSHA1(String sha) {
-   this.sha = sha;
-   }
-   
-   /** 
-* @return SHA1 value of the encrypted key 
-*/
-   public String getSHA1() {
-   return sha;
-   }
+
+public EncryptedKeyToken (String id,Date created, Date expires) {
+super(id,created,expires);
+}
+
+public EncryptedKeyToken (String id, OMElement tokenElem, 
+Date created, Date expires)throws 
TrustException{
+super(id,tokenElem,created,expires);
+}
+
+/**
+ * @param sha SHA1 of the encrypted key
+ */
+public void setSHA1(String sha) {
+this.sha = sha;
+}
+
+/** 
+ * @return SHA1 value of the encrypted key 
+ */
+public String getSHA1() {
+return sha;
+}
 
 public void writeExternal(ObjectOutput out)
 throws IOException {

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==
--- 
axis/axis2/java/rampart/