Author: sagara
Date: Thu Apr 19 09:46:09 2012
New Revision: 1327891
URL: http://svn.apache.org/viewvc?rev=1327891&view=rev
Log:
Merged r1327890 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/src/org/apache/rampart/samples/policy/sample05/Client.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/Client.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/Client.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/rampart/trunk:r1327890
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/src/org/apache/rampart/samples/policy/sample05/Client.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/src/org/apache/rampart/samples/policy/sample05/Client.java?rev=1327891&r1=1327890&r2=1327891&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/src/org/apache/rampart/samples/policy/sample05/Client.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample05/src/org/apache/rampart/samples/policy/sample05/Client.java
Thu Apr 19 09:46:09 2012
@@ -21,8 +21,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -33,13 +31,11 @@ import org.apache.neethi.PolicyEngine;
import org.apache.rahas.RahasConstants;
import org.apache.rahas.Token;
import org.apache.rahas.TokenStorage;
-import org.apache.rahas.TrustException;
import org.apache.rahas.TrustUtil;
import org.apache.rahas.client.STSClient;
import org.apache.rampart.RampartMessageData;
import org.apache.ws.secpolicy.SP11Constants;
-import org.apache.ws.secpolicy.SPConstants;
-import org.opensaml.XML;
+import org.opensaml.common.xml.SAMLConstants;
import javax.xml.namespace.QName;
@@ -95,7 +91,7 @@ public class Client {
OMElement rst = resp.getFirstChildWithName(new
QName(RahasConstants.WST_NS_05_02,
RahasConstants.IssuanceBindingLocalNames.
REQUESTED_SECURITY_TOKEN));
- OMElement elem = rst.getFirstChildWithName(new QName(XML.SAML_NS,
"Assertion"));
+ OMElement elem = rst.getFirstChildWithName(new QName(
SAMLConstants.SAML20_NS , "Assertion"));
return elem;
}
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/Client.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/Client.java?rev=1327891&r1=1327890&r2=1327891&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/Client.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/Client.java
Thu Apr 19 09:46:09 2012
@@ -22,7 +22,6 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -31,15 +30,11 @@ import org.apache.axis2.context.Configur
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.rahas.RahasConstants;
-import org.apache.rahas.Token;
-import org.apache.rahas.TokenStorage;
-import org.apache.rahas.TrustException;
import org.apache.rahas.TrustUtil;
-import org.apache.rahas.client.STSClient;
import org.apache.rampart.RampartMessageData;
import org.apache.ws.secpolicy.SP11Constants;
-import org.apache.ws.secpolicy.SPConstants;
-import org.opensaml.XML;
+import org.opensaml.common.xml.SAMLConstants;
+
import javax.xml.namespace.QName;
@@ -80,7 +75,7 @@ public class Client {
OMElement rst = resp.getFirstChildWithName(new
QName(RahasConstants.WST_NS_05_02,
RahasConstants.IssuanceBindingLocalNames.
REQUESTED_SECURITY_TOKEN));
- OMElement elem = rst.getFirstChildWithName(new QName(XML.SAML_NS,
"Assertion"));
+ OMElement elem = rst.getFirstChildWithName(new
QName(SAMLConstants.SAML20_NS, "Assertion"));
return elem;
}
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/Client.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/Client.java?rev=1327891&r1=1327890&r2=1327891&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/Client.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/sample08/src/org/apache/rampart/samples/policy/sample08/Client.java
Thu Apr 19 09:46:09 2012
@@ -19,27 +19,17 @@ package org.apache.rampart.samples.polic
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.rahas.RahasConstants;
import org.apache.rahas.Token;
-import org.apache.rahas.TokenStorage;
-import org.apache.rahas.TrustException;
import org.apache.rahas.TrustUtil;
import org.apache.rahas.client.STSClient;
-import org.apache.rampart.RampartMessageData;
import org.apache.ws.secpolicy.SP11Constants;
-import org.apache.ws.secpolicy.SPConstants;
-import org.opensaml.XML;
+import org.opensaml.common.xml.SAMLConstants;
import javax.xml.namespace.QName;
@@ -77,7 +67,7 @@ public class Client {
OMElement rst = resp.getFirstChildWithName(new
QName(RahasConstants.WST_NS_05_02,
RahasConstants.IssuanceBindingLocalNames.
REQUESTED_SECURITY_TOKEN));
- OMElement elem = rst.getFirstChildWithName(new QName(XML.SAML_NS,
"Assertion"));
+ OMElement elem = rst.getFirstChildWithName(new
QName(SAMLConstants.SAML20_NS, "Assertion"));
return elem;
}
