svn commit: r789897 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model: AlgorithmSuite.java KeyValueToken.java Layout.java TransportToken.java Trust10.java Trust13.java UsernameToken.java Wss10.java Wss11.java

Tue, 30 Jun 2009 12:38:56 -0700 

Author: dkulp
Date: Tue Jun 30 19:38:29 2009
New Revision: 789897

URL: http://svn.apache.org/viewvc?rev=789897&view=rev
Log:
[CXF-2282] Fix some policy serialization

Modified:
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java
    
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java
 Tue Jun 30 19:38:29 2009
@@ -263,7 +263,12 @@
         writer.writeNamespace(prefix, namespaceURI);
 
         // <wsp:Policy>
-        writer.writeStartElement(SPConstants.POLICY.getPrefix(),
+        String wspPrefix = 
writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
+        if (wspPrefix == null) {
+            wspPrefix = SPConstants.POLICY.getPrefix();
+            writer.setPrefix(wspPrefix, SPConstants.POLICY.getNamespaceURI());
+        }
+        writer.writeStartElement(wspPrefix,
                                  SPConstants.POLICY.getLocalPart(),
                                  SPConstants.POLICY.getNamespaceURI());
 

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java
 Tue Jun 30 19:38:29 2009
@@ -68,7 +68,7 @@
             }
 
             // <wsp:Policy>
-            writer.writeStartElement(prefix, 
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY
+            writer.writeStartElement(pPrefix, 
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY
                 .getNamespaceURI());
             
             writer.writeEmptyElement(prefix, "RsaKeyValue", namespaceURI);

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java
 Tue Jun 30 19:38:29 2009
@@ -67,9 +67,14 @@
 
         // <sp:Layout>
         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());
+        }
 
         // <wsp:Policy>
-        writer.writeStartElement(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getLocalPart(),
+        writer.writeStartElement(wspPrefix, SPConstants.POLICY.getLocalPart(),
                                  SPConstants.POLICY.getNamespaceURI());
 
         // .. <sp:Strict /> | <sp:Lax /> | <sp:LaxTsFirst /> | <sp:LaxTsLast 
/> ..

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java
 Tue Jun 30 19:38:29 2009
@@ -72,7 +72,7 @@
         }
 
         // <wsp:Policy>
-        writer.writeStartElement(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getLocalPart(),
+        writer.writeStartElement(wspPrefix, SPConstants.POLICY.getLocalPart(),
                                  SPConstants.POLICY.getNamespaceURI());
 
         // serialization of the token ..

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java
 Tue Jun 30 19:38:29 2009
@@ -140,7 +140,7 @@
         }
 
         // <wsp:Policy>
-        writer.writeStartElement(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getLocalPart(),
+        writer.writeStartElement(wspPrefix, SPConstants.POLICY.getLocalPart(),
                                  SPConstants.POLICY.getNamespaceURI());
 
         if (isMustSupportClientChallenge()) {

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java
 Tue Jun 30 19:38:29 2009
@@ -172,7 +172,7 @@
         }
 
         // <wsp:Policy>
-        writer.writeStartElement(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getLocalPart(),
+        writer.writeStartElement(wspPrefix, SPConstants.POLICY.getLocalPart(),
                                  SPConstants.POLICY.getNamespaceURI());
 
         if (isMustSupportClientChallenge()) {

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
 Tue Jun 30 19:38:29 2009
@@ -104,11 +104,12 @@
         if (isUseUTProfile10() || isUseUTProfile11()) {
             String pPrefix = 
writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
             if (pPrefix == null) {
+                pPrefix = SPConstants.POLICY.getPrefix();
                 writer.setPrefix(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getNamespaceURI());
             }
 
             // <wsp:Policy>
-            writer.writeStartElement(prefix, 
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY
+            writer.writeStartElement(pPrefix, 
SPConstants.POLICY.getLocalPart(), SPConstants.POLICY
                 .getNamespaceURI());
 
             // CHECKME

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java
 Tue Jun 30 19:38:29 2009
@@ -118,11 +118,12 @@
 
         String pPrefix = 
writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
         if (pPrefix == null) {
+            pPrefix = SPConstants.POLICY.getPrefix();
             writer.setPrefix(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getNamespaceURI());
         }
 
         // <wsp:Policy>
-        writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(), 
SPConstants.POLICY
+        writer.writeStartElement(pPrefix, SPConstants.POLICY.getLocalPart(), 
SPConstants.POLICY
             .getNamespaceURI());
 
         if (isMustSupportRefKeyIdentifier()) {

Modified: 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java?rev=789897&r1=789896&r2=789897&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java
 (original)
+++ 
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java
 Tue Jun 30 19:38:29 2009
@@ -102,11 +102,12 @@
 
         String pPrefix = 
writer.getPrefix(SPConstants.POLICY.getNamespaceURI());
         if (pPrefix == null) {
+            pPrefix = SPConstants.POLICY.getPrefix();
             writer.setPrefix(SPConstants.POLICY.getPrefix(), 
SPConstants.POLICY.getNamespaceURI());
         }
 
         // <wsp:Policy>
-        writer.writeStartElement(prefix, SPConstants.POLICY.getLocalPart(), 
SPConstants.POLICY
+        writer.writeStartElement(pPrefix, SPConstants.POLICY.getLocalPart(), 
SPConstants.POLICY
             .getNamespaceURI());
 
         // <sp:MustSupportRefKeyIndentifier />

Reply via email to