You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/30 17:29:59 UTC
svn commit: r1780951 [6/10] - in
/axis/axis2/java/rampart/branches/RAMPART-289: ./ legal/
modules/distribution/ modules/documentation/
modules/documentation/src/site/resources/download/
modules/documentation/src/site/xdoc/ modules/documentation/src/sit...
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java Mon Jan 30 17:29:58 2017
@@ -77,32 +77,15 @@ public class RequiredElements extends Ab
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localName = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix;
- String writerPrefix = writer.getPrefix(namespaceURI);
-
- if (writerPrefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- } else {
- prefix = writerPrefix;
- }
-
// <sp:RequiredElements>
- writer.writeStartElement(prefix, localName, namespaceURI);
+ writeStartElement(writer, prefix, localName, namespaceURI);
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
-
- if (writerPrefix == null) {
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
- }
-
if (xPathVersion != null) {
- writer.writeAttribute(prefix, namespaceURI, SPConstants.XPATH_VERSION, xPathVersion);
+ writeAttribute(writer, prefix, namespaceURI, SPConstants.XPATH_VERSION, xPathVersion);
}
String xpathExpression;
@@ -111,7 +94,7 @@ public class RequiredElements extends Ab
.hasNext();) {
xpathExpression = (String) iterator.next();
// <sp:XPath ..>
- writer.writeStartElement(prefix, SPConstants.XPATH_EXPR, namespaceURI);
+ writeStartElement(writer, prefix, SPConstants.XPATH_EXPR, namespaceURI);
writer.writeCharacters(xpathExpression);
writer.writeEndElement();
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java Mon Jan 30 17:29:58 2017
@@ -60,27 +60,18 @@ public class RequiredParts extends Abstr
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localName = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
-
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:RequiredParts>
- writer.writeStartElement(prefix, localName, namespaceURI);
-
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
+ writeStartElement(writer, prefix, localName, namespaceURI);
Header header;
for (Iterator iterator = headers.iterator(); iterator.hasNext();) {
header = (Header) iterator.next();
// <sp:Header Name=".." Namespace=".." />
- writer.writeStartElement(prefix, SPConstants.HEADER, namespaceURI);
+ writeStartElement(writer, prefix, SPConstants.HEADER, namespaceURI);
// Name attribute is optional
if (header.getName() != null) {
writer.writeAttribute("Name", header.getName());
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java Mon Jan 30 17:29:58 2017
@@ -69,26 +69,12 @@ public class SecureConversationToken ext
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localname = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix;
-
- String writerPrefix = writer.getPrefix(namespaceURI);
-
- if (writerPrefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- } else {
- prefix = writerPrefix;
- }
// <sp:SecureConversationToken>
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- if (writerPrefix == null) {
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
- }
+ writeStartElement(writer, prefix, localname, namespaceURI);
String inclusion;
@@ -99,12 +85,12 @@ public class SecureConversationToken ext
}
if (inclusion != null) {
- writer.writeAttribute(prefix, namespaceURI, SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
+ writeAttribute(writer, prefix, namespaceURI, SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
}
if (issuerEpr != null) {
// <sp:Issuer>
- writer.writeStartElement(prefix, SPConstants.ISSUER , namespaceURI);
+ writeStartElement(writer, prefix, SPConstants.ISSUER , namespaceURI);
issuerEpr.serialize(writer);
@@ -114,47 +100,27 @@ public class SecureConversationToken ext
if (isDerivedKeys() || isRequireExternalUriRef()
|| isSc10SecurityContextToken() || (bootstrapPolicy != null)) {
- String wspNamespaceURI = SPConstants.POLICY.getNamespaceURI();
-
- String wspPrefix;
-
- String wspWriterPrefix = writer.getPrefix(wspNamespaceURI);
-
- if (wspWriterPrefix == null) {
- wspPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(wspPrefix, wspNamespaceURI);
-
- } else {
- wspPrefix = wspWriterPrefix;
- }
-
// <wsp:Policy>
- writer.writeStartElement(wspPrefix,
- SPConstants.POLICY.getLocalPart(), wspNamespaceURI);
+ writeStartElement(writer, SPConstants.POLICY);
- if (wspWriterPrefix == null) {
- // xmlns:wsp=".."
- writer.writeNamespace(wspPrefix, wspNamespaceURI);
- }
-
if (isDerivedKeys()) {
// <sp:RequireDerivedKeys />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
}
if (isRequireExternalUriRef()) {
// <sp:RequireExternalUriReference />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE, namespaceURI);
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE, namespaceURI);
}
if (isSc10SecurityContextToken()) {
// <sp:SC10SecurityContextToken />
- writer.writeEmptyElement(prefix, SPConstants.SC10_SECURITY_CONTEXT_TOKEN, namespaceURI);
+ writeEmptyElement(writer, prefix, SPConstants.SC10_SECURITY_CONTEXT_TOKEN, namespaceURI);
}
if (bootstrapPolicy != null) {
// <sp:BootstrapPolicy ..>
- writer.writeStartElement(prefix, SPConstants.BOOTSTRAP_POLICY, namespaceURI);
+ writeStartElement(writer, prefix, SPConstants.BOOTSTRAP_POLICY, namespaceURI);
bootstrapPolicy.serialize(writer);
writer.writeEndElement();
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java Mon Jan 30 17:29:58 2017
@@ -59,51 +59,11 @@ public class SignatureToken extends Abst
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
-
- String localname = getName().getLocalPart();
- String namespaceURI = getName().getNamespaceURI();
-
- String prefix;
- String writerPrefix = writer.getPrefix(namespaceURI);
-
- if (writerPrefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
-
- } else {
- prefix = writerPrefix;
- }
-
// <sp:SignatureToken>
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- if (writerPrefix == null) {
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
- }
-
-
- String wspNamespaceURI = SPConstants.POLICY.getNamespaceURI();
-
- String wspPrefix;
-
- String wspWriterPrefix = writer.getPrefix(wspNamespaceURI);
-
- if (wspWriterPrefix == null) {
- wspPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(wspPrefix, wspNamespaceURI);
-
- } else {
- wspPrefix = wspWriterPrefix;
- }
+ writeStartElement(writer, getName());
// <wsp:Policy>
- writer.writeStartElement(wspPrefix, SPConstants.POLICY.getLocalPart(), wspNamespaceURI);
-
- if (wspWriterPrefix == null) {
- // xmlns:wsp=".."
- writer.writeNamespace(wspPrefix, wspNamespaceURI);
- }
+ writeStartElement(writer, SPConstants.POLICY);
if (signatureToken == null) {
throw new RuntimeException("EncryptionToken is not set");
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java Mon Jan 30 17:29:58 2017
@@ -91,24 +91,15 @@ public class SignedEncryptedElements ext
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localName = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
-
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:SignedElements> | <sp:EncryptedElements>
- writer.writeStartElement(prefix, localName, namespaceURI);
+ writeStartElement(writer, prefix, localName, namespaceURI);
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
-
if (xPathVersion != null) {
- writer.writeAttribute(prefix, namespaceURI, SPConstants.XPATH_VERSION, xPathVersion);
+ writeAttribute(writer, prefix, namespaceURI, SPConstants.XPATH_VERSION, xPathVersion);
}
String xpathExpression;
@@ -117,7 +108,7 @@ public class SignedEncryptedElements ext
.hasNext();) {
xpathExpression = (String) iterator.next();
// <sp:XPath ..>
- writer.writeStartElement(prefix, SPConstants.XPATH_EXPR, namespaceURI);
+ writeStartElement(writer, prefix, SPConstants.XPATH_EXPR, namespaceURI);
Iterator<String> namespaces = declaredNamespaces.keySet().iterator();
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java Mon Jan 30 17:29:58 2017
@@ -124,33 +124,23 @@ public class SignedEncryptedParts extend
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localName = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
-
- String prefix = writer.getPrefix(namespaceURI);
-
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
// <sp:SignedParts> | <sp:EncryptedParts>
- writer.writeStartElement(prefix, localName, namespaceURI);
-
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
+ writeStartElement(writer, prefix, localName, namespaceURI);
if (isBody()) {
// <sp:Body />
- writer.writeStartElement(prefix, SPConstants.BODY, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.BODY, namespaceURI);
}
Header header;
for (Iterator iterator = headers.iterator(); iterator.hasNext();) {
header = (Header) iterator.next();
// <sp:Header Name=".." Namespace=".." />
- writer.writeStartElement(prefix, SPConstants.HEADER, namespaceURI);
+ writeStartElement(writer, prefix, SPConstants.HEADER, namespaceURI);
// Name attribute is optional
if (header.getName() != null) {
writer.writeAttribute("Name", header.getName());
@@ -162,8 +152,7 @@ public class SignedEncryptedParts extend
if (isAttachments() && version == SPConstants.SP_V12) {
// <sp:Attachments />
- writer.writeStartElement(prefix, SPConstants.ATTACHMENTS, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.ATTACHMENTS, namespaceURI);
}
// </sp:SignedParts> | </sp:EncryptedParts>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java Mon Jan 30 17:29:58 2017
@@ -282,30 +282,11 @@ public class SupportingToken extends Abs
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- String namespaceURI = getName().getNamespaceURI();
-
- String prefix = writer.getPrefix(namespaceURI);
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
- String localname = getName().getLocalPart();
-
// <sp:SupportingToken>
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
+ writeStartElement(writer, getName());
- String pPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (pPrefix == null) {
- pPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(pPrefix, SPConstants.POLICY.getNamespaceURI());
- }
// <wsp:Policy>
- writer.writeStartElement(pPrefix, SPConstants.POLICY.getLocalPart(),
- SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
Token token;
for (Iterator iterator = getTokens().iterator(); iterator.hasNext();) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java Mon Jan 30 17:29:58 2017
@@ -151,40 +151,15 @@ public class SymmetricBinding extends Sy
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localname = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix;
- String writerPrefix = writer.getPrefix(namespaceURI);
-
- if (writerPrefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- } else {
- prefix = writerPrefix;
- }
-
// <sp:SymmetricBinding>
- writer.writeStartElement(prefix, localname, namespaceURI);
+ writeStartElement(writer, prefix, localname, namespaceURI);
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
-
- String policyLocalName = SPConstants.POLICY.getLocalPart();
- String policyNamespaceURI = SPConstants.POLICY.getNamespaceURI();
-
- String wspPrefix;
-
- String wspWriterPrefix = writer.getPrefix(policyNamespaceURI);
- if (wspWriterPrefix == null) {
- wspPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(wspPrefix, policyNamespaceURI);
-
- } else {
- wspPrefix = wspWriterPrefix;
- }
// <wsp:Policy>
- writer.writeStartElement(wspPrefix, policyLocalName, policyNamespaceURI);
+ writeStartElement(writer, SPConstants.POLICY);
if (encryptionToken != null) {
encryptionToken.serialize(writer);
@@ -212,20 +187,17 @@ public class SymmetricBinding extends Sy
if (isIncludeTimestamp()) {
// <sp:IncludeTimestamp />
- writer.writeStartElement(prefix, SPConstants.INCLUDE_TIMESTAMP, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.INCLUDE_TIMESTAMP, namespaceURI);
}
if (SPConstants.ENCRYPT_BEFORE_SIGNING.equals(getProtectionOrder())) {
// <sp:EncryptBeforeSigning />
- writer.writeStartElement(prefix, SPConstants.ENCRYPT_BEFORE_SIGNING, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.ENCRYPT_BEFORE_SIGNING, namespaceURI);
}
if (isSignatureProtection()) {
// <sp:EncryptSignature />
- writer.writeStartElement(prefix, SPConstants.ENCRYPT_SIGNATURE , namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.ENCRYPT_SIGNATURE , namespaceURI);
}
if(isEntireHeadersAndBodySignatures()) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java Mon Jan 30 17:29:58 2017
@@ -142,28 +142,15 @@ public class TransportBinding extends Bi
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localName = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
-
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:TransportBinding>
- writer.writeStartElement(prefix, localName, namespaceURI);
- writer.writeNamespace(prefix, namespaceURI);
-
- String pPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (pPrefix == null) {
- pPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(pPrefix, SPConstants.POLICY.getNamespaceURI());
- }
+ writeStartElement(writer, prefix, localName, namespaceURI);
// <wsp:Policy>
- writer.writeStartElement(pPrefix, SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
if (transportToken == null) {
@@ -192,10 +179,8 @@ public class TransportBinding extends Bi
}
if (isIncludeTimestamp()) {
- // <sp:IncludeTimestamp>
- writer.writeStartElement(prefix, SPConstants.INCLUDE_TIMESTAMP, namespaceURI);
- writer.writeEndElement();
- // </sp:IncludeTimestamp>
+ // <sp:IncludeTimestamp />
+ writeEmptyElement(writer, prefix, SPConstants.INCLUDE_TIMESTAMP, namespaceURI);
}
// </wsp:Policy>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java Mon Jan 30 17:29:58 2017
@@ -62,29 +62,11 @@ public class TransportToken extends Abst
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
-
- String localName = getName().getLocalPart();
- String namespaceURI = getName().getNamespaceURI();
-
- String prefix = writer.getPrefix(namespaceURI);
-
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:TransportToken>
-
- writer.writeStartElement(prefix, localName, namespaceURI);
-
- String wspPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (wspPrefix == null) {
- wspPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(wspPrefix, SPConstants.POLICY.getNamespaceURI());
- }
+ writeStartElement(writer, getName());
// <wsp:Policy>
- writer.writeStartElement(SPConstants.POLICY.getPrefix(), SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
// serialization of the token ..
if (transportToken != null) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java Mon Jan 30 17:29:58 2017
@@ -131,58 +131,40 @@ public class Trust10 extends AbstractSec
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localname = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:Trust10>
- writer.writeStartElement(prefix, localname, namespaceURI);
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
-
- String wspPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (wspPrefix == null) {
- wspPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(wspPrefix, SPConstants.POLICY.getNamespaceURI());
- }
+ writeStartElement(writer, prefix, localname, namespaceURI);
// <wsp:Policy>
- writer.writeStartElement(SPConstants.POLICY.getPrefix(), SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
if (isMustSupportClientChallenge()) {
// <sp:MustSupportClientChallenge />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_CLIENT_CHALLENGE, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_CLIENT_CHALLENGE, namespaceURI);
}
if (isMustSupportServerChallenge()) {
// <sp:MustSupportServerChallenge />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_SERVER_CHALLENGE, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_SERVER_CHALLENGE, namespaceURI);
}
if (isRequireClientEntropy()) {
// <sp:RequireClientEntropy />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_CLIENT_ENTROPY, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_CLIENT_ENTROPY, namespaceURI);
}
if (isRequireServerEntropy()) {
// <sp:RequireServerEntropy />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_SERVER_ENTROPY, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_SERVER_ENTROPY, namespaceURI);
}
if (isMustSupportIssuedTokens()) {
// <sp:MustSupportIssuedTokens />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_ISSUED_TOKENS, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_ISSUED_TOKENS, namespaceURI);
}
// </wsp:Policy>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java Mon Jan 30 17:29:58 2017
@@ -161,71 +161,50 @@ public class Trust13 extends AbstractSec
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localname = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:Trust13>
- writer.writeStartElement(prefix, localname, namespaceURI);
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
-
- String wspPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
-
- if (wspPrefix == null) {
- wspPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(wspPrefix, SPConstants.POLICY.getNamespaceURI());
- }
+ writeStartElement(writer, prefix, localname, namespaceURI);
// <wsp:Policy>
- writer.writeStartElement(SPConstants.POLICY.getPrefix(), SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
if (isMustSupportClientChallenge()) {
// <sp:MustSupportClientChallenge />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_CLIENT_CHALLENGE, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_CLIENT_CHALLENGE, namespaceURI);
}
if (isMustSupportServerChallenge()) {
// <sp:MustSupportServerChallenge />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_SERVER_CHALLENGE, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_SERVER_CHALLENGE, namespaceURI);
}
if (isRequireClientEntropy()) {
// <sp:RequireClientEntropy />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_CLIENT_ENTROPY, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_CLIENT_ENTROPY, namespaceURI);
}
if (isRequireServerEntropy()) {
// <sp:RequireServerEntropy />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_SERVER_ENTROPY, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_SERVER_ENTROPY, namespaceURI);
}
if (isMustSupportIssuedTokens()) {
// <sp:MustSupportIssuedTokens />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_ISSUED_TOKENS, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_ISSUED_TOKENS, namespaceURI);
}
if (isRequireRequestSecurityTokenCollection()) {
// <sp:RequireRequestSecurityTokenCollection />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_REQUEST_SECURITY_TOKEN_COLLECTION, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_REQUEST_SECURITY_TOKEN_COLLECTION, namespaceURI);
}
if (isRequireAppliesTo()) {
// <sp:RequireAppliesTo />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_APPLIES_TO, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_APPLIES_TO, namespaceURI);
}
// </wsp:Policy>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java Mon Jan 30 17:29:58 2017
@@ -91,19 +91,12 @@ public class UsernameToken extends Token
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localname = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:UsernameToken
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- writer.writeNamespace(prefix, namespaceURI);
+ writeStartElement(writer, prefix, localname, namespaceURI);
String inclusion;
@@ -114,49 +107,36 @@ public class UsernameToken extends Token
}
if (inclusion != null) {
- writer.writeAttribute(prefix, namespaceURI, SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
+ writeAttribute(writer, prefix, namespaceURI, SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
}
if (isUseUTProfile10() || isUseUTProfile11()) {
- String pPrefix = writer.getPrefix(SPConstants.POLICY
- .getNamespaceURI());
- if (pPrefix == null) {
- writer.setPrefix(SPConstants.POLICY.getPrefix(), SPConstants.POLICY
- .getNamespaceURI());
- }
-
// <wsp:Policy>
- writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(),
- SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
// CHECKME
if (isUseUTProfile10()) {
// <sp:WssUsernameToken10 />
- writer.writeStartElement(prefix, SPConstants.USERNAME_TOKEN10 , namespaceURI);
+ writeStartElement(writer, prefix, SPConstants.USERNAME_TOKEN10 , namespaceURI);
} else {
// <sp:WssUsernameToken11 />
- writer.writeStartElement(prefix, SPConstants.USERNAME_TOKEN11 , namespaceURI);
+ writeStartElement(writer, prefix, SPConstants.USERNAME_TOKEN11 , namespaceURI);
}
if (version == SPConstants.SP_V12) {
if (isNoPassword()) {
- writer.writeStartElement(prefix, SPConstants.NO_PASSWORD, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.NO_PASSWORD, namespaceURI);
} else if (isHashPassword()){
- writer.writeStartElement(prefix, SPConstants.HASH_PASSWORD, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.HASH_PASSWORD, namespaceURI);
}
if (isDerivedKeys()) {
- writer.writeStartElement(prefix, SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
} else if (isExplicitDerivedKeys()) {
- writer.writeStartElement(prefix, SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, namespaceURI);
} else if (isImpliedDerivedKeys()) {
- writer.writeStartElement(prefix, SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, namespaceURI);
}
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java Mon Jan 30 17:29:58 2017
@@ -98,53 +98,34 @@ public class Wss10 extends AbstractSecur
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localname = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:Wss10>
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
-
- String pPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (pPrefix == null) {
- writer.setPrefix(SPConstants.POLICY.getPrefix(), SPConstants.POLICY.getNamespaceURI());
- }
+ writeStartElement(writer, prefix, localname, namespaceURI);
// <wsp:Policy>
- writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
if (isMustSupportRefKeyIdentifier()) {
// <sp:MustSupportRefKeyIdentifier />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_KEY_IDENTIFIER, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_KEY_IDENTIFIER, namespaceURI);
}
if (isMustSupportRefIssuerSerial()) {
// <sp:MustSupportRefIssuerSerial />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_ISSUER_SERIAL, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_ISSUER_SERIAL, namespaceURI);
}
if (isMustSupportRefExternalURI()) {
// <sp:MustSupportRefExternalURI />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_EXTERNAL_URI, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_EXTERNAL_URI, namespaceURI);
}
if (isMustSupportRefEmbeddedToken()) {
// <sp:MustSupportRefEmbeddedToken />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_EMBEDDED_TOKEN, namespaceURI);
- writer.writeEndElement();
-
-
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_EMBEDDED_TOKEN, namespaceURI);
}
// </wsp:Policy>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java Mon Jan 30 17:29:58 2017
@@ -80,69 +80,49 @@ public class Wss11 extends Wss10 {
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localname = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:Wss11>
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- // xmlns:sp=".."
- writer.writeNamespace(prefix, namespaceURI);
-
- String pPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (pPrefix == null) {
- writer.setPrefix(SPConstants.POLICY.getPrefix(), SPConstants.POLICY.getNamespaceURI());
- }
+ writeStartElement(writer, prefix, localname, namespaceURI);
// <wsp:Policy>
- writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
// <sp:MustSupportRefKeyIndentifier />
if (isMustSupportRefKeyIdentifier()) {
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_KEY_IDENTIFIER , namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_KEY_IDENTIFIER , namespaceURI);
}
if (isMustSupportRefIssuerSerial()) {
// <sp:MustSupportRefIssuerSerial />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_ISSUER_SERIAL , namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_ISSUER_SERIAL , namespaceURI);
}
if (isMustSupportRefExternalURI()) {
// <sp:MustSupportRefExternalURI />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_EXTERNAL_URI , namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_EXTERNAL_URI , namespaceURI);
}
if (isMustSupportRefEmbeddedToken()) {
// <sp:MustSupportRefEmbeddedToken />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_EMBEDDED_TOKEN , namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_EMBEDDED_TOKEN , namespaceURI);
}
if (isMustSupportRefThumbprint()) {
// <sp:MustSupportRefThumbprint />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_THUMBPRINT , namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_THUMBPRINT , namespaceURI);
}
if (isMustSupportRefEncryptedKey()) {
// <sp:MustSupportRefEncryptedKey />
- writer.writeStartElement(prefix, SPConstants.MUST_SUPPORT_REF_ENCRYPTED_KEY , namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.MUST_SUPPORT_REF_ENCRYPTED_KEY , namespaceURI);
}
if (isRequireSignatureConfirmation()) {
// <sp:RequireSignatureConfirmation />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_SIGNATURE_CONFIRMATION , namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_SIGNATURE_CONFIRMATION , namespaceURI);
}
// </wsp:Policy>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java Mon Jan 30 17:29:58 2017
@@ -147,18 +147,12 @@ public class X509Token extends Token {
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
+ String prefix = getName().getPrefix();
String localName = getName().getLocalPart();
String namespaceURI = getName().getNamespaceURI();
- String prefix = writer.getPrefix(namespaceURI);
-
- if (prefix == null) {
- prefix = getName().getPrefix();
- writer.setPrefix(prefix, namespaceURI);
- }
-
// <sp:X509Token>
- writer.writeStartElement(prefix, localName, namespaceURI);
+ writeStartElement(writer, prefix, localName, namespaceURI);
String inclusion;
@@ -169,53 +163,40 @@ public class X509Token extends Token {
}
if (inclusion != null) {
- writer.writeAttribute(prefix, namespaceURI, SPConstants.ATTR_INCLUDE_TOKEN , inclusion);
- }
-
-
- String pPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (pPrefix == null) {
- pPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(pPrefix, SPConstants.POLICY.getNamespaceURI());
+ writeAttribute(writer, prefix, namespaceURI, SPConstants.ATTR_INCLUDE_TOKEN , inclusion);
}
// <wsp:Policy>
- writer.writeStartElement(pPrefix, SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
if (isRequireKeyIdentifierReference()) {
// <sp:RequireKeyIdentifierReference />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_KEY_IDENTIFIRE_REFERENCE, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_KEY_IDENTIFIRE_REFERENCE, namespaceURI);
}
if (isRequireIssuerSerialReference()) {
// <sp:RequireIssuerSerialReference />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_ISSUER_SERIAL_REFERENCE, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_ISSUER_SERIAL_REFERENCE, namespaceURI);
}
if (isRequireEmbeddedTokenReference()) {
// <sp:RequireEmbeddedTokenReference />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_EMBEDDED_TOKEN_REFERENCE, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_EMBEDDED_TOKEN_REFERENCE, namespaceURI);
}
if (isRequireThumbprintReference()) {
// <sp:RequireThumbprintReference />
- writer.writeStartElement(prefix, SPConstants.REQUIRE_THUMBPRINT_REFERENCE, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_THUMBPRINT_REFERENCE, namespaceURI);
}
if (tokenVersionAndType != null) {
// <sp:WssX509V1Token10 /> | ..
- writer.writeStartElement(prefix, tokenVersionAndType, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, tokenVersionAndType, namespaceURI);
}
if(isDerivedKeys()) {
// <sp:RequireDerivedKeys/>
- writer.writeStartElement(prefix, SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
}
// </wsp:Policy>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java Mon Jan 30 17:29:58 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.model.Alg
import javax.xml.namespace.QName;
-public class AlgorithmSuiteBuilder implements AssertionBuilder {
+public class AlgorithmSuiteBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java Mon Jan 30 17:29:58 2017
@@ -34,7 +34,7 @@ import org.apache.ws.secpolicy.model.Ini
import org.apache.ws.secpolicy.model.Layout;
import org.apache.ws.secpolicy.model.RecipientToken;
-public class AsymmetricBindingBuilder implements AssertionBuilder {
+public class AsymmetricBindingBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java Mon Jan 30 17:29:58 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
-public class EncryptedElementsBuilder implements AssertionBuilder {
+public class EncryptedElementsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
SignedEncryptedElements signedEncryptedElements = new SignedEncryptedElements(false, SPConstants.SP_V11);
@@ -64,7 +64,7 @@ public class EncryptedElementsBuilder im
private void processElement(OMElement element, SignedEncryptedElements parent) {
if (SP11Constants.XPATH.equals(element.getQName())) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(), nm.getPrefix());
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java Mon Jan 30 17:29:58 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.model.Header;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
-public class EncryptedPartsBuilder implements AssertionBuilder {
+public class EncryptedPartsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.model.InitiatorToken;
import org.apache.ws.secpolicy.model.Token;
-public class InitiatorTokenBuilder implements AssertionBuilder {
+public class InitiatorTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -32,7 +32,7 @@ import javax.xml.namespace.QName;
import java.util.Iterator;
import java.util.List;
-public class IssuedTokenBuilder implements AssertionBuilder {
+public class IssuedTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java Mon Jan 30 17:29:58 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Layout;
-public class LayoutBuilder implements AssertionBuilder {
+public class LayoutBuilder implements AssertionBuilder<OMElement> {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.model.ProtectionToken;
import org.apache.ws.secpolicy.model.Token;
-public class ProtectionTokenBuilder implements AssertionBuilder {
+public class ProtectionTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
ProtectionToken protectionToken = new ProtectionToken(SPConstants.SP_V11);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.model.RecipientToken;
import org.apache.ws.secpolicy.model.Token;
-public class RecipientTokenBuilder implements AssertionBuilder {
+public class RecipientTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java Mon Jan 30 17:29:58 2017
@@ -29,7 +29,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.model.RequiredElements;
-public class RequiredElementsBuilder implements AssertionBuilder {
+public class RequiredElementsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
@@ -56,7 +56,7 @@ public class RequiredElementsBuilder imp
QName name = element.getQName();
if (SP11Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(), nm.getPrefix());
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -28,7 +28,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SecureConversationToken;
-public class SecureConversationTokenBuilder implements AssertionBuilder {
+public class SecureConversationTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -26,7 +26,7 @@ import org.apache.ws.secpolicy.model.Sec
import javax.xml.namespace.QName;
-public class SecurityContextTokenBuilder implements AssertionBuilder {
+public class SecurityContextTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java Mon Jan 30 17:29:58 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
-public class SignedElementsBuilder implements AssertionBuilder {
+public class SignedElementsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
@@ -62,7 +62,7 @@ public class SignedElementsBuilder imple
QName name = element.getQName();
if (SP11Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(), nm.getPrefix());
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java Mon Jan 30 17:29:58 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.model.Header;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
-public class SignedPartsBuilder implements AssertionBuilder {
+public class SignedPartsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
SignedEncryptedParts signedEncryptedParts = new SignedEncryptedParts(true, SPConstants.SP_V11);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java Mon Jan 30 17:29:58 2017
@@ -36,7 +36,7 @@ import org.apache.ws.secpolicy.model.Sig
import org.apache.ws.secpolicy.model.SupportingToken;
import org.apache.ws.secpolicy.model.Token;
-public class SupportingTokensBuilder implements AssertionBuilder {
+public class SupportingTokensBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java Mon Jan 30 17:29:58 2017
@@ -33,7 +33,7 @@ import org.apache.ws.secpolicy.model.Lay
import org.apache.ws.secpolicy.model.ProtectionToken;
import org.apache.ws.secpolicy.model.SymmetricBinding;
-public class SymmetricBindingBuilder implements AssertionBuilder {
+public class SymmetricBindingBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
SymmetricBinding symmetricBinding = new SymmetricBinding(SPConstants.SP_V11);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java Mon Jan 30 17:29:58 2017
@@ -34,7 +34,7 @@ import org.apache.ws.secpolicy.model.Sup
import org.apache.ws.secpolicy.model.TransportBinding;
import org.apache.ws.secpolicy.model.TransportToken;
-public class TransportBindingBuilder implements AssertionBuilder {
+public class TransportBindingBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
TransportBinding transportBinding = new TransportBinding(SPConstants.SP_V11);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -27,13 +27,13 @@ import org.apache.neethi.AssertionBuilde
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.neethi.builders.xml.XmlPrimtiveAssertion;
+import org.apache.neethi.builders.PrimitiveAssertion;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.HttpsToken;
import org.apache.ws.secpolicy.model.TransportToken;
-public class TransportTokenBuilder implements AssertionBuilder {
+public class TransportTokenBuilder implements AssertionBuilder<OMElement> {
@@ -58,14 +58,14 @@ public class TransportTokenBuilder imple
private void processAlternative(List assertions, TransportToken parent) {
for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- XmlPrimtiveAssertion primtive = (XmlPrimtiveAssertion) iterator.next();
+ Assertion primtive = (Assertion) iterator.next();
QName qname = primtive.getName();
if (SP11Constants.HTTPS_TOKEN.equals(qname)) {
HttpsToken httpsToken = new HttpsToken(SPConstants.SP_V11);
- OMAttribute attr = primtive.getValue().getAttribute(SPConstants.REQUIRE_CLIENT_CERTIFICATE);
+ String attr = ((PrimitiveAssertion)primtive).getAttribute(SPConstants.REQUIRE_CLIENT_CERTIFICATE);
if(attr != null) {
- httpsToken.setRequireClientCertificate("true".equals(attr.getAttributeValue()));
+ httpsToken.setRequireClientCertificate("true".equals(attr));
}
parent.setToken(httpsToken);
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java Mon Jan 30 17:29:58 2017
@@ -25,7 +25,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Trust10;
-public class Trust10Builder implements AssertionBuilder {
+public class Trust10Builder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -32,7 +32,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.UsernameToken;
-public class UsernameTokenBuilder implements AssertionBuilder {
+public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java Mon Jan 30 17:29:58 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Wss10;
-public class WSS10Builder implements AssertionBuilder {
+public class WSS10Builder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java Mon Jan 30 17:29:58 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Wss11;
-public class WSS11Builder implements AssertionBuilder {
+public class WSS11Builder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java Mon Jan 30 17:29:58 2017
@@ -32,7 +32,7 @@ import org.apache.ws.secpolicy.SP11Const
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.X509Token;
-public class X509TokenBuilder implements AssertionBuilder {
+public class X509TokenBuilder implements AssertionBuilder<OMElement> {
public final static String USER_CERT_ALIAS_LN = "userCertAlias";
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java Mon Jan 30 17:29:58 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.model.Alg
import javax.xml.namespace.QName;
-public class AlgorithmSuiteBuilder implements AssertionBuilder {
+public class AlgorithmSuiteBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java Mon Jan 30 17:29:58 2017
@@ -34,7 +34,7 @@ import org.apache.ws.secpolicy.model.Ini
import org.apache.ws.secpolicy.model.Layout;
import org.apache.ws.secpolicy.model.RecipientToken;
-public class AsymmetricBindingBuilder implements AssertionBuilder {
+public class AsymmetricBindingBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java Mon Jan 30 17:29:58 2017
@@ -29,7 +29,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.ContentEncryptedElements;
-public class ContentEncryptedElementsBuilder implements AssertionBuilder {
+public class ContentEncryptedElementsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
@@ -56,7 +56,7 @@ public class ContentEncryptedElementsBui
QName name = element.getQName();
if (SP12Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(), nm.getPrefix());
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java?rev=1780951&r1=1780950&r2=1780951&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java Mon Jan 30 17:29:58 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
-public class EncryptedElementsBuilder implements AssertionBuilder {
+public class EncryptedElementsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
SignedEncryptedElements signedEncryptedElements = new SignedEncryptedElements(false, SPConstants.SP_V12);
@@ -65,7 +65,7 @@ public class EncryptedElementsBuilder im
private void processElement(OMElement element, SignedEncryptedElements parent) {
if (SP12Constants.XPATH.equals(element.getQName())) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(), nm.getPrefix());