servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1199152 - in /servicemix/components/trunk: ./ bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/
Date Tue, 08 Nov 2011 08:13:35 GMT
Author: ffang
Date: Tue Nov  8 08:13:34 2011
New Revision: 1199152

URL: http://svn.apache.org/viewvc?rev=1199152&view=rev
Log:
[SMXCOMP-913]upgrade to CXF 2.4.4

Modified:
    servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world-external.xml
    servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/xbean-jaas.xml
    servicemix/components/trunk/pom.xml

Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world-external.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world-external.xml?rev=1199152&r1=1199151&r2=1199152&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world-external.xml
(original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/hello_world-external.xml
Tue Nov  8 08:13:34 2011
@@ -17,47 +17,24 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<attachments xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
-  <wsp:PolicyAttachment>
-      <wsp:AppliesTo>
-          <wsa:EndpointReference>
-              <wsa:Address>http://localhost:19000/SOAPServiceWSSecurity/TimestampSignEncryptPolicy</wsa:Address>
-          </wsa:EndpointReference>
-      </wsp:AppliesTo>
-      <wsp:Policy xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:TransportBinding>
-                    <wsp:Policy>
-                        <sp:TransportToken>
-                            <wsp:Policy>
-                                <sp:HttpsToken RequireClientCertificate="false" />
-                            </wsp:Policy>
-                        </sp:TransportToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax />
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128 />
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:TransportBinding>
-                <sp:SupportingTokens>
-                    <wsp:Policy>
-                        <sp:UsernameToken
-                            sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                            <wsp:Policy>
-                                <sp:WssUsernameToken10/>
-                            </wsp:Policy>
-                        </sp:UsernameToken>
-                    </wsp:Policy>
-                </sp:SupportingTokens>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-  </wsp:PolicyAttachment>    
+<attachments xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
+    <wsp:PolicyAttachment>
+        <wsp:AppliesTo>
+            <wsa:EndpointReference>
+                <wsa:Address>http://localhost:19000/SOAPServiceWSSecurity/TimestampSignEncryptPolicy</wsa:Address>
+            </wsa:EndpointReference>
+        </wsp:AppliesTo>
+        <wsp:Policy>
+                    <sp:SupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+                        <wsp:Policy>
+                            <sp:UsernameToken xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always">
+                                <wsp:Policy>
+                                    <sp:WssUsernameToken11/>
+                                </wsp:Policy>
+                            </sp:UsernameToken>
+                        </wsp:Policy>
+                    </sp:SupportingTokens>
+        </wsp:Policy>
+    </wsp:PolicyAttachment>
 </attachments>
+

Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/xbean-jaas.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/xbean-jaas.xml?rev=1199152&r1=1199151&r2=1199152&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/xbean-jaas.xml
(original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/xbean-jaas.xml
Tue Nov  8 08:13:34 2011
@@ -63,7 +63,7 @@
         <cxfbc:inInterceptors>
           <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
           <ref bean="TimestampSignEncrypt_Request"/>
-          <ref bean="saajin"/>          
+          <ref bean="saajin"/>
         </cxfbc:inInterceptors>
         <cxfbc:outInterceptors>
           <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
@@ -87,6 +87,7 @@
                       properties="#properties" jaasDomain="karaf">
         <cxfbc:inInterceptors>
           <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
+          <bean class="org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JInInterceptor"/>
         </cxfbc:inInterceptors>
         <cxfbc:outInterceptors>
           <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>

Modified: servicemix/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1199152&r1=1199151&r2=1199152&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Tue Nov  8 08:13:34 2011
@@ -88,7 +88,7 @@
         <camel.version>2.8.1</camel.version>
 
         <!-- CXF -->
-        <cxf.version>2.4.2</cxf.version>
+        <cxf.version>2.4.4</cxf.version>
 
         <!-- Geronimo Specs and Modules -->
         <geronimo-activation.version>1.0.2</geronimo-activation.version>



Mime
View raw message