You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/01/09 17:41:28 UTC

svn commit: r1430952 - in /cxf/fediz/branches/1.0.x-fixes: ./ examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/wsdl/ examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/wsdl/ services/sts/src/main/webapp/WEB-INF/wsdl/

Author: coheigea
Date: Wed Jan  9 16:41:28 2013
New Revision: 1430952

URL: http://svn.apache.org/viewvc?rev=1430952&view=rev
Log:
Merged from trunk

Modified:
    cxf/fediz/branches/1.0.x-fixes/   (props changed)
    cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl
    cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl
    cxf/fediz/branches/1.0.x-fixes/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl

Propchange: cxf/fediz/branches/1.0.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/fediz/trunk:r1430948

Modified: cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl?rev=1430952&r1=1430951&r2=1430952&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl (original)
+++ cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl Wed Jan  9 16:41:28 2013
@@ -108,7 +108,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl?rev=1430952&r1=1430951&r2=1430952&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl (original)
+++ cxf/fediz/branches/1.0.x-fixes/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/wsdl/hello_world.wsdl Wed Jan  9 16:41:28 2013
@@ -108,7 +108,7 @@
 						</sp:TransportToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:TripleDesRsa15 />
+								<sp:TripleDes />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: cxf/fediz/branches/1.0.x-fixes/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/fediz/branches/1.0.x-fixes/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl?rev=1430952&r1=1430951&r2=1430952&view=diff
==============================================================================
--- cxf/fediz/branches/1.0.x-fixes/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl (original)
+++ cxf/fediz/branches/1.0.x-fixes/services/sts/src/main/webapp/WEB-INF/wsdl/ws-trust-1.4-service.wsdl Wed Jan  9 16:41:28 2013
@@ -635,7 +635,7 @@
                   </sp:RecipientToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -685,7 +685,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -744,7 +744,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -792,7 +792,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:TripleDes />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>