servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1137492 - in /servicemix/components/trunk: ./ bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/
Date Mon, 20 Jun 2011 03:48:14 GMT
Author: ffang
Date: Mon Jun 20 03:48:14 2011
New Revision: 1137492

URL: http://svn.apache.org/viewvc?rev=1137492&view=rev
Log:
[SMXCOMP-890]upgrade to cxf 2.4.1

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-policy-bus-context.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=1137492&r1=1137491&r2=1137492&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
Mon Jun 20 03:48:14 2011
@@ -25,40 +25,39 @@
           </wsa:EndpointReference>
       </wsp:AppliesTo>
       <wsp:Policy xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-        <wsp:All>
-          <sp:AsymmetricBinding>
-            <wsp:Policy>
-              <sp:InitiatorToken>
-                <wsp:Policy>
-                  <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Always">
+        <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:UsernameToken>
-                </wsp:Policy>
-              </sp:InitiatorToken>
-              <sp:RecipientToken>
-                <wsp:Policy>
-                  <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Always">
+                </sp:TransportBinding>
+                <sp:SupportingTokens>
                     <wsp:Policy>
-                      <sp:WssX509V3Token10 />
-                      <sp:RequireEmbeddedTokenReference />
+                        <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:X509Token>
-                </wsp:Policy>
-              </sp:RecipientToken>
-              <sp:Layout>
-                <wsp:Policy>
-                  <sp:Strict />
-                </wsp:Policy>
-              </sp:Layout>
-              <sp:AlgorithmSuite>
-                <wsp:Policy>
-                  <sp:Basic256 />
-                </wsp:Policy>
-              </sp:AlgorithmSuite>
-            </wsp:Policy>
-          </sp:AsymmetricBinding>
-        </wsp:All>
-      </wsp:Policy>
+                </sp:SupportingTokens>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
   </wsp:PolicyAttachment>    
 </attachments>

Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/xbean-jaas-policy-bus-context.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-policy-bus-context.xml?rev=1137492&r1=1137491&r2=1137492&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/xbean-jaas-policy-bus-context.xml
(original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/security/xbean-jaas-policy-bus-context.xml
Mon Jun 20 03:48:14 2011
@@ -37,10 +37,6 @@
   <!-- Import the CXF core and optional components needed:
        WS-Security, HTTP, and SOAP. -->
   <import resource="classpath:META-INF/cxf/cxf.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-policy.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-ws-security.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
 
   <cxf:bus/>
   

Modified: servicemix/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1137492&r1=1137491&r2=1137492&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Mon Jun 20 03:48:14 2011
@@ -100,7 +100,7 @@
         <camel.version>2.7.0</camel.version>
 
         <!-- CXF -->
-        <cxf.version>2.4.0</cxf.version>
+        <cxf.version>2.4.1</cxf.version>
 
         <!-- Geronimo Specs and Modules -->
         <geronimo-activation.version>1.0.2</geronimo-activation.version>



Mime
View raw message