Author: dkulp
Date: Tue Jun 30 19:49:06 2009
New Revision: 789907
URL: http://svn.apache.org/viewvc?rev=789907&view=rev
Log:
Merged revisions 789897 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r789897 | dkulp | 2009-06-30 15:38:29 -0400 (Tue, 30 Jun 2009) | 1 line
[CXF-2282] Fix some policy serialization
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 19:49:06 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789897
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AlgorithmSuite.java
Tue Jun 30 19:49:06 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/KeyValueToken.java
Tue Jun 30 19:49:06 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Layout.java
Tue Jun 30 19:49:06 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportToken.java
Tue Jun 30 19:49:06 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust10.java
Tue Jun 30 19:49:06 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Trust13.java
Tue Jun 30 19:49:06 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
Tue Jun 30 19:49:06 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss10.java
Tue Jun 30 19:49:06 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java?rev=789907&r1=789906&r2=789907&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Wss11.java
Tue Jun 30 19:49:06 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 />
