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 2011/12/23 12:35:42 UTC
svn commit: r1222646 - in /axis/axis2/java/rampart/branches/1_6: ./
modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/
Author: veithen
Date: Fri Dec 23 11:35:41 2011
New Revision: 1222646
URL: http://svn.apache.org/viewvc?rev=1222646&view=rev
Log:
Merged r1222418 to the 1.6 branch to make sure that stubs generated using wsdl2java work properly.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AsymmetricBinding.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ContentEncryptedElements.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/EncryptionToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Layout.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RecipientToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 23 11:35:41 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,1194848,1194994,1221926,1221937,1221940,1222136
+/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,1194994,1220915,1221926,1221937,1221940,1222136,1222418
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java Fri Dec 23 11:35:41 2011
@@ -15,6 +15,10 @@
*/
package org.apache.ws.secpolicy.model;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
import org.apache.neethi.Assertion;
import org.apache.neethi.PolicyComponent;
import org.apache.ws.secpolicy.SP12Constants;
@@ -77,5 +81,41 @@ public abstract class AbstractSecurityAs
return version;
}
-
+ protected static void writeStartElement(XMLStreamWriter writer, String defaultPrefix, String localPart, String uri) throws XMLStreamException {
+ String prefix = writer.getPrefix(uri);
+ if (prefix != null) {
+ writer.writeStartElement(prefix, localPart, uri);
+ } else {
+ prefix = defaultPrefix;
+ writer.writeStartElement(prefix, localPart, uri);
+ writer.writeNamespace(prefix, uri);
+ writer.setPrefix(prefix, uri);
+ }
+ }
+
+ protected static void writeStartElement(XMLStreamWriter writer, QName name) throws XMLStreamException {
+ writeStartElement(writer, name.getPrefix(), name.getLocalPart(), name.getNamespaceURI());
+ }
+
+ protected static void writeEmptyElement(XMLStreamWriter writer, String defaultPrefix, String localPart, String uri) throws XMLStreamException {
+ String prefix = writer.getPrefix(uri);
+ if (prefix != null) {
+ writer.writeEmptyElement(prefix, localPart, uri);
+ } else {
+ prefix = defaultPrefix;
+ writer.writeStartElement(prefix, localPart, uri);
+ writer.writeNamespace(prefix, uri);
+ writer.writeEndElement();
+ }
+ }
+
+ protected static void writeAttribute(XMLStreamWriter writer, String defaultPrefix, String uri, String localPart, String value) throws XMLStreamException {
+ String prefix = writer.getPrefix(uri);
+ if (prefix == null) {
+ prefix = defaultPrefix;
+ writer.writeNamespace(prefix, uri);
+ writer.setPrefix(prefix, uri);
+ }
+ writer.writeAttribute(prefix, uri, localPart, value);
+ }
}
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java Fri Dec 23 11:35:41 2011
@@ -452,53 +452,36 @@ public class AlgorithmSuite extends Abst
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);
- }
-
- writer.writeStartElement(prefix, localName, namespaceURI);
- writer.writeNamespace(prefix, namespaceURI);
+ writeStartElement(writer, prefix, localName, namespaceURI);
// <wsp:Policy>
- writer.writeStartElement(SPConstants.POLICY.getPrefix(), SPConstants.POLICY
- .getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
//
- writer.writeStartElement(prefix, getAlgoSuiteString(), namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, getAlgoSuiteString(), namespaceURI);
if (SPConstants.C14N.equals(getInclusiveC14n())) {
- writer.writeStartElement(prefix, SPConstants.INCLUSIVE_C14N, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.INCLUSIVE_C14N, namespaceURI);
}
if (SPConstants.SNT.equals(getSoapNormalization())) {
- writer.writeStartElement(prefix, SPConstants.SOAP_NORMALIZATION_10,
- namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.SOAP_NORMALIZATION_10, namespaceURI);
}
if (SPConstants.STRT10.equals(getStrTransform())) {
- writer.writeStartElement(prefix, SPConstants.STR_TRANSFORM_10,
- namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.STR_TRANSFORM_10, namespaceURI);
}
if (SPConstants.XPATH.equals(getXPath())) {
- writer.writeStartElement(prefix, SPConstants.XPATH10, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.XPATH10, namespaceURI);
}
if (SPConstants.XPATH20.equals(getXPath())) {
- writer.writeStartElement(prefix, SPConstants.XPATH_FILTER20,
- namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.XPATH_FILTER20, namespaceURI);
}
// </wsp:Policy>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AsymmetricBinding.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AsymmetricBinding.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AsymmetricBinding.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AsymmetricBinding.java Fri Dec 23 11:35:41 2011
@@ -123,29 +123,15 @@ public class AsymmetricBinding extends S
}
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:AsymmetricBinding>
- 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 (initiatorToken == null) {
throw new RuntimeException("InitiatorToken is not set");
@@ -180,40 +166,30 @@ public class AsymmetricBinding extends S
}
if (isIncludeTimestamp()) {
- // <sp:IncludeTimestamp>
- writer.writeStartElement(prefix, SPConstants.INCLUDE_TIMESTAMP,
- namespaceURI);
- writer.writeEndElement();
- // </sp:IncludeTimestamp>
+ // <sp:IncludeTimestamp />
+ writeEmptyElement(writer, prefix, SPConstants.INCLUDE_TIMESTAMP, namespaceURI);
}
if (SPConstants.ENCRYPT_BEFORE_SIGNING.equals(getProtectionOrder())) {
// <sp:EncryptBeforeSign />
- writer.writeStartElement(prefix, SPConstants.ENCRYPT_BEFORE_SIGNING,
- namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.ENCRYPT_BEFORE_SIGNING, namespaceURI);
}
if (isSignatureProtection()) {
// <sp:EncryptSignature />
// FIXME move the String constants to a QName
- writer.writeStartElement(prefix, SPConstants.ENCRYPT_SIGNATURE,
- namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.ENCRYPT_SIGNATURE, namespaceURI);
}
if (isTokenProtection()) {
// <sp:ProtectTokens />
- writer.writeStartElement(prefix, SPConstants.PROTECT_TOKENS,
- namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.PROTECT_TOKENS, namespaceURI);
}
if (isEntireHeadersAndBodySignatures()) {
// <sp:OnlySignEntireHeaderAndBody />
- writer.writeStartElement(prefix,
- SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY, namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY,
+ namespaceURI);
}
// </wsp:Policy>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ContentEncryptedElements.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ContentEncryptedElements.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ContentEncryptedElements.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ContentEncryptedElements.java Fri Dec 23 11:35:41 2011
@@ -77,32 +77,15 @@ public class ContentEncryptedElements ex
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:ContentEncryptedElements>
- 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 ContentEncryptedElements ex
.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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/EncryptionToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/EncryptionToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/EncryptionToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/EncryptionToken.java Fri Dec 23 11:35:41 2011
@@ -60,49 +60,11 @@ public class EncryptionToken extends Abs
}
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:EncryptionToken>
- 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 (encryptionToken == null) {
throw new RuntimeException("EncryptionToken is not set");
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java Fri Dec 23 11:35:41 2011
@@ -93,17 +93,12 @@ public class HttpsToken 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:HttpsToken
- writer.writeStartElement(prefix, localname, namespaceURI);
+ writeStartElement(writer, prefix, localname, namespaceURI);
if (version == SPConstants.SP_V12) {
@@ -112,7 +107,7 @@ public class HttpsToken extends Token {
isHttpBasicAuthentication() ||
isHttpDigestAuthentication()) {
// <wsp:Policy>
- writer.writeStartElement(SPConstants.POLICY.getPrefix(), SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
/*
* The ws policy 1.2 specification states that only one of those should be present, although
@@ -120,14 +115,11 @@ public class HttpsToken extends Token {
* a http user/pwd authentication. Nevertheless stick to the specification.
*/
if(isHttpBasicAuthentication()) {
- writer.writeStartElement(prefix, SPConstants.HTTP_BASIC_AUTHENTICATION.getLocalPart(), namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.HTTP_BASIC_AUTHENTICATION.getLocalPart(), namespaceURI);
} else if(isHttpDigestAuthentication()) {
- writer.writeStartElement(prefix, SPConstants.HTTP_DIGEST_AUTHENTICATION.getLocalPart(), namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.HTTP_DIGEST_AUTHENTICATION.getLocalPart(), namespaceURI);
} else if(isRequireClientCertificate()) {
- writer.writeStartElement(prefix, SPConstants.REQUIRE_CLIENT_CERTIFICATE.getLocalPart(), namespaceURI);
- writer.writeEndElement();
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_CLIENT_CERTIFICATE.getLocalPart(), namespaceURI);
}
// </wsp:Policy>
writer.writeEndElement();
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java Fri Dec 23 11:35:41 2011
@@ -65,27 +65,11 @@ public class InitiatorToken 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:InitiatorToken>
- writer.writeStartElement(prefix, localName, namespaceURI);
-
- String pPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (pPrefix == null) {
- pPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(pPrefix, SPConstants.POLICY.getNamespaceURI());
- }
+ writeStartElement(writer, getName());
// <wsp:Policy>
- writer.writeStartElement(pPrefix, SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
Token token = getInitiatorToken();
if (token == null) {
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java Fri Dec 23 11:35:41 2011
@@ -113,26 +113,12 @@ public class IssuedToken extends Token {
}
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:IssuedToken>
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- if (writerPrefix == null) {
- writer.writeNamespace(prefix, namespaceURI);
- }
+ writeStartElement(writer, prefix, localname, namespaceURI);
String inclusion;
@@ -143,12 +129,12 @@ public class IssuedToken extends Token {
}
if (inclusion != null) {
- writer.writeAttribute(prefix, namespaceURI,
+ writeAttribute(writer, prefix, namespaceURI,
SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
}
if (issuerEpr != null) {
- writer.writeStartElement(prefix, SPConstants.ISSUER,
+ writeStartElement(writer, prefix, SPConstants.ISSUER,
namespaceURI);
issuerEpr.serialize(writer);
writer.writeEndElement();
@@ -160,47 +146,27 @@ public class IssuedToken extends Token {
}
- 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;
- }
-
if (isRequireExternalReference() || isRequireInternalReference() ||
this.isDerivedKeys()) {
// <wsp:Policy>
- writer.writeStartElement(wspPrefix, policyLocalName,
- policyNamespaceURI);
-
- if (wspWriterPrefix == null) {
- // xmlns:wsp=".."
- writer.writeNamespace(wspPrefix, policyNamespaceURI);
- }
+ writeStartElement(writer, SPConstants.POLICY);
if (isRequireExternalReference()) {
// <sp:RequireExternalReference />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_EXTERNAL_REFERNCE,
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_EXTERNAL_REFERNCE,
namespaceURI);
}
if (isRequireInternalReference()) {
// <sp:RequireInternalReference />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_INTERNAL_REFERNCE,
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_INTERNAL_REFERNCE,
namespaceURI);
}
if (this.isDerivedKeys()) {
// <sp:RequireDerivedKeys />
- writer.writeEmptyElement(prefix, SPConstants.REQUIRE_DERIVED_KEYS,
+ writeEmptyElement(writer, prefix, SPConstants.REQUIRE_DERIVED_KEYS,
namespaceURI);
}
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Layout.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Layout.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Layout.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Layout.java Fri Dec 23 11:35:41 2011
@@ -70,39 +70,30 @@ public class Layout extends AbstractSecu
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:Layout>
- writer.writeStartElement(prefix, localName, namespaceURI);
+ writeStartElement(writer, prefix, localName, namespaceURI);
// <wsp:Policy>
- writer.writeStartElement(SPConstants.POLICY.getPrefix(), SPConstants.POLICY
- .getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
// .. <sp:Strict /> | <sp:Lax /> | <sp:LaxTsFirst /> | <sp:LaxTsLast /> ..
if (SPConstants.LAYOUT_STRICT.equals(value)) {
- writer.writeStartElement(prefix, SPConstants.LAYOUT_STRICT, namespaceURI);
+ writeEmptyElement(writer, prefix, SPConstants.LAYOUT_STRICT, namespaceURI);
} else if (SPConstants.LAYOUT_LAX.equals(value)) {
- writer.writeStartElement(prefix, SPConstants.LAYOUT_LAX, namespaceURI);
+ writeEmptyElement(writer, prefix, SPConstants.LAYOUT_LAX, namespaceURI);
} else if (SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST.equals(value)) {
- writer.writeStartElement(prefix, SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST, namespaceURI);
+ writeEmptyElement(writer, prefix, SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST, namespaceURI);
} else if (SPConstants.LAYOUT_LAX_TIMESTAMP_LAST.equals(value)) {
- writer.writeStartElement(prefix, SPConstants.LAYOUT_LAX_TIMESTAMP_LAST, namespaceURI);
+ writeEmptyElement(writer, prefix, SPConstants.LAYOUT_LAX_TIMESTAMP_LAST, namespaceURI);
}
- writer.writeEndElement();
-
// </wsp:Policy>
writer.writeEndElement();
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java Fri Dec 23 11:35:41 2011
@@ -68,49 +68,11 @@ public class ProtectionToken extends Abs
}
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:ProtectionToken>
- writer.writeStartElement(prefix, localname, namespaceURI);
-
- if (writerPrefix == null) {
- // 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;
- }
+ writeStartElement(writer, getName());
// <wsp:Policy>
- writer.writeStartElement(wspPrefix, policyLocalName, policyNamespaceURI);
-
- if (wspWriterPrefix == null) {
- // xmlns:wsp=".."
- writer.writeNamespace(wspPrefix, policyNamespaceURI);
- }
+ writeStartElement(writer, SPConstants.POLICY);
if (protectionToken == null) {
throw new RuntimeException("ProtectionToken is not set");
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RecipientToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RecipientToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RecipientToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RecipientToken.java Fri Dec 23 11:35:41 2011
@@ -67,27 +67,11 @@ public class RecipientToken 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:RecipientToken>
- writer.writeStartElement(prefix, localName, namespaceURI);
-
- String pPrefix = writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
- if (pPrefix == null) {
- pPrefix = SPConstants.POLICY.getPrefix();
- writer.setPrefix(pPrefix, SPConstants.POLICY.getNamespaceURI());
- }
+ writeStartElement(writer, getName());
// <wsp:Policy>
- writer.writeStartElement(pPrefix, SPConstants.POLICY.getLocalPart(), SPConstants.POLICY.getNamespaceURI());
+ writeStartElement(writer, SPConstants.POLICY);
Token token = getReceipientToken();
if (token == null) {
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java Fri Dec 23 11:35:41 2011
@@ -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/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java?rev=1222646&r1=1222645&r2=1222646&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java Fri Dec 23 11:35:41 2011
@@ -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>