svn commit: r947995 - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-search.html

[buildbot]

Author: buildbot
Date: Fri Apr 17 09:46:56 2015
New Revision: 947995

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jax-rs-search.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/jax-rs-search.html
==
--- websites/production/cxf/content/docs/jax-rs-search.html (original)
+++ websites/production/cxf/content/docs/jax-rs-search.html Fri Apr 17 09:46:56 
2015
@@ -118,11 +118,11 @@ Apache CXF -- JAX-RS Search


 JAX-RS 
Search /**/
+/*]]>*/
 JAX-RS Search
 Advanced Search 
QueriesSupported Query Languages
 Feed Item Query 
LanguageOpen 
Data Protocol
@@ -138,7 +138,9 @@ div.rbtoc1419015870456 li {margin-left:
 Basic queriesComplex queries
 ValidationBuilding the queries
 FIQL
-Using dates 
in queriesAlternative query languages
+Using dates 
in queries
+Relative dates
+Alternative query languages
 OData
 Content 
Extraction
 Using TikaContentExtractorUsing TikaLuceneContentExtractor
@@ -927,7 +929,10 @@ FiqlSearchConditionBuilder bCustom = new
 String ret = bCustom.is("foo").equalTo(d).query();
 assertEquals("foo==2011-03-01T12:34:00", ret);
 ]]>
-Alternative query 
languagesCustom org.apache.cxf.jaxrs.ext.search.SearchConditionParser 
implementations can be registered as a "search.parser" contextual property 
starting from CXF 3.0.0-milestone2.OData Please use a 
"search.query.parameter.name" contextual property to indicate to the runtime 
that an OData '$filter' query option needs to be checked for the query 
expression and a "search.parser" property to point to the instance of 
org.apache.cxf.jaxrs.ext.search.odata.ODataParser, as shown in this http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java";>test,
 see the startServers function.And here is also an XML Spring 
configuration example (using SearchBean in this specific case):
+ Relative datesDate value can be 
specified as a duration from the current date/time, as its string 
representation, "PnYnMnDTnHnMnS". Resulted date will be 
calculated as a current date + specified duration. For example:
+
+ This query will search for a date which is 90 days 
in the past or newer.Alternative query 
languagesCustom org.apache.cxf.jaxrs.ext.search.SearchConditionParser 
implementations can be registered as a "search.parser" contextual property 
starting from CXF 3.0.0-milestone2.OData Please use a 
"search.query.parameter.name" contextual property to indicate to the runtime 
that an OData '$filter' query option needs to be checked for the query 
expression and a "search.parser" property to point to the instance of 
org.apache.cxf.jaxrs.ext.search.odata.ODataParser, as shown in this http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java";>test,
 see the startServers function.And here is also an XML Spring 
configuration e
 xample (using SearchBean in this specific case):
 

[28/38] cxf git commit: Switching signature properties

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
index b275629..81825bf 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
@@ -42,32 +42,32 @@
 http://www.example.org/contract/DoubleIt"; 
id="SymmetricErrorMessage" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricErrorMessage";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSymmetricErrorMessagePort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifier" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifierDerived" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifierDerived";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItKeyIdentifierDerivedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifierEncryptBeforeSigning" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifierEncryptBeforeSigning";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItKeyIdentifierEncryptBeforeSigningPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifierEncryptBeforeSigningDerived" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifierEncryptBeforeSigningDerived";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItKeyIdentifierEncryptBeforeSigningDerivedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
 
-
+
 
 
 
@@ -78,43 +78,43 @@
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifier2" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleIt2Impl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="IssuerSerial" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509IssuerSerial"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItIssuerSerialPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="Thumbprint" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509Thumbprint"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItThumbprintPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SymmetricThumbprintEndorsing" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricThumbprintEndorsing";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSymmetricThumbprintEndorsingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SymmetricEndorsingEncrypted" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricEndorsingEncrypted";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlL

[37/38] cxf git commit: Switching remaining SAML Cfg tags

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
index 0b23b56..c6d0f7f 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 
@@ -44,7 +44,7 @@
 
 
 
-
+
 
 
 
@@ -58,7 +58,7 @@
 
 
 
-
+
 
 
 
@@ -72,7 +72,7 @@
 
 
 
-
+
 
 
 
@@ -86,7 +86,7 @@
 
 
 
-
+
 
 
 
@@ -100,7 +100,7 @@
 
 
 
-
+
 
 
 
@@ -114,7 +114,7 @@
 
 
 
-
+
 
 
 
@@ -128,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -142,7 +142,7 @@
 
 
 
-
+
 
 
 
@@ -157,7 +157,7 @@
 
 
 
-
+
 
 
 
@@ -172,7 +172,7 @@
 
 
 
-
+
 
 
 
@@ -187,7 +187,7 @@
 
 
 
-
+
 
 
 
@@ -202,7 +202,7 @@
 
 
 
-
+
 
 
 
@@ -217,7 +217,7 @@
 
 
 
-
+
 
 
 
@@ -232,7 +232,7 @@
 
 
 
-
+
 
 
 
@@ -247,7 +247,7 @@
 
 
 
-
+
 
 
 
@@ -266,7 +266,7 @@
 
 
 
-
+
 
 
 
@@ -285,7 +285,7 @@
 
 
 
-
+
 
 
 
@@ -304,7 +304,7 @@
 
 
 
-
+
 
 
 
@@ -323,7 +323,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
index 615b2e5..1b503f3 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
@@ -44,7 +44,7 @@
 
 
 
-
+
 
 
 
@@ -57,7 +57,7 @@
 
 
 
-
+
 
 
 
@@ -70,7 +70,7 @@
 
 
 
-
+
 
 
 
@@ -91,7 +91,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="TransportSupportingSigned" 
address="https://localhost:${testutil.ports.Server.2}/DoubleItTransportSupportingSigned";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItTransportSupportingSignedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" 
depends-on="tls-settings">
 
 
-
+
 
 
 
@@ -102,7 +102,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="TransportUTSupportingSigned" 
address="https://localhost:${testutil.ports.Server.2}/DoubleItTransportUTSupportingSigned";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItTransportUTSupportingSignedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/policy/Doubl

[11/38] cxf git commit: Switching encryption username

[coheigea]

Switching encryption username


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2a5d201b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2a5d201b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2a5d201b

Branch: refs/heads/master
Commit: 2a5d201be1b85344585094d0f044e9bf1b605fac
Parents: 93039ab
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:34:21 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:34:21 2015 +0100

--
 .../src/main/resources/wssec-client-stax.xml|  4 +-
 .../sts/src/main/resources/wssec-client.xml |  4 +-
 .../src/main/resources/ClientConfig.xml |  2 +-
 .../src/main/resources/ClientConfigStax.xml |  2 +-
 .../src/main/webapp/WEB-INF/cxf-x509.xml|  2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml |  2 +-
 .../binarysecuritytoken/stax-cxf-service.xml|  2 +-
 .../systest/sts/caching/cxf-caching-service.xml |  2 +-
 .../cxf/systest/sts/caching/cxf-client.xml  |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml   |  4 +-
 .../sts/symmetric/SymmetricBindingTest.java |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   | 10 +--
 .../cxf/systest/sts/deployment/cxf-x509.xml |  2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml|  2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml|  4 +-
 .../systest/sts/username_actas/cxf-client.xml   | 20 +++---
 .../sts/username_onbehalfof/cxf-client.xml  | 20 +++---
 .../systest/sts/x509_symmetric/cxf-client.xml   |  4 +-
 .../systest/sts/x509_symmetric/cxf-service.xml  |  2 +-
 .../sts/x509_symmetric/cxf-stax-service.xml |  2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  | 24 +++
 .../systest/kerberos/wssec/kerberos/server.xml  |  8 +--
 .../kerberos/wssec/kerberos/stax-server.xml |  8 +--
 .../jaxrs/security/xml/JAXRSXmlSecTest.java | 18 ++---
 .../cxf/systest/jaxrs/security/xml/server.xml   |  2 +-
 .../systest/jaxrs/security/xml/stax-server.xml  |  2 +-
 .../cxf/systest/ws/rm/sec/client-policy.xml |  2 +-
 .../cxf/systest/ws/rm/sec/server-policy.xml |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  | 12 ++--
 .../cxf/systest/wssec/examples/saml/server.xml  |  8 +--
 .../systest/wssec/examples/saml/stax-server.xml |  8 +--
 .../systest/wssec/examples/secconv/client.xml   |  2 +-
 .../systest/wssec/examples/secconv/server.xml   |  2 +-
 .../wssec/examples/secconv/stax-server.xml  |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml|  6 +-
 .../cxf/systest/wssec/examples/ut/server.xml|  2 +-
 .../systest/wssec/examples/ut/stax-server.xml   |  2 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |  8 +--
 .../cxf/systest/wssec/examples/x509/server.xml  |  6 +-
 .../systest/wssec/examples/x509/stax-server.xml |  6 +-
 .../apache/cxf/systest/ws/fault/FaultTest.java  |  2 +-
 .../cxf/systest/ws/wssc/WSSCUnitTest.java   |  4 +-
 .../systest/ws/x509/DoubleItPropertiesImpl.java |  2 +-
 .../org/apache/cxf/systest/ws/action/server.xml |  4 +-
 .../apache/cxf/systest/ws/algsuite/client.xml   | 12 ++--
 .../apache/cxf/systest/ws/bindings/client.xml   | 42 ++--
 .../apache/cxf/systest/ws/bindings/server.xml   | 42 ++--
 .../cxf/systest/ws/bindings/stax-server.xml | 42 ++--
 .../org/apache/cxf/systest/ws/cache/client.xml  |  4 +-
 .../cxf/systest/ws/fault/client-untrusted.xml   |  2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |  6 +-
 .../cxf/systest/ws/fault/modified-server.xml|  4 +-
 .../org/apache/cxf/systest/ws/gcm/client.xml|  6 +-
 .../org/apache/cxf/systest/ws/gcm/server.xml|  6 +-
 .../apache/cxf/systest/ws/gcm/stax-server.xml   |  6 +-
 .../apache/cxf/systest/ws/httpget/client.xml|  2 +-
 .../org/apache/cxf/systest/ws/parts/client.xml  | 42 ++--
 .../org/apache/cxf/systest/ws/parts/server.xml  | 42 ++--
 .../apache/cxf/systest/ws/parts/stax-server.xml | 40 +--
 .../org/apache/cxf/systest/ws/policy/client.xml |  6 +-
 .../org/apache/cxf/systest/ws/policy/server.xml |  6 +-
 .../org/apache/cxf/systest/ws/saml/client.xml   | 20 +++---
 .../org/apache/cxf/systest/ws/saml/server.xml   | 12 ++--
 .../apache/cxf/systest/ws/saml/stax-server.xml  | 12 ++--
 .../apache/cxf/systest/ws/swa/policy-client.xml | 10 +--
 .../apache/cxf/systest/ws/swa/policy-server.xml |  2 +-
 .../cxf/systest/ws/swa/stax-policy-server.xml   |  2 +-
 .../org/apache/cxf/systest/ws/tokens/client.xml | 18 ++---
 .../cxf/systest/ws/tokens/endorsing-client.xml  | 12 ++--
 .../cxf/systest/ws/tokens/endorsing-server.xml  | 12 ++--
 .../org/apache/cxf/systest/ws/tokens/server.xml | 18 ++---
 .../systest/ws/tokens/stax-endorsing-server.xml | 12 ++--
 .../cxf/systest/ws/tokens/stax-server.xml   | 18 ++---
 .../apache/cxf/systest/

[25/38] cxf git commit: Switching encryption cfg

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
index 8e35601..1b7a160 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
@@ -156,7 +156,7 @@
 
 
 
-
+
 
 
 
@@ -171,7 +171,7 @@
 
 
 
-
+
 
 
 
@@ -186,7 +186,7 @@
 
 
 
-
+
 
 
 
@@ -201,7 +201,7 @@
 
 
 
-
+
 
 
 
@@ -216,7 +216,7 @@
 
 
 
-
+
 
 
 
@@ -231,7 +231,7 @@
 
 
 
-
+
 
 
 
@@ -246,7 +246,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
index 390e6d4..3fd8a06 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml
@@ -28,7 +28,7 @@
 
 
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 
@@ -53,7 +53,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
index c9cecf0..873db51 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
@@ -44,20 +44,20 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricPort"; 
createdFromAPI="true">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricSupportingPort";
 createdFromAPI="true">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort"; 
createdFromAPI="true">
 
 
-
+
 
 
 
@@ -66,7 +66,7 @@
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort2"; 
createdFromAPI="true">
 
 
-
+
 
 
 
@@ -108,7 +108,7 @@
 http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSamlInitiatorPort";
 createdFromAPI="true">
 
 
-
+
 
 
 
@@ -116,14 +116,14 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricSignedElementsPort";
 createdFromAPI="true">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedPort";
 createdFromAPI="true">
 
 
-
+
 
 
 
@@ -132,7 +132,7 @@
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigningPort";
 createdFromAPI="true">
 
 
-
+
 
 
 
@@ -141,7 +141,7 @@
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricEncryptedPort";
 createdFromAPI="true">
 
 
-
+
 
 

[32/38] cxf git commit: Switching signature properties

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
index 3455498..de77fae 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
@@ -28,7 +28,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SecureConversation" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSecureConversation";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSecureConversationPort" 
implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl">
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
index b8743cb..61bd8d6 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
@@ -51,7 +51,7 @@
 http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="SymmetricSTS" 
implementor="#symmetricSTSProviderBean" 
address="http://localhost:${testutil.ports.STSServer}/SecurityTokenService/Symmetric";
 
wsdlLocation="src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl"
 serviceName="ns1:SecurityTokenService" endpointName="ns1:Symmetric_Port">
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
index 4828cb2..13d3233 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
@@ -53,7 +53,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
index fb2f7a3..37d35fd 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
@@ -48,7 +48,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricSESupporting" 
address="http://localhost:${testutil.ports.Server}/DoubleItUTAsymmetricSESupporting";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricSESupportingPort" 
implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
 
 
-
+
 
 
 
@@ -56,13 +56,13 @@
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricEncrSupporting" 
address="http://localhost:${testutil.ports.Server}/DoubleItUTAsymmetricEncrSupporting";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricEncrSupportingPort" 
implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl">
 
 
-
+
 
 
 http://www.

[27/38] cxf git commit: Switching encryption cfg

[coheigea]

Switching encryption cfg


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5577461d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5577461d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5577461d

Branch: refs/heads/master
Commit: 5577461dfa57cb8c7c49d788276afbd9253d81c5
Parents: 5d38761
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:37:45 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:37:45 2015 +0100

--
 .../src/main/resources/etc/policy-asym.xml  |  4 +-
 .../src/main/resources/etc/policy-sym.xml   |  4 +-
 .../src/main/resources/etc/policy-symsc.xml |  4 +-
 .../src/main/resources/wssec-client-stax.xml|  4 +-
 .../sts/src/main/resources/wssec-client.xml |  4 +-
 .../src/main/resources/wssec-server-stax.xml|  2 +-
 .../sts/src/main/resources/wssec-server.xml |  2 +-
 .../src/main/resources/ClientConfig.xml |  2 +-
 .../src/main/resources/ClientConfigStax.xml |  2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml  |  2 +-
 .../systest/sts/caching/cxf-caching-service.xml |  2 +-
 .../cxf/systest/sts/caching/cxf-client.xml  |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml   |  4 +-
 .../sts/sts_sender_vouches/cxf-service.xml  |  2 +-
 .../sts/symmetric/SymmetricBindingTest.java |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   | 10 +--
 .../systest/sts/sendervouches/cxf-service.xml   |  2 +-
 .../sts/sendervouches/cxf-stax-service.xml  |  2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml|  4 +-
 .../systest/sts/username_actas/cxf-client.xml   | 20 +++---
 .../systest/sts/username_actas/cxf-service.xml  | 10 +--
 .../systest/sts/username_actas/cxf-service2.xml | 10 +--
 .../sts/username_onbehalfof/cxf-client.xml  | 20 +++---
 .../sts/username_onbehalfof/cxf-service.xml | 10 +--
 .../sts/username_onbehalfof/cxf-service2.xml| 10 +--
 .../systest/sts/x509_symmetric/cxf-client.xml   |  4 +-
 .../systest/sts/x509_symmetric/cxf-service.xml  |  2 +-
 .../sts/x509_symmetric/cxf-stax-service.xml |  2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  | 24 +++
 .../systest/kerberos/wssec/kerberos/server.xml  |  8 +--
 .../kerberos/wssec/kerberos/stax-server.xml |  8 +--
 .../jaxrs/security/xml/JAXRSXmlSecTest.java | 18 ++---
 .../cxf/systest/jaxrs/security/xml/server.xml   |  8 +--
 .../systest/jaxrs/security/xml/stax-server.xml  |  8 +--
 .../cxf/systest/ws/rm/sec/client-policy.xml |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  | 12 ++--
 .../cxf/systest/wssec/examples/saml/server.xml  |  2 +-
 .../systest/wssec/examples/saml/stax-server.xml |  2 +-
 .../systest/wssec/examples/secconv/client.xml   |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml|  6 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |  8 +--
 .../cxf/systest/wssec/examples/x509/server.xml  |  2 +-
 .../systest/wssec/examples/x509/stax-server.xml |  2 +-
 .../apache/cxf/systest/ws/fault/FaultTest.java  |  2 +-
 .../cxf/systest/ws/wssc/WSSCUnitTest.java   |  4 +-
 .../systest/ws/x509/DoubleItPropertiesImpl.java |  2 +-
 .../org/apache/cxf/systest/ws/action/server.xml |  4 +-
 .../apache/cxf/systest/ws/algsuite/client.xml   | 12 ++--
 .../apache/cxf/systest/ws/bindings/client.xml   | 42 +--
 .../org/apache/cxf/systest/ws/cache/client.xml  |  4 +-
 .../cxf/systest/ws/fault/client-untrusted.xml   |  2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |  6 +-
 .../cxf/systest/ws/fault/modified-server.xml|  4 +-
 .../org/apache/cxf/systest/ws/gcm/client.xml|  6 +-
 .../apache/cxf/systest/ws/httpget/client.xml|  2 +-
 .../org/apache/cxf/systest/ws/parts/client.xml  | 42 +--
 .../org/apache/cxf/systest/ws/parts/server.xml  | 16 ++---
 .../apache/cxf/systest/ws/parts/stax-server.xml | 14 ++--
 .../org/apache/cxf/systest/ws/policy/client.xml |  6 +-
 .../org/apache/cxf/systest/ws/saml/client.xml   | 20 +++---
 .../apache/cxf/systest/ws/swa/policy-client.xml | 10 +--
 .../apache/cxf/systest/ws/swa/policy-server.xml |  2 +-
 .../cxf/systest/ws/swa/stax-policy-server.xml   |  2 +-
 .../org/apache/cxf/systest/ws/tokens/client.xml | 18 ++---
 .../cxf/systest/ws/tokens/endorsing-client.xml  | 12 ++--
 .../apache/cxf/systest/ws/ut/client-derived.xml |  6 +-
 .../org/apache/cxf/systest/ws/wssc/client.xml   | 46 ++--
 .../apache/cxf/systest/ws/wssec10/client.xml|  4 +-
 .../systest/ws/wssec10/client_restricted.xml|  4 +-
 .../apache/cxf/systest/ws/wssec11/client.xml| 36 +-
 .../systest/ws/wssec11/client_restricted.xml| 36 +-
 .../org/apache/cxf/systest/ws/x509/client.xml   | 74 ++--
 .../org/apache/cxf/systest/ws/x509/server.xml   | 14 ++--
 .../apache/cxf/systest/ws/x509/stax-server.xml  | 14 ++--
 .../org/apache/cxf/systest

[23/38] cxf git commit: Switching SAML CallbackHandler

[coheigea]

Switching SAML CallbackHandler


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5d387616
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d387616
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d387616

Branch: refs/heads/master
Commit: 5d387616bc1787f3ae50dbe2a185c6abb0e9955b
Parents: ee64acf
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:36:19 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:36:19 2015 +0100

--
 .../sts/sendervouches/DoubleItPortTypeImpl.java |  2 +-
 .../jaxrs/security/oauth2/JAXRSOAuth2Test.java  |  2 +-
 .../saml/JAXRSSamlAuthorizationTest.java|  2 +-
 .../jaxrs/security/saml/JAXRSSamlTest.java  |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  | 18 +++---
 .../cxf/systest/ws/saml/SamlTokenTest.java  | 60 ++--
 .../saml/subjectconf/SamlSubjectConfTest.java   | 18 +++---
 7 files changed, 52 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java
index a4dc025..6e37b53 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/DoubleItPortTypeImpl.java
@@ -63,7 +63,7 @@ public class DoubleItPortTypeImpl extends 
AbstractBusClientServerTestBase implem
 //
 Saml2CallbackHandler callbackHandler = new 
Saml2CallbackHandler(wsc.getUserPrincipal());
 
((BindingProvider)transportSAML2SupportingPort).getRequestContext().put(
-"ws-security.saml-callback-handler", callbackHandler
+"security.saml-callback-handler", callbackHandler
 );
 
 return transportSAML2SupportingPort.doubleIt(numberToDouble);

http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
index faa787f..2068880 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
@@ -158,7 +158,7 @@ public class JAXRSOAuth2Test extends 
AbstractBusClientServerTestBase {
 Map properties = new HashMap();
 properties.put("security.callback-handler", 

"org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-properties.put("ws-security.saml-callback-handler", 
+properties.put("security.saml-callback-handler", 

"org.apache.cxf.systest.jaxrs.security.oauth2.SamlCallbackHandler2");
 properties.put("security.signature.username", "alice");
 properties.put("ws-security.signature.properties", 
CRYPTO_RESOURCE_PROPERTIES);

http://git-wip-us.apache.org/repos/asf/cxf/blob/5d387616/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java
index 1558d58..0ce5f11 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java
@@ -154,7 +154,7 @@ public class JAXRSSamlAuthorizationTest extends 
AbstractBusClientServerTestBase
 bean.setBus(springBus);
 
 Map properties = new HashMap();
-properties.put("ws-security.saml-callback-handler", 
+properties.put("security.saml-callback-handler", 

"org.apache.cxf.systest.jaxrs.security.saml.SamlCallbackHandler");
 if (extraProperties != null) {
 properties.putAll(extraProperties);

http://git-wip-us.apache.org/repos

[20/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
index f47c15a..00c5862 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
@@ -21,7 +21,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml2bearer" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML2BearerPort" 
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2bearer";
 wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
 
-
+
 
 
 
@@ -29,7 +29,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml2bearer2" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML2BearerPort2" 
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2bearer2";
 wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
index eb2f175..d18ac2e 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
@@ -117,12 +117,12 @@
 
 http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTS" 
implementor="#transportSTSProviderBean" 
address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport";
 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl"
 serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" 
depends-on="ClientAuthHttpsSettings">
 
-
+
 
 
 http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; 
id="transportSTSUT" implementor="#transportUTSTSProviderBean" 
address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportUT";
 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl"
 serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_UT_Port" 
depends-on="ClientAuthHttpsSettings">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
index 1a17c5b..0ad5310 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
@@ -51,7 +51,7 @@
 
 http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; 
id="EncryptedUTSTS" implementor="#encryptedUtSTSProviderBean" 
address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UTEncrypted";
 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
 serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
--
diff --git 
a/services/sts/systests/basic/s

[07/38] cxf git commit: Switching signature username

[coheigea]

Switching signature username


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/93039ab8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/93039ab8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/93039ab8

Branch: refs/heads/master
Commit: 93039ab86bea4f2bdac4e5eec4229d3271f4c7ec
Parents: 354ac95
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:33:05 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:33:05 2015 +0100

--
 .../src/main/resources/wssec-client-stax.xml|  2 +-
 .../sts/src/main/resources/wssec-client.xml |  2 +-
 .../src/main/resources/wssec-server-stax.xml|  2 +-
 .../sts/src/main/resources/wssec-server.xml |  2 +-
 .../sts/src/main/resources/wssec-sts-stax.xml   |  2 +-
 .../sts/src/main/resources/wssec-sts.xml|  2 +-
 .../main/webapp/WEB-INF/cxf-encrypted-ut.xml|  2 +-
 .../src/main/webapp/WEB-INF/cxf-x509.xml|  2 +-
 .../cxf/systest/sts/asymmetric_encr/cxf-sts.xml |  2 +-
 .../sts/asymmetric_encr/stax-cxf-sts.xml|  2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml |  2 +-
 .../binarysecuritytoken/stax-cxf-service.xml|  2 +-
 .../systest/sts/caching/cxf-caching-service.xml |  2 +-
 .../cxf/systest/sts/caching/cxf-client.xml  |  2 +-
 .../apache/cxf/systest/sts/renew/cxf-client.xml |  6 +-
 .../sts/sts_sender_vouches/cxf-client.xml   |  2 +-
 .../sts/sts_sender_vouches/cxf-service.xml  |  2 +-
 .../systest/sts/sts_sender_vouches/cxf-sts.xml  |  2 +-
 .../sts/sts_sender_vouches/stax-cxf-sts.xml |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   |  6 +-
 .../cxf/systest/sts/asymmetric/cxf-service.xml  |  6 +-
 .../systest/sts/asymmetric/cxf-stax-service.xml |  6 +-
 .../systest/sts/deployment/cxf-encrypted-ut.xml |  2 +-
 .../cxf/systest/sts/deployment/cxf-x509.xml |  2 +-
 .../sts/deployment/stax-cxf-encrypted-ut.xml|  2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml|  2 +-
 .../systest/sts/username_actas/cxf-client.xml   | 20 +++
 .../systest/sts/username_actas/cxf-service.xml  | 10 ++--
 .../systest/sts/username_actas/cxf-service2.xml | 10 ++--
 .../sts/username_onbehalfof/cxf-client.xml  | 20 +++
 .../sts/username_onbehalfof/cxf-service.xml | 10 ++--
 .../sts/username_onbehalfof/cxf-service2.xml| 10 ++--
 .../systest/sts/x509_symmetric/cxf-client.xml   |  2 +-
 .../systest/sts/x509_symmetric/cxf-service.xml  |  2 +-
 .../sts/x509_symmetric/cxf-stax-service.xml |  2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  | 10 ++--
 .../jaxrs/security/oauth2/JAXRSOAuth2Test.java  |  2 +-
 .../jaxrs/security/saml/JAXRSSamlTest.java  |  2 +-
 .../security/saml/SamlCallbackHandler.java  |  2 +-
 .../jaxrs/security/xml/JAXRSXmlSecTest.java | 14 ++---
 .../cxf/systest/ws/rm/sec/client-policy.xml |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  | 14 ++---
 .../cxf/systest/wssec/examples/saml/server.xml  |  4 +-
 .../systest/wssec/examples/saml/stax-server.xml |  4 +-
 .../systest/wssec/examples/secconv/client.xml   |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml|  2 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |  6 +-
 .../cxf/systest/wssec/examples/x509/server.xml  |  4 +-
 .../systest/wssec/examples/x509/stax-server.xml |  4 +-
 .../ws/policy/handler/HelloServiceImpl.java |  2 +-
 .../apache/cxf/systest/ws/bindings/client.xml   | 42 +++---
 .../cxf/systest/ws/fault/client-untrusted.xml   |  2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |  2 +-
 .../org/apache/cxf/systest/ws/gcm/client.xml|  6 +-
 .../org/apache/cxf/systest/ws/parts/client.xml  | 42 +++---
 .../org/apache/cxf/systest/ws/policy/client.xml | 10 ++--
 .../org/apache/cxf/systest/ws/saml/client.xml   | 24 
 .../apache/cxf/systest/ws/swa/policy-client.xml |  2 +-
 .../org/apache/cxf/systest/ws/tokens/client.xml | 18 +++---
 .../cxf/systest/ws/tokens/endorsing-client.xml  | 12 ++--
 .../org/apache/cxf/systest/ws/ut/client.xml |  4 +-
 .../org/apache/cxf/systest/ws/x509/client.xml   | 60 ++--
 .../org/apache/cxf/systest/ws/xkms/client.xml   |  2 +-
 65 files changed, 229 insertions(+), 229 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
--
diff --git 
a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
 
b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
index 767dac2..7ab0920 100644
--- 
a/distribution/src/main/release/samples/sts/src/main/resources/w

[09/38] cxf git commit: Switching encryption username

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml
index ac7d934..11535a3 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 
@@ -44,7 +44,7 @@
 
 
 
-
+
 
 
 
@@ -59,7 +59,7 @@
 
 
 
-
+
 
 
 
@@ -74,7 +74,7 @@
 
 
 
-
+
 
 
 
@@ -89,7 +89,7 @@
 
 
 
-
+
 
 
 
@@ -104,7 +104,7 @@
 
 
 
-
+
 
 
 
@@ -119,7 +119,7 @@
 
 
 
-
+
 
 
 
@@ -134,7 +134,7 @@
 
 
 
-
+
 
 
 
@@ -149,7 +149,7 @@
 
 
 
-
+
 
 
 
@@ -164,7 +164,7 @@
 
 
 
-
+
 
 
 
@@ -179,7 +179,7 @@
 
 
 
-
+
 
 
 
@@ -194,7 +194,7 @@
 
 
 
-
+
 
 
 
@@ -209,7 +209,7 @@
 
 
 
-
+
 
 
 
@@ -224,7 +224,7 @@
 
 
 
-
+
 
 
 
@@ -239,7 +239,7 @@
 
 
 
-
+
 
 
 
@@ -254,7 +254,7 @@
 
 
 
-
+
 
 
 
@@ -269,7 +269,7 @@
 
 
 
-
+
 
 
 
@@ -285,7 +285,7 @@
 
 
 
-
+
 
 
 
@@ -301,7 +301,7 @@
 
 
 
-
+
 
 
 
@@ -317,7 +317,7 @@
 
 
 
-
+
 
 
 
@@ -333,7 +333,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
index 40f10f1..c8604c5 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 
@@ -42,7 +42,7 @@
 
 
 
-
+
 
 
 
@@ -55,7 +55,7 @@
 
 
 
-
+
 
 
 
@@ -68,7 +68,7 @@
 
 
 
-
+
 
 
 
@@ -81,7 +81,7 @@
 
 
 
-
+
 
 
 
@@ -94,7 +94,7 @@
 
 
 
-
+
 
 
 
@@ -107,7 +107,7 @@
 
 
 
-
+
 
 
 
@@ -120,7 +120,7 @@
 
 
 
-
+
 
 
 
@@ -133,7 +133,7 @@
 
 
 
-
+
 
 
 
@@ -146,7 +146,7 @@
 

[05/38] cxf git commit: Switching signature username

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
index 2bd53d4..a60a1e2 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
@@ -77,7 +77,7 @@
 
 
 
-
+
 
 
 
@@ -86,7 +86,7 @@
 
 
 
-
+
 
 
 
@@ -101,7 +101,7 @@
 
 
 
-
+
 
 
 
@@ -110,7 +110,7 @@
 
 
 
-
+
 
 
 
@@ -119,7 +119,7 @@
 
 
 
-
+
 
 
 
@@ -128,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -137,7 +137,7 @@
 
 
 
-
+
 
 http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
 
@@ -147,7 +147,7 @@
 
 
 
-
+
 
 
 
@@ -156,7 +156,7 @@
 
 
 
-
+
 
 
 
@@ -165,7 +165,7 @@
 
 
 
-
+
 
 
 
@@ -174,7 +174,7 @@
 
 
 
-
+
 
 
 
@@ -183,7 +183,7 @@
 
 
 
-
+
 
 
 
@@ -191,7 +191,7 @@
 
 
 
-
+
 
 
 
@@ -199,7 +199,7 @@
 
 
 
-
+
 
 
 
@@ -224,7 +224,7 @@
 
 
 
-
+
 
 
 
@@ -233,7 +233,7 @@
 
 
 
-
+
 
 
 
@@ -243,7 +243,7 @@
 
 
 
-
+
 
 
 
@@ -264,42 +264,42 @@
 http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingPort"; 
createdFromAPI="true">
 
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingSP11Port";
 createdFromAPI="true">
 
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingPort";
 createdFromAPI="true">
 
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingEncryptedPort";
 createdFromAPI="true">
 
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingEncryptedPort";
 createdFromAPI="true">
 
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingSignedPort";
 createdFromAPI="true">
 
 
-
+
 
 
 
@@ -311,7 +311,7 @@
 http://www.example.org/contract/DoubleIt}DoubleItTransportKVTPort"; 
createdFromAPI="true">
 
 
-
+
 
 
 
@@ -320,7 +320,7 @@
 
 
 
-
+
 
 
 
@@ -334,7 +334,7 @@
 
 
 
-
+
 
 
 
@@ -348,7 +348,7 @@
 
 
 
-
+
 
 
 
@@ -362,7 +362,7 @@
 
 
 
-
+
 
 
 
@@ -376,7 +376,7 @@
 
 
 
-
+
 
 
 
@@ -396,7 +396,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
---

[02/38] cxf git commit: Switching username cfg tag

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
index 8e93a35..5955800 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml
@@ -25,7 +25,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1EndorsingPort";
 createdFromAPI="true">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
index d015642..4ce34a9 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
@@ -54,7 +54,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
index 7c9262f..c2dcf9b 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
@@ -53,7 +53,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
index 085b13a..b3fc758 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
@@ -25,7 +25,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -45,7 +45,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -54,7 +54,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Soap12Port";
 createdFromAPI="true">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
index 00669a6..4c9f20a 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
+++ 
b/services/sts/systests/basic

[06/38] cxf git commit: Switching signature username

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
index 65a787b..f8121c8 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
@@ -33,7 +33,7 @@
 http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
--
diff --git 
a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
 
b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
index a69e8d4..c178a17 100644
--- 
a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
+++ 
b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
@@ -106,7 +106,7 @@
 
 
 
-
+
 
 
 
@@ -128,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -138,7 +138,7 @@
 
 
 
-
+
 
 
 
@@ -183,7 +183,7 @@
 
 
 
-
+
 
 
 
@@ -200,7 +200,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
index 4ea9fec..002ccc7 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java
@@ -160,7 +160,7 @@ public class JAXRSOAuth2Test extends 
AbstractBusClientServerTestBase {

"org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
 properties.put("ws-security.saml-callback-handler", 

"org.apache.cxf.systest.jaxrs.security.oauth2.SamlCallbackHandler2");
-properties.put("ws-security.signature.username", "alice");
+properties.put("security.signature.username", "alice");
 properties.put("ws-security.signature.properties", 
CRYPTO_RESOURCE_PROPERTIES);
 bean.setProperties(properties);
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
index 36773f8..ac72a72 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
@@ -220,7 +220,7 @@ public class JAXRSSamlTest extends 
AbstractBusClientServerTestBase {

"org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
 properties.put("ws-security.saml-callback-handler", 

"org.apache.cxf.systest.jaxrs.security.saml.SamlCallbackHandler");
-properties.put("ws-security.signature.username", "alice");
+properties.put("security.signature.username", "alice");
 properties.put("ws-security.signature.properties", 

"org/apache/cxf/systest/jaxrs/security/alice.properties");
 if (selfSign) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/9303

[21/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
--
diff --git 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
index 5c470a3..c105712 100644
--- 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
+++ 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 
@@ -58,7 +58,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
--
diff --git 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
index 606dd4a..3ff409b 100644
--- 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
+++ 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
@@ -33,7 +33,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
--
diff --git 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
index a54bb03..9d427c5 100644
--- 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
+++ 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
@@ -64,7 +64,7 @@
 
 http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="DefaultSTS" 
implementor="#transportSTSProviderBean" 
address="https://localhost:30101/SecurityTokenService/a"; 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
 depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService" 
endpointName="ns1:Transport_Port">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
--
diff --git 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
index 4a7d789..f35c23e 100644
--- 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
+++ 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
@@ -63,7 +63,7 @@
 
 http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="BSTS" 
implementor="#transportSTSProviderBean" 
address="https://localhost:30102/SecurityTokenService/b"; 
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/cross_domain/sts-b.wsdl"
 depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService" 
endpointName="ns1:Transport_STSB_Port">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
--
diff --git 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/s

[19/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
index 130d310..4db22da 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
@@ -28,7 +28,7 @@
 
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 
@@ -57,7 +57,7 @@
 
 
 
-
+
 
 
 
@@ -70,7 +70,7 @@
 
 
 
-
+
 
 
 
@@ -86,7 +86,7 @@
 
 
 
-
+
 
 
 
@@ -99,7 +99,7 @@
 
 
 
-
+
 
 
 
@@ -115,7 +115,7 @@
 
 
 
-
+
 
 
 
@@ -128,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -144,7 +144,7 @@
 
 
 
-
+
 
 
 
@@ -157,7 +157,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
index 27241fe..c2bd6d5 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
@@ -22,7 +22,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="doubleitasymmetricsaml2bearer" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItAsymmetricSAML2BearerPort" 
serviceName="s:DoubleItService" 
address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer";
 wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
 
 
-
+
 
 
 
@@ -34,7 +34,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="doubleitasymmetricsaml2bearer2" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItAsymmetricSAML2BearerPort2" 
serviceName="s:DoubleItService" 
address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer2";
 wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
 
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="doubleitasymmetricsaml2bearer3" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItAsymmetricSAML2BearerPort3" 
serviceName="s:DoubleItService" 
address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer3";
 wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
 
 
-
+
 
 
 
@@ -58,7 +58,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="doubleitasymmetricsaml2bearer4" 
implementor="org.

[15/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
index 08bfc4c..c9cecf0 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml
@@ -56,7 +56,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -65,7 +65,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort2"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -79,35 +79,35 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml1SelfSignedTransportPort";
 createdFromAPI="true">
 
-
+
 
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml1SelfSignedTransportSP11Port";
 createdFromAPI="true">
 
-
+
 
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingTransportPort";
 createdFromAPI="true">
 
-
+
 
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingTransportSP11Port";
 createdFromAPI="true">
 
-
+
 
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSamlInitiatorPort";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -122,7 +122,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedPort";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -131,7 +131,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigningPort";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -140,7 +140,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricEncryptedPort";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -149,14 +149,14 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingEncryptedTransportPort";
 createdFromAPI="true">
 
-
+
 
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItInlinePolicyPort"; 
createdFromAPI="true">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
index 0ee0a06..96b7f53 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
@@ -57,14 +57,14 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="Saml1SupportingToken" 
address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1Supporting"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SupportingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" 
depends-on="tls-settings">
 
-
+
 
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="Saml2TokenOverSymmetric" 
address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Symmetric"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
 
-
+
 
 
 
@@ -72,7 +72,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="Saml2TokenOverAsymmetric" 
address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Asymmetric"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2AsymmetricPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.

[16/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
index 85cbb15..4c1108a 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
@@ -26,14 +26,14 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSoap11Port"; 
createdFromAPI="true">
 
-
+
 
 
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSoap12Port"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -45,7 +45,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml
index d9edaf1..194eae0 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/modified-server.xml
@@ -28,7 +28,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="Asymmetric" 
address="http://localhost:${testutil.ports.ModifiedRequestServer}/DoubleItAsymmetric";
 serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
 
-
+
 
 
 
@@ -37,7 +37,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricStreaming" 
address="http://localhost:${testutil.ports.ModifiedRequestServer.2}/DoubleItAsymmetric";
 serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
index 8650e48..647d257 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
@@ -27,19 +27,19 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="Soap11" address="http://localhost:${testutil.ports.Server}/DoubleItSoap11"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11Port" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="Soap12" address="http://localhost:${testutil.ports.Server}/DoubleItSoap12"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12Port" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="Soap12Dispatch" 
address="http://localhost:${testutil.ports.Server}/DoubleItSoap12Dispatch"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12DispatchPort" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml
index 9cab02d..a0f1252 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/c

[34/38] cxf git commit: Switching signature properties

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
index d63594d..f4acc30 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
@@ -23,7 +23,7 @@
 
 
 
-
+
 
 
 
@@ -32,7 +32,7 @@
 
 
 
-
+
 
 
 
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
index d4c9425..091120d 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
@@ -22,14 +22,14 @@
 http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml2bearer" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML2BearerPort" 
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2bearer";
 wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
 
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml2bearer2" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML2BearerPort2" 
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2bearer2";
 wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
index 00c5862..eb589ac 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
@@ -22,7 +22,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml2bearer" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML2BearerPort" 
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2bearer";
 wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="doubleittransportsaml2bearer2" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItTransportSAML2BearerPort2" 
serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" 
address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2bearer2";
 wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl">
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
 
b/service

[31/38] cxf git commit: Switching signature properties

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
index 9877e68..11be458 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml
@@ -28,7 +28,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="OnlySignEntireHeadersAndBodyEndpoint" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItOnlySign"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 
 
-
+
 
 
 
@@ -42,7 +42,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="NotOnlySignEntireHeadersAndBodyEndpoint" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItNotOnlySign"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItNotOnlySignPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 
 
-
+
 
 
 
@@ -56,7 +56,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="EncryptSignatureEndpoint" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptSignature";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 
 
-
+
 
 
 
@@ -70,7 +70,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="EncryptSignatureEndpoint2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptSignature2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 
 
-
+
 
 
 
@@ -84,7 +84,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="IncludeTimestampEndpoint" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItIncludeTimestamp";
 serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 
 
-
+
 
 
 
@@ -98,7 +98,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="IncludeTimestampEndpoint2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItIncludeTimestamp2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 
 
-
+
 
 
 
@@ -112,7 +112,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="EncryptBeforeSigningEndpoint" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptBeforeSigning";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptBeforeSigningPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 
 
-
+
 
 
 
@@ -126,7 +126,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="EncryptBeforeSigningEndpoint2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptBeforeSigning2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptBeforeSigningPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 
 
-
+
 
 
 
@@ -140,7 +140,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignBeforeEncryptingEndpoint" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignBeforeEncrypting";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignBeforeEncryptingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
 

[13/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
index 5068512..80813b8 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml
@@ -30,13 +30,13 @@
 http://WSSec/wssec10}UserNameOverTransport_IPingService"; 
createdFromAPI="true">
 
 
-
+
 
 
 http://WSSec/wssec10}UserName_IPingService"; 
createdFromAPI="true">
 
 
-
+
 
 
 https://.*/UserNameOverTransport.*";>
@@ -55,7 +55,7 @@
 http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; 
createdFromAPI="true">
 
 
-
+
 
 
 
@@ -66,7 +66,7 @@
 http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService";
 createdFromAPI="true">
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml
index 011cf20..3348840 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml
@@ -30,13 +30,13 @@
 http://WSSec/wssec10}UserNameOverTransport_IPingService"; 
createdFromAPI="true">
 
 
-
+
 
 
 http://WSSec/wssec10}UserName_IPingService"; 
createdFromAPI="true">
 
 
-
+
 
 
 https://.*/UserNameOverTransport.*";>
@@ -55,7 +55,7 @@
 http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; 
createdFromAPI="true">
 
 
-
+
 
 
 
@@ -66,7 +66,7 @@
 http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService";
 createdFromAPI="true">
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml
index f0f85cd..a09fb2a 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml
@@ -27,13 +27,13 @@
 http://WSSec/wssec10}UserName_IPingService_hashed"; 
createdFromAPI="true">
 
 
-
+
 
 
 http://WSSec/wssec10}UserNameOverTransport_IPingService"; 
createdFromAPI="true">
 
 
-
+
 
 
 https://.*/UserNameOverTransport.*";>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
index 0aca5d7..2b027fc 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
@@ -50,13 +50,13 @@
 https://localhost:${testutil.ports.Server.1}/UserNameOverTransport"; 
serviceName="interop:PingService" 
endpointName="interop:UserNameOverTransport_IPingService" 
implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport" 
depends-on="tls-settings">
 
 
-
+
 
 
 http://localhost:${testutil.ports.Server}/UserName"; 
serviceNa

[01/38] cxf git commit: Switching username cfg tag

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 6da8e6298 -> 0d0bc9381


http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml
index 5048afb..334265a 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml
@@ -26,7 +26,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -42,7 +42,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort2"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -58,7 +58,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort3"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -74,7 +74,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -90,7 +90,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort2";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -106,7 +106,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort3";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -122,7 +122,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedSupportingPort";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -138,7 +138,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedSupportingPort2";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -154,7 +154,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedSupportingPort3";
 createdFromAPI="true">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml
index e64ff54..55e397f 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml
@@ -26,7 +26,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItEndorsingSupportingPort";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItEndorsingSupportingPort2";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -56,7 +56,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItEndorsingSupportingPort3";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -71,7 +71,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedEndorsingSupportingPort";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -86,7 +86,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedEndorsingSupportingPort2";
 createdFromAPI="true">
 
-
+
 
 
 
@@ -101,7 +101,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSignedEndorsingSupportingPort3";
 createdFromAPI="true">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
index e9ee9d3..8e855e2 100644
--- 
a/systests/ws-security/src/test/reso

[18/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
--
diff --git 
a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
 
b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
index ebf665b..a0d91e6 100644
--- 
a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
+++ 
b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml
@@ -50,43 +50,43 @@
 http://www.example.org/contract/DoubleIt"; 
id="SpnegoOverSymmetric" 
address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetric"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricPort" 
implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SpnegoOverSymmetricDerived" 
address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricDerived";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSpnegoSymmetricDerivedPort" 
implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SpnegoOverSymmetricEncryptBeforeSigning" 
address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricEncryptBeforeSigning";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSpnegoSymmetricEncryptBeforeSigningPort" 
implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SpnegoOverTransport" 
address="https://localhost:${testutil.ports.Server.2}/DoubleItSpnegoTransport"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportPort" 
implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" 
depends-on="tls-settings">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SpnegoOverTransportEndorsing" 
address="https://localhost:${testutil.ports.Server.2}/DoubleItSpnegoTransportEndorsing";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSpnegoTransportEndorsingPort" 
implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" 
depends-on="tls-settings">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SpnegoOverTransportEndorsingSP11" 
address="https://localhost:${testutil.ports.Server.2}/DoubleItSpnegoTransportEndorsingSP11";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSpnegoTransportEndorsingSP11Port" 
implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl" 
depends-on="tls-settings">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SpnegoOverSymmetricSecureConversation" 
address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricSecureConversation";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSpnegoSymmetricSecureConversationPort" 
implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
--
diff --git 
a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
 
b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
index 0b5defe..0c8b759 100644
--- 
a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
+++ 
b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
@@ -51,42 +51,42 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SpnegoOverSymmetricDerived" 
address="http://localhost:${test

[04/38] cxf git commit: Switching password tag value

[coheigea]

Switching password tag value


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/354ac95b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/354ac95b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/354ac95b

Branch: refs/heads/master
Commit: 354ac95b70a98b4f2e8f9f33c534b3e885e9a935
Parents: eadb92c
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:30:59 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:30:59 2015 +0100

--
 .../apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml| 4 ++--
 .../resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml  | 2 +-
 .../test/java/org/apache/cxf/systest/ws/fault/FaultTest.java   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/354ac95b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
--
diff --git 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
index 17ca287..1363d27 100644
--- 
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
+++ 
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
@@ -26,13 +26,13 @@
 http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort"; 
createdFromAPI="true">
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt}DoubleItTransportUTAuthorizationPort";
 createdFromAPI="true">
 
 
-
+
 
 
 https://localhost.*";>

http://git-wip-us.apache.org/repos/asf/cxf/blob/354ac95b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
index 4c9f20a..128de7a 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
@@ -31,7 +31,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/354ac95b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index 1d11164..277e7f1 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -91,7 +91,7 @@ public class FaultTest extends 
AbstractBusClientServerTestBase {
 
 // Now make an invocation using another username
 ((BindingProvider)utPort).getRequestContext().put("security.username", 
"bob");
-
((BindingProvider)utPort).getRequestContext().put("ws-security.password", 
"password");
+((BindingProvider)utPort).getRequestContext().put("security.password", 
"password");
 try {
 utPort.doubleIt(25);
 fail("Expected failure on bob");
@@ -124,7 +124,7 @@ public class FaultTest extends 
AbstractBusClientServerTestBase {
 
 // Now make an invocation using another username
 ((BindingProvider)utPort).getRequestContext().put("security.username", 
"bob");
-
((BindingProvider)utPort).getRequestContext().put("ws-security.password", 
"password");
+((BindingProvider)utPort).getRequestContext().put("security.password", 
"password");
 try {
 utPort.doubleIt(25);
 fail("Expected failure on bob");
@@ -179,7 +179,7 @@ public class FaultTest extends 
AbstractBusClientServerTestBase {
 
 // Now make an invocation using another username
 client.getRequestContext().put("security.username", "bob");
-client.getRequestContext().put("ws-security.password", "password");
+client.getRequestContext().put("security.password", "password");
 try {
 dispatch.invoke(request);
 fail("Expected failure on bob");

[24/38] cxf git commit: Switching encryption cfg

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
index 9d82ceb..b275629 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
@@ -115,7 +115,7 @@
 
 
 
-
+
 
 
 
@@ -123,7 +123,7 @@
 
 
 
-
+
 
 
 
@@ -131,7 +131,7 @@
 
 
 
-
+
 
 
 
@@ -139,7 +139,7 @@
 
 
 
-
+
 
 
 
@@ -147,7 +147,7 @@
 
 
 
-
+
 
 http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
 
@@ -210,7 +210,7 @@
 
 
 
-
+
 
 
 
@@ -301,7 +301,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="TransportKVT" 
address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportKVT"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItTransportKVTPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" 
depends-on="tls-settings">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
index 344d69e..fb70a0a 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
@@ -126,7 +126,7 @@
 
 
 
-
+
 
 
 
@@ -135,7 +135,7 @@
 
 
 
-
+
 
 
 
@@ -144,7 +144,7 @@
 
 
 
-
+
 
 
 
@@ -153,7 +153,7 @@
 
 
 
-
+
 
 
 
@@ -162,7 +162,7 @@
 
 
 
-
+
 
 http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
 
@@ -232,7 +232,7 @@
 
 
 
-
+
 
 
 
@@ -337,7 +337,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="TransportKVT" 
address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItX509TransportKVT";
 serviceName="s:DoubleItService" endpointName="s:DoubleItTransportKVTPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" 
depends-on="tls-settings">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
index 5329993..ac67efe 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
@@ -54,7 +54,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItSymmetricPort"; 
createdFromAPI="true">
 
-
+
 
 
 
@@ -75,7 +75,7 @@
 
 http://www.example.org/contract/DoubleIt}DoubleItAsymmetricPort"; 
createdFromAPI="true">
 
-
+
 
 
 

[10/38] cxf git commit: Switching encryption username

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml
index d2b229c..1e23efc 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
index bd3debb..6f3d9f7 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
index bbfd430..0a7c90f 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
index bab7120..dd80235 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml
@@ -52,7 +52,7 @@
 
 
 
-
+
 
 
 
@@ -62,7 +62,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSymmetricSESupportingPort";
 createdFromAPI="true">
@@ -70,7 +70,7 @@
 
 
 
-
+
 
 
 https://localhost:.*";>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
index 06d2c2e..257bef0 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml
@@ -49,7 +49,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml
index 9228107..834e2c8 100644

[30/38] cxf git commit: Switching signature properties

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
index 1b7a160..0b23b56 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
@@ -28,7 +28,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="RequiredParts" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -42,7 +42,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="RequiredParts2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -56,7 +56,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="RequiredElements" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -70,7 +70,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="RequiredElements2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredElements2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -84,7 +84,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedParts" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -98,7 +98,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedParts2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -112,7 +112,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedParts3" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts3"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -126,7 +126,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedElements" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedElements"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -140,7 +140,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedElements2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedElements2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
 
 
-
+
 
 
 
@@ -154,7 +154,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncr

[38/38] cxf git commit: Switching remaining SAML Cfg tags

[coheigea]

Switching remaining SAML Cfg tags


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0d0bc938
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0d0bc938
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0d0bc938

Branch: refs/heads/master
Commit: 0d0bc938103b0ea9311c3b73f6c385aa3e12260c
Parents: 9a2c826
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:43:38 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:43:38 2015 +0100

--
 .../systest/sts/username_actas/cxf-service.xml  |  2 +-
 .../sts/username_onbehalfof/cxf-service.xml |  2 +-
 .../cxf/systest/ws/rm/sec/server-policy.xml |  2 +-
 .../cxf/systest/wssec/examples/saml/server.xml  | 14 +++---
 .../systest/wssec/examples/saml/stax-server.xml | 14 +++---
 .../systest/wssec/examples/secconv/server.xml   |  2 +-
 .../wssec/examples/secconv/stax-server.xml  |  2 +-
 .../cxf/systest/wssec/examples/ut/server.xml|  4 +-
 .../systest/wssec/examples/ut/stax-server.xml   |  4 +-
 .../cxf/systest/wssec/examples/x509/server.xml  |  8 ++--
 .../systest/wssec/examples/x509/stax-server.xml |  8 ++--
 .../apache/cxf/systest/ws/algsuite/server.xml   | 12 ++---
 .../cxf/systest/ws/algsuite/stax-server.xml | 10 ++---
 .../apache/cxf/systest/ws/bindings/server.xml   | 42 +-
 .../cxf/systest/ws/bindings/stax-server.xml | 42 +-
 .../org/apache/cxf/systest/ws/gcm/server.xml|  6 +--
 .../apache/cxf/systest/ws/gcm/stax-server.xml   |  6 +--
 .../org/apache/cxf/systest/ws/parts/server.xml  | 42 +-
 .../apache/cxf/systest/ws/parts/stax-server.xml | 40 -
 .../org/apache/cxf/systest/ws/policy/server.xml | 10 ++---
 .../org/apache/cxf/systest/ws/saml/server.xml   | 36 +++
 .../apache/cxf/systest/ws/saml/stax-server.xml  | 36 +++
 .../cxf/systest/ws/tokens/endorsing-server.xml  | 12 ++---
 .../org/apache/cxf/systest/ws/tokens/server.xml | 18 
 .../systest/ws/tokens/stax-endorsing-server.xml | 12 ++---
 .../cxf/systest/ws/tokens/stax-server.xml   | 18 
 .../apache/cxf/systest/ws/ut/server-derived.xml |  6 +--
 .../org/apache/cxf/systest/ws/ut/server.xml |  4 +-
 .../apache/cxf/systest/ws/ut/stax-server.xml|  4 +-
 .../apache/cxf/systest/ws/wssec10/server.xml|  4 +-
 .../systest/ws/wssec10/server_restricted.xml|  4 +-
 .../cxf/systest/ws/wssec10/stax-server.xml  |  4 +-
 .../ws/wssec10/stax-server_restricted.xml   |  4 +-
 .../org/apache/cxf/systest/ws/x509/server.xml   | 46 ++--
 .../apache/cxf/systest/ws/x509/stax-server.xml  | 46 ++--
 35 files changed, 263 insertions(+), 263 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
index 285d2d3..c30f83a 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
@@ -65,7 +65,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="doubleitasymmetricsaml2bearer5" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItAsymmetricSAML2BearerPort5" 
serviceName="s:DoubleItService" 
address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer5";
 wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">

http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
index fa120a7..53e44ae 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
@@ -65,7 +65,7 @@
 
 
 
-
+
 
 
 http://www.example.o

[36/38] cxf git commit: Switching remaining SAML Cfg tags

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
index 81825bf..62b5e6a 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
@@ -157,7 +157,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricPKIPath" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricPKIPath";
 serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPKIPathPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
@@ -165,7 +165,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricEncryptBeforeSigning" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricEncryptBeforeSigning";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
@@ -173,7 +173,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricEncryptBeforeSigningNoEnc" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricEncryptBeforeSigningNoEnc";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricEncryptBeforeSigningNoEncPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
@@ -181,7 +181,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricEncryptSignature" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricEncryptSignature";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricEncryptSignaturePort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
@@ -189,21 +189,21 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricSignature" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricSignature";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricSignaturePort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricSignatureSP11" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricSignatureSP11";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricSignatureSP11Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricEncryption" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricEncryption";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricEncryptionPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
@@ -226,7 +226,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricUsernameToken" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricUsernameToken";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricUsernameTokenPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
@@ -234,7 +234,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricEndorsing" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricEndorsing";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricEndorsingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
@@ -242,7 +2

[22/38] cxf git commit: Switching CallbackHandler

[coheigea]

Switching CallbackHandler


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ee64acf5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ee64acf5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ee64acf5

Branch: refs/heads/master
Commit: ee64acf5f8370cd1e33719e4d9d4e9922e386602
Parents: 2a5d201
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:35:33 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:35:33 2015 +0100

--
 .../src/main/resources/etc/policy-asym.xml  |  4 +-
 .../src/main/resources/etc/policy-sym.xml   |  4 +-
 .../src/main/resources/etc/policy-symsc.xml |  4 +-
 .../src/main/resources/wssec-client-stax.xml|  4 +-
 .../sts/src/main/resources/wssec-client.xml |  4 +-
 .../src/main/resources/wssec-server-stax.xml|  2 +-
 .../sts/src/main/resources/wssec-server.xml |  2 +-
 .../sts/src/main/resources/wssec-sts-stax.xml   |  2 +-
 .../sts/src/main/resources/wssec-sts.xml|  2 +-
 .../src/main/resources/ClientConfig.xml |  2 +-
 .../src/main/resources/ClientConfigStax.xml |  2 +-
 .../src/main/resources/ServiceConfig.xml|  2 +-
 .../src/main/resources/ServiceConfigStax.xml|  2 +-
 .../src/main/resources/ClientConfig.xml |  2 +-
 .../src/main/resources/ClientConfigStax.xml |  2 +-
 .../src/main/resources/ServiceConfig.xml|  2 +-
 .../src/main/resources/ServiceConfigStax.xml|  2 +-
 .../main/webapp/WEB-INF/cxf-encrypted-ut.xml|  2 +-
 .../src/main/webapp/WEB-INF/cxf-transport.xml   |  2 +-
 .../sts-war/src/main/webapp/WEB-INF/cxf-ut.xml  |  2 +-
 .../src/main/webapp/WEB-INF/cxf-x509.xml|  2 +-
 .../SecurityContextTokenCancelTest.java |  2 +-
 .../cxf/systest/sts/asymmetric_encr/cxf-sts.xml |  2 +-
 .../sts/asymmetric_encr/stax-cxf-sts.xml|  2 +-
 .../cxf/systest/sts/basic_auth/cxf-service.xml  |  2 +-
 .../systest/sts/basic_auth/stax-cxf-service.xml |  2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml |  6 +-
 .../binarysecuritytoken/stax-cxf-service.xml|  6 +-
 .../systest/sts/caching/cxf-caching-service.xml |  6 +-
 .../cxf/systest/sts/caching/cxf-client.xml  |  6 +-
 .../cxf/systest/sts/caching/cxf-service.xml |  4 +-
 .../cxf/systest/sts/claims/cxf-bad-client.xml   |  2 +-
 .../systest/sts/claims/cxf-client-cbhandler.xml |  4 +-
 .../cxf/systest/sts/claims/cxf-client.xml   |  6 +-
 .../cxf/systest/sts/claims/cxf-service.xml  | 10 +--
 .../cxf/systest/sts/claims/stax-cxf-service.xml | 10 +--
 .../cxf/systest/sts/cross_domain/cxf-client.xml |  4 +-
 .../systest/sts/cross_domain/cxf-service.xml|  4 +-
 .../systest/sts/cross_domain/cxf-sts-saml1.xml  |  2 +-
 .../systest/sts/cross_domain/cxf-sts-saml2.xml  |  2 +-
 .../sts/custom_onbehalfof/cxf-client.xml|  2 +-
 .../sts/custom_onbehalfof/cxf-service.xml   |  4 +-
 .../sts/distributed_caching/cxf-client.xml  |  2 +-
 .../sts/distributed_caching/cxf-service.xml |  6 +-
 .../systest/sts/kerberos/cxf-intermediary.xml   |  4 +-
 .../cxf/systest/sts/kerberos/cxf-service.xml|  2 +-
 .../cxf/systest/sts/realms/cxf-client.xml   |  8 +--
 .../cxf/systest/sts/realms/cxf-service.xml  |  8 +--
 .../cxf/systest/sts/realms/cxf-sts-saml1.xml|  6 +-
 .../cxf/systest/sts/realms/cxf-sts-saml2.xml|  2 +-
 .../apache/cxf/systest/sts/renew/cxf-client.xml |  8 +--
 .../cxf/systest/sts/renew/cxf-service.xml   |  8 +--
 .../cxf/systest/sts/secure_conv/cxf-client.xml  |  2 +-
 .../cxf/systest/sts/secure_conv/cxf-service.xml |  6 +-
 .../cxf/systest/sts/soap12/cxf-client.xml   |  2 +-
 .../cxf/systest/sts/soap12/cxf-service.xml  |  4 +-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml |  4 +-
 .../sts/sts_sender_vouches/cxf-client.xml   |  4 +-
 .../sts/sts_sender_vouches/cxf-service.xml  |  2 +-
 .../systest/sts/sts_sender_vouches/cxf-sts.xml  |  2 +-
 .../sts/sts_sender_vouches/stax-cxf-sts.xml |  2 +-
 .../systest/sts/transformation/cxf-client.xml   |  4 +-
 .../systest/sts/transformation/cxf-service.xml  |  4 +-
 .../systest/sts/usernametoken/cxf-client.xml|  4 +-
 .../systest/sts/usernametoken/cxf-service.xml   |  8 +--
 .../sts/usernametoken/stax-cxf-service.xml  |  4 +-
 .../sts/symmetric/SymmetricBindingTest.java |  2 +-
 .../cxf/systest/sts/template/TemplateTest.java  |  2 +-
 .../sts/transport/TransportBindingTest.java |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   | 10 +--
 .../cxf/systest/sts/asymmetric/cxf-service.xml  |  6 +-
 .../systest/sts/asymmetric/cxf-stax-service.xml |  6 +-
 .../cxf/systest/sts/bearer/cxf-client.xml   |  2 +-
 .../cxf/systest/sts/bearer/cxf-service.xml  |  4 +-
 .../cxf/systest/sts/bearer/cxf-stax-service.xml |  4 +-
 .../sts/delega

[29/38] cxf git commit: Switching signature properties

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
index 114c116..c5cc585 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml
@@ -28,7 +28,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="EndorsingSupportingTokens" 
address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItEndorsingSupporting";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEndorsingSupportingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="EndorsingSupportingTokens2" 
address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItEndorsingSupporting2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEndorsingSupportingPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
 
-
+
 
 
 
@@ -54,7 +54,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="EndorsingSupportingTokens3" 
address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItEndorsingSupporting3";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEndorsingSupportingPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
 
-
+
 
 
 
@@ -67,7 +67,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedEndorsingSupportingTokens" 
address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItSignedEndorsingSupporting";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEndorsingSupportingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
 
-
+
 
 
 
@@ -80,7 +80,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedEndorsingSupportingTokens2" 
address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItSignedEndorsingSupporting2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEndorsingSupportingPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
 
-
+
 
 
 
@@ -93,7 +93,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedEndorsingSupportingTokens3" 
address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItSignedEndorsingSupporting3";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEndorsingSupportingPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
index 36234bf..e64cb84 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
@@ -28,7 +28,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedSupportingTokens" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignedSupporting"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="SignedSupportingTokens2" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignedSupporting2"; 
serviceName="s:DoubleItService" endpointName="s:Doubl

[08/38] cxf git commit: Switching encryption username

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
index a731bcb..a1e6e7f 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 
@@ -57,7 +57,7 @@
 
 
 
-
+
 
 
 
@@ -71,7 +71,7 @@
 
 
 
-
+
 
 
 
@@ -85,7 +85,7 @@
 
 
 
-
+
 
 
 
@@ -99,7 +99,7 @@
 
 
 
-
+
 
 
 
@@ -113,7 +113,7 @@
 
 
 
-
+
 
 
 
@@ -127,7 +127,7 @@
 
 
 
-
+
 
 
 
@@ -141,7 +141,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
index 8e855e2..f31dc7b 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml
@@ -53,7 +53,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSymmetricEndorsingEncryptedPort";
 createdFromAPI="true">
@@ -61,7 +61,7 @@
 
 
 
-
+
 
 
 http://www.example.org/contract/DoubleIt}DoubleItSymmetricSignedEndorsingEncryptedPort";
 createdFromAPI="true">
@@ -69,7 +69,7 @@
 
 
 
-
+
 
 
 https://localhost:.*";>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
index fd09417..0aca5d7 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml
@@ -66,7 +66,7 @@
 
 
 
-
+
 
 
 
@@ -78,7 +78,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
index 11427a5..63e8608 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml
@@ -66,7 +66,7 @@
 
 
 
-
+
 
 
 
@@ -78,7 +78,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache

[17/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
--
diff --git 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
index 3adf162..7fa1b6d 100644
--- 
a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
+++ 
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml
@@ -27,7 +27,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricSignEncrypt" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509AsymmetricSignEncrypt";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricSignEncryptPort" 
implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
@@ -36,7 +36,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="AsymmetricProtectTokens" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509AsymmetricProtectTokens";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItAsymmetricProtectTokensPort" 
implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
@@ -45,7 +45,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SymmetricSignEncrypt" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509SymmetricSignEncrypt";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSymmetricSignEncryptPort" 
implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
@@ -54,7 +54,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SymmetricEndorsing" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509SymmetricEndorsing";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSymmetricEndorsingPort" 
implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index 2f7a1e5..7f07445 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -161,7 +161,7 @@ public class FaultTest extends 
AbstractBusClientServerTestBase {
 // Add WS-Security configuration
 Client client = ((DispatchImpl) dispatch).getClient();
 client.getRequestContext().put(
-"ws-security.callback-handler",
+"security.callback-handler",
 "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"
 );
 client.getRequestContext().put(

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java
--
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java
index 2b1a154..a4a7947 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java
@@ -28,7 +28,7 @@ import org.apache.cxf.annotations.EndpointProperty;
 
 @WebService(name = "HelloPolicyService", serviceName = "HelloPolicyService")
 @EndpointProperties(value = {
-@EndpointProperty(key = "ws-security.callback-handler", 
+@EndpointProperty(key = "security.callback-handler", 
 value = 
"org.apache.cxf.systest.ws.policy.handler.CommonPasswordCallback"),
 @EndpointProperty(key = "ws-security.is-bsp-compliant", value = 
"false"),
 @E

[14/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
index a1e6e7f..db6356d 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml
@@ -27,7 +27,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SignedSupportingTokens" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
 
 
 
@@ -41,7 +41,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SignedSupportingTokens2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
 
 
 
@@ -55,7 +55,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SignedSupportingTokens3" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting3";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
 
 
 
@@ -69,7 +69,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="EncryptedSupportingTokens" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedSupportingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
 
 
 
@@ -83,7 +83,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="EncryptedSupportingTokens2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedSupportingPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
 
 
 
@@ -97,7 +97,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="EncryptedSupportingTokens3" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting3";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedSupportingPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
 
 
 
@@ -111,7 +111,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SignedEncryptedSupportingTokens" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEncryptedSupportingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
 
 
 
@@ -125,7 +125,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SignedEncryptedSupportingTokens2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEncryptedSupportingPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
 
 
 
@@ -139,7 +139,7 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SignedEncryptedSupportingTokens3" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting3";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEncryptedSupportingPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
 
-
+
  

[33/38] cxf git commit: Switching signature properties

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
index 557066a..fa120a7 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
@@ -23,7 +23,7 @@
 
 
 
-
+
 
 
 
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 
@@ -59,7 +59,7 @@
 
 
 
-
+
 
 
 
@@ -72,7 +72,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
index 73697a8..c488143 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
@@ -23,7 +23,7 @@
 
 
 
-
+
 
 
 
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 
@@ -59,7 +59,7 @@
 
 
 
-
+
 
 
 
@@ -71,7 +71,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
index 5df25cf..a2b5740 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
@@ -32,7 +32,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
index 0737f82..6d82a88 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 
@@ -45,7 +45,7 @@
 http://www.example.org/contract/DoubleIt"; 
id="doubleitsymmetricsaml1" 
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" 
endpointName="s:DoubleItSymmetricSAML1Port" serviceName="s:DoubleItService" 
address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitsymmetricsaml1";
 wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
 
 
-
+
 
  

[12/38] cxf git commit: Switching CallbackHandler

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
index da9917d..9d82ceb 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml
@@ -41,32 +41,32 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="SymmetricErrorMessage" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricErrorMessage";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSymmetricErrorMessagePort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifier" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifierDerived" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifierDerived";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItKeyIdentifierDerivedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifierEncryptBeforeSigning" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifierEncryptBeforeSigning";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItKeyIdentifierEncryptBeforeSigningPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifierEncryptBeforeSigningDerived" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifierEncryptBeforeSigningDerived";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItKeyIdentifierEncryptBeforeSigningDerivedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
@@ -77,43 +77,43 @@
 
 http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifier2" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleIt2Impl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItOperations.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="IssuerSerial" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509IssuerSerial"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItIssuerSerialPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="Thumbprint" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509Thumbprint"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItThumbprintPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SymmetricThumbprintEndorsing" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricThumbprintEndorsing";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSymmetricThumbprintEndorsingPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
 
-
+
 
 
 
 http://www.example.org/contract/DoubleIt"; 
id="SymmetricEndorsingEncrypted" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricEndorsingEncrypted";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 

[03/38] cxf git commit: Switching username cfg tag

[coheigea]

Switching username cfg tag


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eadb92c9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eadb92c9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eadb92c9

Branch: refs/heads/master
Commit: eadb92c9d8af84f8754efe7f08c69fc60b82c9c3
Parents: 6da8e62
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:29:49 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:29:49 2015 +0100

--
 .../src/main/resources/wssec-client-stax.xml|  2 +-
 .../sts/src/main/resources/wssec-client.xml |  2 +-
 .../src/main/resources/ClientConfig.xml |  2 +-
 .../src/main/resources/ClientConfigStax.xml |  2 +-
 .../src/main/resources/ClientConfig.xml |  2 +-
 .../src/main/resources/ClientConfigStax.xml |  2 +-
 .../delegation/WSSUsernameCallbackHandler.java  |  2 +-
 .../custom_onbehalfof/CustomOnBehalfOfTest.java |  4 +-
 .../cxf/systest/sts/basic_auth/cxf-service.xml  |  2 +-
 .../systest/sts/basic_auth/stax-cxf-service.xml |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml |  2 +-
 .../binarysecuritytoken/stax-cxf-service.xml|  2 +-
 .../cxf/systest/sts/caching/cxf-client.xml  |  4 +-
 .../cxf/systest/sts/claims/cxf-bad-client.xml   |  2 +-
 .../systest/sts/claims/cxf-client-cbhandler.xml |  2 +-
 .../cxf/systest/sts/claims/cxf-client.xml   |  2 +-
 .../cxf/systest/sts/cross_domain/cxf-client.xml |  4 +-
 .../sts/custom_onbehalfof/cxf-client.xml|  2 +-
 .../sts/custom_onbehalfof/cxf-service.xml   |  2 +-
 .../sts/distributed_caching/cxf-client.xml  |  2 +-
 .../systest/sts/kerberos/cxf-intermediary.xml   |  4 +-
 .../cxf/systest/sts/realms/cxf-client.xml   |  8 ++--
 .../cxf/systest/sts/realms/cxf-service.xml  |  8 ++--
 .../apache/cxf/systest/sts/renew/cxf-client.xml |  8 ++--
 .../cxf/systest/sts/secure_conv/cxf-client.xml  |  2 +-
 .../cxf/systest/sts/soap12/cxf-client.xml   |  2 +-
 .../cxf/systest/sts/soap12/cxf-service.xml  |  2 +-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml   |  2 +-
 .../systest/sts/transformation/cxf-client.xml   |  4 +-
 .../sts/usernametoken/cxf-bad-client.xml|  4 +-
 .../systest/sts/usernametoken/cxf-client.xml|  4 +-
 .../systest/sts/usernametoken/cxf-service.xml   |  4 +-
 .../sts/usernametoken/stax-cxf-service.xml  |  2 +-
 .../sts/symmetric/SymmetricBindingTest.java |  2 +-
 .../cxf/systest/sts/template/TemplateTest.java  |  2 +-
 .../sts/transport/TransportBindingTest.java |  6 +--
 .../UsernameActAsCachingTest.java   | 34 
 .../sts/username_actas/UsernameActAsTest.java   |  6 +--
 .../UsernameOnBehalfOfCachingTest.java  | 34 
 .../UsernameOnBehalfOfTest.java |  6 +--
 .../cxf/systest/sts/asymmetric/cxf-client.xml   |  4 +-
 .../cxf/systest/sts/bearer/cxf-client.xml   |  2 +-
 .../cxf-bad-client.xml  |  4 +-
 .../intermediary_transformation/cxf-client.xml  |  2 +-
 .../cxf-intermediary-caching.xml|  2 +-
 .../cxf-intermediary.xml|  2 +-
 .../cxf/systest/sts/issuer/cxf-client.xml   |  6 +--
 .../apache/cxf/systest/sts/jaas/cxf-service.xml |  2 +-
 .../systest/sts/sendervouches/cxf-client.xml|  2 +-
 .../systest/sts/stsclient/cxf-client-name.xml   |  2 +-
 .../sts/stsclient/cxf-default-client.xml|  2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml|  4 +-
 .../cxf/systest/sts/template/cxf-client.xml |  4 +-
 .../systest/sts/transport/cxf-bad-client.xml|  6 +--
 .../cxf/systest/sts/transport/cxf-client.xml|  8 ++--
 .../systest/kerberos/wssec/kerberos/server.xml  |  8 ++--
 .../kerberos/wssec/kerberos/stax-server.xml |  8 ++--
 .../kerberos/wssec/kerberos/sts-client.xml  |  4 +-
 .../cxf/systest/ws/rm/sec/client-policy.xml |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml| 14 +++
 .../apache/cxf/systest/ws/fault/FaultTest.java  | 12 +++---
 .../apache/cxf/systest/ws/algsuite/client.xml   | 12 +++---
 .../apache/cxf/systest/ws/bindings/client.xml   | 42 ++--
 .../org/apache/cxf/systest/ws/parts/client.xml  | 42 ++--
 .../org/apache/cxf/systest/ws/policy/client.xml | 10 ++---
 .../org/apache/cxf/systest/ws/saml/server.xml   | 12 +++---
 .../apache/cxf/systest/ws/saml/stax-server.xml  | 12 +++---
 .../org/apache/cxf/systest/ws/tokens/client.xml | 18 -
 .../cxf/systest/ws/tokens/endorsing-client.xml  | 12 +++---
 .../apache/cxf/systest/ws/ut/client-derived.xml | 14 +++
 .../org/apache/cxf/systest/ws/ut/client.xml | 20 +-
 .../apache/cxf/systest/ws/ut/policy-client.xml  | 24 +--
 .../org/apache/cxf/systest/ws/wssc/client.xml   | 34 +

[35/38] cxf git commit: Switching signature properties

[coheigea]

Switching signature properties


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9a2c8262
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9a2c8262
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9a2c8262

Branch: refs/heads/master
Commit: 9a2c82620001b76a2065960686f9bc8f384c4d58
Parents: 5577461
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 10:39:09 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 10:39:09 2015 +0100

--
 .../src/main/resources/etc/policy-asym.xml  |  4 +-
 .../src/main/resources/wssec-client-stax.xml|  2 +-
 .../sts/src/main/resources/wssec-client.xml |  2 +-
 .../src/main/resources/wssec-server-stax.xml|  2 +-
 .../sts/src/main/resources/wssec-server.xml |  2 +-
 .../sts/src/main/resources/wssec-sts-stax.xml   |  2 +-
 .../sts/src/main/resources/wssec-sts.xml|  2 +-
 .../src/main/resources/ServiceConfig.xml|  2 +-
 .../src/main/resources/ServiceConfigStax.xml|  2 +-
 .../main/webapp/WEB-INF/cxf-encrypted-ut.xml|  2 +-
 .../sts-war/src/main/webapp/WEB-INF/cxf-ut.xml  |  2 +-
 .../src/main/webapp/WEB-INF/cxf-x509.xml|  2 +-
 .../cxf/systest/sts/asymmetric_encr/cxf-sts.xml |  2 +-
 .../sts/asymmetric_encr/stax-cxf-sts.xml|  2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml |  2 +-
 .../binarysecuritytoken/stax-cxf-service.xml|  2 +-
 .../systest/sts/caching/cxf-caching-service.xml |  4 +-
 .../cxf/systest/sts/caching/cxf-client.xml  |  2 +-
 .../cxf/systest/sts/caching/cxf-service.xml |  4 +-
 .../cxf/systest/sts/claims/cxf-service.xml  | 10 +--
 .../cxf/systest/sts/claims/stax-cxf-service.xml | 10 +--
 .../systest/sts/cross_domain/cxf-service.xml|  4 +-
 .../systest/sts/cross_domain/cxf-sts-saml2.xml  |  2 +-
 .../sts/custom_onbehalfof/cxf-service.xml   |  2 +-
 .../sts/distributed_caching/cxf-service.xml |  6 +-
 .../systest/sts/kerberos/cxf-intermediary.xml   |  2 +-
 .../cxf/systest/sts/kerberos/cxf-service.xml|  2 +-
 .../apache/cxf/systest/sts/renew/cxf-client.xml |  6 +-
 .../cxf/systest/sts/renew/cxf-service.xml   |  8 +-
 .../cxf/systest/sts/secure_conv/cxf-service.xml |  6 +-
 .../cxf/systest/sts/soap12/cxf-service.xml  |  2 +-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml   |  2 +-
 .../sts/sts_sender_vouches/cxf-service.xml  |  2 +-
 .../systest/sts/sts_sender_vouches/cxf-sts.xml  |  2 +-
 .../sts/sts_sender_vouches/stax-cxf-sts.xml |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   |  6 +-
 .../cxf/systest/sts/asymmetric/cxf-service.xml  |  6 +-
 .../systest/sts/asymmetric/cxf-stax-service.xml |  6 +-
 .../cxf/systest/sts/bearer/cxf-service.xml  |  4 +-
 .../cxf/systest/sts/bearer/cxf-stax-service.xml |  4 +-
 .../systest/sts/deployment/cxf-encrypted-ut.xml |  2 +-
 .../systest/sts/deployment/cxf-transport.xml|  4 +-
 .../cxf/systest/sts/deployment/cxf-ut.xml   |  2 +-
 .../cxf/systest/sts/deployment/cxf-x509.xml |  2 +-
 .../sts/deployment/stax-cxf-encrypted-ut.xml|  2 +-
 .../sts/deployment/stax-cxf-transport.xml   |  4 +-
 .../cxf/systest/sts/deployment/stax-cxf-ut.xml  |  2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml|  2 +-
 .../cxf-bad-client.xml  |  2 +-
 .../intermediary_transformation/cxf-client.xml  |  2 +-
 .../cxf-intermediary-caching.xml|  2 +-
 .../cxf-intermediary.xml|  2 +-
 .../intermediary_transformation/cxf-service.xml |  2 +-
 .../cxf/systest/sts/issuer/cxf-service.xml  |  6 +-
 .../cxf/systest/sts/stsclient/cxf-service.xml   |  2 +-
 .../cxf/systest/sts/symmetric/cxf-service.xml   |  8 +-
 .../systest/sts/symmetric/cxf-stax-service.xml  |  8 +-
 .../cxf/systest/sts/template/cxf-client.xml |  4 +-
 .../cxf/systest/sts/template/cxf-service.xml|  4 +-
 .../systest/sts/template/cxf-stax-service.xml   |  4 +-
 .../systest/sts/transport/cxf-bad-client.xml|  2 +-
 .../cxf/systest/sts/transport/cxf-client.xml|  4 +-
 .../cxf/systest/sts/transport/cxf-service.xml   |  8 +-
 .../systest/sts/transport/cxf-stax-service.xml  |  8 +-
 .../systest/sts/username_actas/cxf-client.xml   | 20 ++---
 .../systest/sts/username_actas/cxf-service.xml  | 10 +--
 .../systest/sts/username_actas/cxf-service2.xml | 10 +--
 .../sts/username_onbehalfof/cxf-client.xml  | 20 ++---
 .../sts/username_onbehalfof/cxf-service.xml | 10 +--
 .../sts/username_onbehalfof/cxf-service2.xml| 10 +--
 .../systest/sts/x509_symmetric/cxf-client.xml   |  2 +-
 .../systest/sts/x509_symmetric/cxf-service.xml  |  8 +-
 .../sts/x509_symmetric/cxf-stax-service.xml |  8 +-
 .../systest/kerberos/wssec/kerberos/client.xml  | 10 +--
 .../

[26/38] cxf git commit: Switching encryption cfg

[coheigea]

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
--
diff --git 
a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
 
b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
index 944b7ae..7fb82fe 100644
--- 
a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
+++ 
b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
@@ -82,7 +82,7 @@
 
 
 
-
+
 
 
 
@@ -101,7 +101,7 @@
 
 
 
-
+
 
 
 
@@ -126,7 +126,7 @@
 
 
 
-
+
 
 
 
@@ -137,7 +137,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
index 952e7c9..482b505 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
@@ -285,7 +285,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 properties.put("security.callback-handler", 

"org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
 properties.put("security.encryption.username", "bob");
-properties.put("ws-security.encryption.properties", 
+properties.put("security.encryption.properties", 
"org/apache/cxf/systest/jaxrs/security/bob.properties");
 doTestPostEncryptedBook(address, false, properties, test.streaming);
 }
@@ -309,7 +309,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 properties.put("security.callback-handler", 

"org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
 properties.put("security.encryption.username", "bob");
-properties.put("ws-security.encryption.properties", 
+properties.put("security.encryption.properties", 
"org/apache/cxf/systest/jaxrs/security/bob.properties");
 
 EncryptionProperties encryptionProperties = new EncryptionProperties();
@@ -327,7 +327,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 properties.put("security.callback-handler", 

"org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
 properties.put("security.encryption.username", "bob");
-properties.put("ws-security.encryption.properties", 
+properties.put("security.encryption.properties", 
"org/apache/cxf/systest/jaxrs/security/bob.properties");
 
 EncryptionProperties encryptionProperties = new EncryptionProperties();
@@ -347,7 +347,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 properties.put("security.callback-handler", 

"org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
 properties.put("security.encryption.username", "bob");
-properties.put("ws-security.encryption.properties", 
+properties.put("security.encryption.properties", 
"org/apache/cxf/systest/jaxrs/security/bob.properties");
 
 EncryptionProperties encryptionProperties = new EncryptionProperties();
@@ -366,7 +366,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClientServerTestBase {
 properties.put("security.callback-handler", 

"org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
 properties.put("security.encryption.username", "bob");
-properties.put("ws-security.encryption.properties", 
+properties.put("security.encryption.properties", 
"org/apache/cxf/systest/jaxrs/security/bob.properties");
 properties.put("security.signature.username", "alice");
 properties.put("ws-security.signature.properties", 
@@ -382,7 +382,7 @@ public class JAXRSXmlSecTest extends 
AbstractBusClie

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes a3fc169cf -> 6c2b16cf4


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6c2b16cf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c2b16cf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c2b16cf

Branch: refs/heads/3.0.x-fixes
Commit: 6c2b16cf4d330c2380a3923b50391a712e3d0980
Parents: a3fc169
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 11:12:37 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 11:12:37 2015 +0100

--
 .gitmergeinfo | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6c2b16cf/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index fb94faa..0881440 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -12,6 +12,7 @@ B 0aaa2b5742a53bf31704939e4bc21906100bbc54
 B 0ab9416fda31298e485f2a6864c263447e4b32de
 B 0ba19453f17be19aa2e46848b1908f776a6abb64
 B 0c0555f4ac850ec8e38302d73207170affe4376a
+B 0d0bc938103b0ea9311c3b73f6c385aa3e12260c
 B 0de0309f28e1543660c763c158f4353d6d2189be
 B 0e639399027b2b43ece5b21f73effa6381a5bf0c
 B 11243052a6e1656657776bc3a0c586cba962c49f
@@ -45,6 +46,7 @@ B 27c2c25dc3c2c3019543e31afdca7b166911f278
 B 28e185b27e8c80cd773cac46d1b9b19529c4fab0
 B 28e8f04af96d3e353f0da5018a4531d45592c663
 B 29f0620a9a025afcd2057cdf97c7d93caf6c179f
+B 2a5d201be1b85344585094d0f044e9bf1b605fac
 B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
 B 2ba77327488a8446e6a92af137f644eaf3b06e2e
 B 2cb99eed19d1a8f097c4ae54967c6e45a7c03d67
@@ -59,6 +61,7 @@ B 3309231e467225b18b24d90d77153a0c572a17e0
 B 33c7781f4f847431a7bbdc9335657d3281cd525e
 B 3506302369c0a28647056c1da469bd9844e45826
 B 350b51632f4c5dbd4891636261909c73136981c6
+B 354ac95b70a98b4f2e8f9f33c534b3e885e9a935
 B 36fcf426a4946f57b051ce7a388c7190fc97aebd
 B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6
 B 384ad75433037358ea1607c4ddcb0cd978fae10c
@@ -98,6 +101,7 @@ B 4fe7844935f9b4ad797760613d143949f9448905
 B 504b427081cfc2213ce0a5c050b16af67ca7ff46
 B 51f433d54a1d11eac25c32b0dd69f12fef62c060
 B 54508131155cc71099f6f54c5ee531e159d79ca2
+B 5577461dfa57cb8c7c49d788276afbd9253d81c5
 B 55bda33699ea1c2e84a125253edd594cc2a32ea3
 B 577ccc51c269c66e7810eb4aad9f93cb23c78f8e
 B 5891c0d23b776d41be02e74a3b98a3881970d08f
@@ -106,6 +110,7 @@ B 59b7fd7072a71498aecb1b5da6ec51ea89f7381b
 B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23
 B 5bac26a132e7999bf0bd108d4cffb674873a56ca
 B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0
+B 5d387616bc1787f3ae50dbe2a185c6abb0e9955b
 B 5e06ba0c4970700477484bd2409a226aa9ec7f0a
 B 5f94e273e7e8d99915eeda1189824f13488eb013
 B 5faf182264c64bd3c0abc0addc9746b64492c864
@@ -165,6 +170,7 @@ B 90312bc48f6e564bcafdaaebc3cd596c966ee674
 B 91d6630c53f222544e4bb512fb5c918d68518138
 B 92502a5e2af6e5d3c544f89396de2d05d539fd41
 B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225
+B 93039ab86bea4f2bdac4e5eec4229d3271f4c7ec
 B 9344b093b8081a68c9f83f0c740d60508e99fd5e
 B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2
 B 94cfe7e48a50104b22457aa47b39d06329d16d32
@@ -174,6 +180,7 @@ B 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
 B 970feeed0db20bfe9df5095b6b335146344c222c
 B 9896b920035a1d1be1aef28a1d1a5eb876445c82
 B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe
+B 9a2c82620001b76a2065960686f9bc8f384c4d58
 B 9ac66adffb73f3474fde064fab1013ecdd24be7c
 B 9ae69b3b323f48de033f62be9fc2780f11b0c761
 B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2
@@ -262,11 +269,13 @@ B e8514ea3f5fdf33b19d9ddc0639cc1aaf57e1f62
 B e8b8e2bc1b5afa4ad93294ebe1bd723a5a4a8f64
 B ea778c4f38f882dc97d23bd200683fd9d48b4718
 B eacd93f72c78bd28e9a3222ddfd4f0c33af6b8ec
+B eadb92c9d8af84f8754efe7f08c69fc60b82c9c3
 B eb4ea1fc03b17b7283b427cd4616507f934ef423
 B eba07e615684e475772a7a2d23d7e93a0b099485
 B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0
 B ecbf4e78586870a507fe4cf91239d51c3f202aad
 B ed18c008f05af7063d5929d072b86048d12dab4c
+B ee64acf5f8370cd1e33719e4d9d4e9922e386602
 B eee2a947d867c403c212677cf942b3d07fa06fd7
 B effcaf3f6cfb4b3287d683285592f2693af42b29
 B f18acbcdfc48aca354610614c0ba3a46dcb8332a

svn commit: r948001 - in /websites/production/cxf/content: cache/docs.pageCache docs/31-migration-guide.html

[buildbot]

Author: buildbot
Date: Fri Apr 17 10:47:17 2015
New Revision: 948001

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/31-migration-guide.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/31-migration-guide.html
==
--- websites/production/cxf/content/docs/31-migration-guide.html (original)
+++ websites/production/cxf/content/docs/31-migration-guide.html Fri Apr 17 
10:47:17 2015
@@ -116,7 +116,7 @@ Apache CXF -- 3.1 Migration Guide
  


-Major 
NotesCXF 3.1 no longer supports Java 6.   You must use Java 7 
or Java 8.The JAX-WS/Simple frontend ServerFactoryBean will 
automatically call reset at the end of the create() call.   This allows 
resources to be cleaned up and garbage collected sooner.  However, it also 
prevents multiple calls to create() from sharing the same 
ServerInfo/EndpointInfo/etc... objects like they would we 3.0.x.   That 
sharing has caused many problems in the past due to sharing of properties (like 
token caches) that are stored on those objects so the new behavior is more 
"correct", but it is different than previous versions so care must be taken 
while upgrading.The Karaf features.xml file for CXF 3.1 no longer will 
install spring or spring-dm when installing the "cxf" feature.  If you 
require spring/spring-dm, you will need to install those features prior to 
installing the CXF 
 feature.The STS (Security Token Service) now issues tokens using the 
RSA-SHA256 signature algorithm by default (previously RSA-SHA1), and the 
SHA-256 digest algorithm (previously SHA-1). New FeaturesThe CXF JAX-WS 
code generator has a new option "seiSuper" that can be used to specify 
additional super interfaces for the SEI.  This makes the code nonportable 
to other JAX-WS containers.   The primary use would be to add 
AutoCloseable to the interface to allow use of the clients in Java7 try with 
resource blocks.New Metrics feature for collecting metrics about a CXF 
services.   Codahale/DropWizard based collector included.New 
Throttling feature for easily throttling CXF services.  Sample included 
that uses the Metrics component to help make the throttling 
decisions.New Logging feature for more advanced logging than the 
logging available in cxf-coreThe "cxf" frontend to the JAX-WS code generator (-fe cxf) now generates 
 >code that is a bit more "Java7" friendly as the return type of the 
 >getPort(...) calls is a sub-interface of the SEI that also implements 
 >AutoCloseable, BindingProvider, and Client.   Code that used to look 
 >like:class="codeContent panelContent pdl">
+Major 
NotesCXF 3.1 no longer supports Java 6.   You must use Java 7 
or Java 8.The JAX-WS/Simple frontend ServerFactoryBean will 
automatically call reset at the end of the create() call.   This allows 
resources to be cleaned up and garbage collected sooner.  However, it also 
prevents multiple calls to create() from sharing the same 
ServerInfo/EndpointInfo/etc... objects like they would we 3.0.x.   That 
sharing has caused many problems in the past due to sharing of properties (like 
token caches) that are stored on those objects so the new behavior is more 
"correct", but it is different than previous versions so care must be taken 
while upgrading.The Karaf features.xml file for CXF 3.1 no longer will 
install spring or spring-dm when installing the "cxf" feature.  If you 
require spring/spring-dm, you will need to install those features prior to 
installing the CXF 
 feature.Security 
changesThe STS (Security Token Service) now issues tokens using 
the RSA-SHA256 signature algorithm by default (previously RSA-SHA1), and the 
SHA-256 digest algorithm (previously SHA-1).Some security 
configuration tags have been renamed from "ws-security.*" to "security.*", as 
they are now shared with (some of) the JAX-RS stack. The old tags will continue 
to work as before however without any change.The SAML/XACML 
functionality previously available in the cxf-rt-security module is now in the 
cxf-rt-security-saml module.If you are explicitly specifying the SAML 
version in a SAML CallbackHandler, then this is changed in CXF 3.1 due to the 
migration to use OpenSAML 3.1. The version is now set on the SAMLCallback using 
a org.apache.wss4j.common.saml.bean.Version class. Previously there was a 
dependency on OpenSAML's SAMLVersion class.New FeaturesThe CXF JAX-WS code generator has a new 
option "seiSuper" that can be used to specify additional super interfaces for 
the SEI.  This makes the code nonportable to other JAX-WS containers. 
  The primary use would be to add AutoCloseable to the interface to allow 
use of the clients in Java7 try with resou

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 2dc6d1e79 -> 29e9e86ee


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/29e9e86e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/29e9e86e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/29e9e86e

Branch: refs/heads/2.7.x-fixes
Commit: 29e9e86eeda70060f7c2598fd1d57b36c41b6b58
Parents: 2dc6d1e
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 12:11:26 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 12:11:26 2015 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/29e9e86e/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3e445e3..56bdc59 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -835,6 +835,7 @@ B 6b1feedd2683d94ec351f63aec5daf8bd1f34eae
 B 6ba3e0b6107cacbefc029d71858377a9277afc07
 B 6c06fac749597833aa8608b49ffc1c281a21b64d
 B 6c0b998e888de9a20ae91cf121c44b0916d8babd
+B 6c2b16cf4d330c2380a3923b50391a712e3d0980
 B 6c3730eccb1ac0b11076daa74ddb66790d7cf518
 B 6c4aa3a94fd35e7ba263d639a04cbbcf31d11edb
 B 6c59df94605a89a0c1fe714ab6b41f4d35abc065

cxf-fediz git commit: Downgrading to CXF 3.0.4 for the release

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 541c991fa -> 9d8f98acd


Downgrading to CXF 3.0.4 for the release


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9d8f98ac
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9d8f98ac
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9d8f98ac

Branch: refs/heads/master
Commit: 9d8f98acd71b2b2d2c2eb257b38419926e4ffd64
Parents: 541c991
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 12:13:09 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 12:13:09 2015 +0100

--
 pom.xml |   2 +-
 .../service/sts/DefaultSubjectProvider.java | 298 +++
 .../fediz/service/sts/X509TokenValidator.java   | 199 +
 .../src/main/webapp/WEB-INF/cxf-transport.xml   |   5 +-
 4 files changed, 502 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9d8f98ac/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f4c9429..3348d25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 2.0.0-M19
 3.3.2
 1.1.3
-3.0.5-SNAPSHOT
+3.0.4
 3.0.0
 3.3
 2.8.5

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9d8f98ac/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/DefaultSubjectProvider.java
--
diff --git 
a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/DefaultSubjectProvider.java
 
b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/DefaultSubjectProvider.java
new file mode 100644
index 000..cf0f7d4
--- /dev/null
+++ 
b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/DefaultSubjectProvider.java
@@ -0,0 +1,298 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.fediz.service.sts;
+
+import java.security.Principal;
+import java.security.PublicKey;
+import java.security.cert.X509Certificate;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+
+import javax.security.auth.x500.X500Principal;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.sts.STSConstants;
+import org.apache.cxf.sts.STSPropertiesMBean;
+import org.apache.cxf.sts.request.KeyRequirements;
+import org.apache.cxf.sts.request.ReceivedKey;
+import org.apache.cxf.sts.request.ReceivedToken;
+import org.apache.cxf.sts.request.ReceivedToken.STATE;
+import org.apache.cxf.sts.request.TokenRequirements;
+import org.apache.cxf.sts.service.EncryptionProperties;
+import org.apache.cxf.sts.token.provider.SubjectProvider;
+import org.apache.cxf.sts.token.provider.TokenProviderParameters;
+import org.apache.cxf.ws.security.sts.provider.STSException;
+import org.apache.wss4j.common.crypto.Crypto;
+import org.apache.wss4j.common.crypto.CryptoType;
+import org.apache.wss4j.common.ext.WSSecurityException;
+import org.apache.wss4j.common.saml.bean.KeyInfoBean;
+import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
+import org.apache.wss4j.common.saml.bean.SubjectBean;
+import org.apache.wss4j.common.saml.builder.SAML1Constants;
+import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.dom.message.WSSecEncryptedKey;
+
+/**
+ * A default implementation of SubjectProvider to create a SAML Assertion. The 
Subject name is the name
+ * of the current principal, the subject name qualifier is a default URL that 
can be configured, and the
+ * subject confirmation method is created according to the token type and key 
type. If the Subject
+ * Confirmation Method is SymmetricKey or PublicKey, the appropriate 
KeyInfoBean object is created and
+ * attached to the Subject.
+ */
+public class DefaultSubjectPr

cxf git commit: [CXF-6352] Support for multiple links with no 'rel'

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 0d0bc9381 -> 43460c235


[CXF-6352] Support for multiple links with no 'rel'


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/43460c23
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/43460c23
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/43460c23

Branch: refs/heads/master
Commit: 43460c23585312a5a7483841db11d3d2f6e0f8fb
Parents: 0d0bc93
Author: Sergey Beryozkin 
Authored: Fri Apr 17 12:33:56 2015 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 17 12:33:56 2015 +0100

--
 .../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 20 
 .../apache/cxf/jaxrs/impl/ResponseImplTest.java | 25 
 2 files changed, 35 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/43460c23/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index c101a67..681142a 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -269,10 +269,10 @@ public final class ResponseImpl extends Response {
 }
 
 public Link getLink(String relation) {
-Set> entries = getAllLinks().entrySet();
-for (Map.Entry entry : entries) {
-if (entry.getKey().contains(relation)) {
-return entry.getValue();
+Set links = getAllLinks();
+for (Link link : links) {
+if (link.getRel() != null && link.getRel().equals(relation)) {
+return link;
 }
 }
 return null;
@@ -284,22 +284,22 @@ public final class ResponseImpl extends Response {
 }
 
 public Set getLinks() {
-return new HashSet(getAllLinks().values());
+return new HashSet(getAllLinks());
 }
 
-private Map getAllLinks() {
+private Set getAllLinks() {
 List linkValues = metadata.get(HttpHeaders.LINK);
 if (linkValues == null) {
-return Collections.emptyMap();
+return Collections.emptySet();
 } else {
-Map links = new LinkedHashMap();
+Set links = new LinkedHashSet();
 for (Object o : linkValues) {
 Link link = o instanceof Link ? (Link)o : 
Link.valueOf(o.toString());
 if (!link.getUri().isAbsolute()) {
 URI requestURI = 
URI.create((String)outMessage.get(Message.REQUEST_URI));
 link = Link.fromLink(link).baseUri(requestURI).build();
 }
-links.put(link.getRel(), link);
+links.add(link);
 }
 return links;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/43460c23/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 1c788da..b750508 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -387,6 +387,31 @@ public class ResponseImplTest extends Assert {
 assertEquals("prev", prev.getRel());
 }
 
+@Test
+public void testGetLinksNoRel() {
+ResponseImpl ri = new ResponseImpl(200);
+MetadataMap meta = new MetadataMap();
+ri.addMetadata(meta);
+
+Set links = ri.getLinks();
+assertTrue(links.isEmpty());
+
+meta.add(HttpHeaders.LINK, "");
+meta.add(HttpHeaders.LINK, "");
+
+assertFalse(ri.hasLink("next"));
+Link next = ri.getLink("next");
+assertNull(next);
+assertFalse(ri.hasLink("prev"));
+Link prev = ri.getLink("prev");
+assertNull(prev);
+
+links = ri.getLinks();
+assertTrue(links.contains(Link.fromUri("http://next";).build()));
+assertTrue(links.contains(Link.fromUri("http://prev";).build()));
+
+}
+
 public static class StringBean

cxf git commit: [CXF-6352] Support for multiple links with no 'rel'

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 6c2b16cf4 -> 8dd53865e


[CXF-6352] Support for multiple links with no 'rel'


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8dd53865
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8dd53865
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8dd53865

Branch: refs/heads/3.0.x-fixes
Commit: 8dd53865e47c51c5392c5ecbf0a45b53c6dfc2d1
Parents: 6c2b16c
Author: Sergey Beryozkin 
Authored: Fri Apr 17 12:33:56 2015 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 17 12:35:00 2015 +0100

--
 .../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 20 
 .../apache/cxf/jaxrs/impl/ResponseImplTest.java | 25 
 2 files changed, 35 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8dd53865/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index c101a67..681142a 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -269,10 +269,10 @@ public final class ResponseImpl extends Response {
 }
 
 public Link getLink(String relation) {
-Set> entries = getAllLinks().entrySet();
-for (Map.Entry entry : entries) {
-if (entry.getKey().contains(relation)) {
-return entry.getValue();
+Set links = getAllLinks();
+for (Link link : links) {
+if (link.getRel() != null && link.getRel().equals(relation)) {
+return link;
 }
 }
 return null;
@@ -284,22 +284,22 @@ public final class ResponseImpl extends Response {
 }
 
 public Set getLinks() {
-return new HashSet(getAllLinks().values());
+return new HashSet(getAllLinks());
 }
 
-private Map getAllLinks() {
+private Set getAllLinks() {
 List linkValues = metadata.get(HttpHeaders.LINK);
 if (linkValues == null) {
-return Collections.emptyMap();
+return Collections.emptySet();
 } else {
-Map links = new LinkedHashMap();
+Set links = new LinkedHashSet();
 for (Object o : linkValues) {
 Link link = o instanceof Link ? (Link)o : 
Link.valueOf(o.toString());
 if (!link.getUri().isAbsolute()) {
 URI requestURI = 
URI.create((String)outMessage.get(Message.REQUEST_URI));
 link = Link.fromLink(link).baseUri(requestURI).build();
 }
-links.put(link.getRel(), link);
+links.add(link);
 }
 return links;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/8dd53865/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
--
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 1c788da..b750508 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -387,6 +387,31 @@ public class ResponseImplTest extends Assert {
 assertEquals("prev", prev.getRel());
 }
 
+@Test
+public void testGetLinksNoRel() {
+ResponseImpl ri = new ResponseImpl(200);
+MetadataMap meta = new MetadataMap();
+ri.addMetadata(meta);
+
+Set links = ri.getLinks();
+assertTrue(links.isEmpty());
+
+meta.add(HttpHeaders.LINK, "");
+meta.add(HttpHeaders.LINK, "");
+
+assertFalse(ri.hasLink("next"));
+Link next = ri.getLink("next");
+assertNull(next);
+assertFalse(ri.hasLink("prev"));
+Link prev = ri.getLink("prev");
+assertNull(prev);
+
+links = ri.getLinks();
+assertTrue(links.contains(Link.fromUri("http://next";).build()));
+assertTrue(links.contains(Link.fromUri("http://prev";).build()));
+
+}
+
 public static class 

[1/2] cxf-fediz git commit: Don't require deflate encoding by default

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 9d8f98acd -> db91db46e


Don't require deflate encoding by default


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/921fd68f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/921fd68f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/921fd68f

Branch: refs/heads/master
Commit: 921fd68f4bbe222300dcf01fbdce2eabb740b1fa
Parents: 9d8f98a
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 14:25:04 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 14:25:04 2015 +0100

--
 .../protocols/TrustedIdpSAMLProtocolHandler.java | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/921fd68f/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
index 3d14d4a..7b0a747 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
@@ -106,7 +106,7 @@ public class TrustedIdpSAMLProtocolHandler implements 
TrustedIdpProtocolHandler
 public static final String SUPPORT_BASE64_ENCODING = 
"support.base64.encoding";
 
 /**
- * Whether we support Deflate encoding or not. The default is "true".
+ * Whether we support Deflate encoding or not. The default is "false".
  */
 public static final String SUPPORT_DEFLATE_ENCODING = 
"support.deflate.encoding";
 
@@ -144,7 +144,7 @@ public class TrustedIdpSAMLProtocolHandler implements 
TrustedIdpProtocolHandler
 null, idp.getRealm(), idp.getIdpUrl().toString()
 );
 
-boolean signRequest = isPropertyConfigured(trustedIdp, 
SIGN_REQUEST);
+boolean signRequest = isPropertyConfigured(trustedIdp, 
SIGN_REQUEST, true);
 if (signRequest) {
 authnRequest.setDestination(trustedIdp.getUrl());
 }
@@ -340,10 +340,10 @@ public class TrustedIdpSAMLProtocolHandler implements 
TrustedIdpProtocolHandler
 String samlResponseDecoded = samlResponse;
 
 InputStream tokenStream = null;
-if (isPropertyConfigured(trustedIdp, SUPPORT_BASE64_ENCODING)) {
+if (isPropertyConfigured(trustedIdp, SUPPORT_BASE64_ENCODING, true)) {
 try {
 byte[] deflatedToken = 
Base64Utility.decode(samlResponseDecoded);
-tokenStream = isPropertyConfigured(trustedIdp, 
SUPPORT_DEFLATE_ENCODING)
+tokenStream = isPropertyConfigured(trustedIdp, 
SUPPORT_DEFLATE_ENCODING, false)
 ? new DeflateEncoderDecoder().inflateToken(deflatedToken)
 : new ByteArrayInputStream(deflatedToken); 
 } catch (Base64Exception ex) {
@@ -390,7 +390,7 @@ public class TrustedIdpSAMLProtocolHandler implements 
TrustedIdpProtocolHandler
 try {
 SAMLProtocolResponseValidator protocolValidator = new 
SAMLProtocolResponseValidator();
 protocolValidator.setKeyInfoMustBeAvailable(
-isPropertyConfigured(trustedIdp, REQUIRE_KNOWN_ISSUER));
+isPropertyConfigured(trustedIdp, REQUIRE_KNOWN_ISSUER, true));
 protocolValidator.validateSamlResponse(samlResponse, crypto, null);
 } catch (WSSecurityException ex) {
 LOG.debug(ex.getMessage(), ex);
@@ -423,9 +423,9 @@ public class TrustedIdpSAMLProtocolHandler implements 
TrustedIdpProtocolHandler
 ssoResponseValidator.setRequestId(requestId);
 ssoResponseValidator.setSpIdentifier(idp.getRealm());
 ssoResponseValidator.setEnforceAssertionsSigned(
-isPropertyConfigured(trustedIdp, REQUIRE_SIGNED_ASSERTIONS));
+isPropertyConfigured(trustedIdp, REQUIRE_SIGNED_ASSERTIONS, 
true));
 ssoResponseValidator.setEnforceKnownIssuer(
-isPropertyConfigured(trustedIdp, REQUIRE_KNOWN_ISSUER));
+isPropertyConfigured(trustedIdp, REQUIRE_KNOWN_ISSUER, true));
 
 return ssoResponseValidator.validateSamlResponse(samlResponse, 
false);
 } catch (WSSecurityException ex) {
@@ -435,14 +435,13 @@ public class TrustedIdpSAMLProtocolHandler implements 
TrustedIdpProtocolHandler
 }
 
 // Is a property configured. Defaults to "true" if not
-private boo

[2/2] cxf-fediz git commit: Fixed failing test

[coheigea]

Fixed failing test


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/db91db46
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/db91db46
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/db91db46

Branch: refs/heads/master
Commit: db91db46ea2d92e978b9e269247ae31d13509064
Parents: 921fd68
Author: Colm O hEigeartaigh 
Authored: Fri Apr 17 14:41:01 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Fri Apr 17 14:41:01 2015 +0100

--
 .../service/idp/protocols/TrustedIdpSAMLProtocolHandler.java | 4 
 .../federation/samlsso/src/test/resources/entities-realma.xml| 1 +
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/db91db46/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
index 7b0a747..bab707a 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpSAMLProtocolHandler.java
@@ -233,6 +233,10 @@ public class TrustedIdpSAMLProtocolHandler implements 
TrustedIdpProtocolHandler
 
 private String encodeAuthnRequest(Element authnRequest) throws IOException 
{
 String requestMessage = DOM2Writer.nodeToString(authnRequest);
+
+if (LOG.isDebugEnabled()) {
+LOG.debug(requestMessage);
+}
 
 DeflateEncoderDecoder encoder = new DeflateEncoderDecoder();
 byte[] deflatedBytes = 
encoder.deflateToken(requestMessage.getBytes("UTF-8"));

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/db91db46/systests/federation/samlsso/src/test/resources/entities-realma.xml
--
diff --git a/systests/federation/samlsso/src/test/resources/entities-realma.xml 
b/systests/federation/samlsso/src/test/resources/entities-realma.xml
index e447349..04d9d52 100644
--- a/systests/federation/samlsso/src/test/resources/entities-realma.xml
+++ b/systests/federation/samlsso/src/test/resources/entities-realma.xml
@@ -97,6 +97,7 @@
 
 
 
+
 
 
 

cxf git commit: [CXF-6353] Support for setting HTTP connection properties as JAX-RS 2.0 properties

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 43460c235 -> 0a900283e


[CXF-6353] Support for setting HTTP connection properties as JAX-RS 2.0 
properties


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0a900283
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0a900283
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0a900283

Branch: refs/heads/master
Commit: 0a900283eb743516e66c5988700b002e40c1bf45
Parents: 43460c2
Author: Sergey Beryozkin 
Authored: Fri Apr 17 16:59:48 2015 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 17 16:59:48 2015 +0100

--
 .../cxf/jaxrs/client/spec/ClientImpl.java   | 27 
 1 file changed, 22 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0a900283/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index ba9dc23..95c7650 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -40,6 +40,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriBuilder;
 
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.jaxrs.client.ClientConfiguration;
 import org.apache.cxf.jaxrs.client.ClientProviderFactory;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
@@ -47,6 +48,9 @@ import org.apache.cxf.jaxrs.model.FilterProviderInfo;
 import org.apache.cxf.transport.https.SSLUtils;
 
 public class ClientImpl implements Client {
+private static final String HTTP_CONNECTION_TIMEOUT_PROP = 
"http.connection.timeout";
+private static final String HTTP_RECEIVE_TIMEOUT_PROP = 
"http.receive.timeout";
+
 private Configurable configImpl;
 private TLSConfiguration secConfig;
 private boolean closed;
@@ -254,21 +258,34 @@ public class ClientImpl implements Client {
 }
 
 pf.setUserProviders(providers);
-
WebClient.getConfig(targetClient).getRequestContext().putAll(getConfiguration().getProperties());
-
WebClient.getConfig(targetClient).getRequestContext().put(Client.class.getName(),
 ClientImpl.this);
-
WebClient.getConfig(targetClient).getRequestContext().put(Configuration.class.getName(),
 
+Map configProps = 
getConfiguration().getProperties();
+ClientConfiguration clientCfg = WebClient.getConfig(targetClient);
+
+clientCfg.getRequestContext().putAll(configProps);
+clientCfg.getRequestContext().put(Client.class.getName(), 
ClientImpl.this);
+clientCfg.getRequestContext().put(Configuration.class.getName(), 
   
getConfiguration());
 // TLS
 TLSClientParameters tlsParams = secConfig.getTlsClientParams();
 if (tlsParams.getSSLSocketFactory() != null 
 || tlsParams.getTrustManagers() != null) {
-
WebClient.getConfig(targetClient).getHttpConduit().setTlsClientParameters(tlsParams);
+clientCfg.getHttpConduit().setTlsClientParameters(tlsParams);
+}
+Long connTimeOutValue = 
getLongValue(configProps.get(HTTP_CONNECTION_TIMEOUT_PROP));
+if (connTimeOutValue != null) {
+
clientCfg.getHttpConduit().getClient().setConnectionTimeout(connTimeOutValue);
+}
+Long recTimeOutValue = 
getLongValue(configProps.get(HTTP_RECEIVE_TIMEOUT_PROP));
+if (recTimeOutValue != null) {
+
clientCfg.getHttpConduit().getClient().setReceiveTimeout(recTimeOutValue);
 }
 
 // start building the invocation
 return new 
InvocationBuilderImpl(WebClient.fromClient(targetClient));
 }
-
+private Long getLongValue(Object o) {
+return o instanceof Long ? (Long)o : o instanceof String ? 
Long.valueOf(o.toString()) : null;
+}
 private void initTargetClientIfNeeded() {
 URI uri = uriBuilder.build();
 if (targetClient == null) {

cxf git commit: [CXF-6353] Support for setting HTTP connection properties as JAX-RS 2.0 properties

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 8dd53865e -> 646424838


[CXF-6353] Support for setting HTTP connection properties as JAX-RS 2.0 
properties


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/64642483
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/64642483
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/64642483

Branch: refs/heads/3.0.x-fixes
Commit: 646424838cc4d143d88a0e3d5c2db4428061076d
Parents: 8dd5386
Author: Sergey Beryozkin 
Authored: Fri Apr 17 16:59:48 2015 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 17 17:01:54 2015 +0100

--
 .../cxf/jaxrs/client/spec/ClientImpl.java   | 27 
 1 file changed, 22 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/64642483/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index ba9dc23..95c7650 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -40,6 +40,7 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriBuilder;
 
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.jaxrs.client.ClientConfiguration;
 import org.apache.cxf.jaxrs.client.ClientProviderFactory;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
@@ -47,6 +48,9 @@ import org.apache.cxf.jaxrs.model.FilterProviderInfo;
 import org.apache.cxf.transport.https.SSLUtils;
 
 public class ClientImpl implements Client {
+private static final String HTTP_CONNECTION_TIMEOUT_PROP = 
"http.connection.timeout";
+private static final String HTTP_RECEIVE_TIMEOUT_PROP = 
"http.receive.timeout";
+
 private Configurable configImpl;
 private TLSConfiguration secConfig;
 private boolean closed;
@@ -254,21 +258,34 @@ public class ClientImpl implements Client {
 }
 
 pf.setUserProviders(providers);
-
WebClient.getConfig(targetClient).getRequestContext().putAll(getConfiguration().getProperties());
-
WebClient.getConfig(targetClient).getRequestContext().put(Client.class.getName(),
 ClientImpl.this);
-
WebClient.getConfig(targetClient).getRequestContext().put(Configuration.class.getName(),
 
+Map configProps = 
getConfiguration().getProperties();
+ClientConfiguration clientCfg = WebClient.getConfig(targetClient);
+
+clientCfg.getRequestContext().putAll(configProps);
+clientCfg.getRequestContext().put(Client.class.getName(), 
ClientImpl.this);
+clientCfg.getRequestContext().put(Configuration.class.getName(), 
   
getConfiguration());
 // TLS
 TLSClientParameters tlsParams = secConfig.getTlsClientParams();
 if (tlsParams.getSSLSocketFactory() != null 
 || tlsParams.getTrustManagers() != null) {
-
WebClient.getConfig(targetClient).getHttpConduit().setTlsClientParameters(tlsParams);
+clientCfg.getHttpConduit().setTlsClientParameters(tlsParams);
+}
+Long connTimeOutValue = 
getLongValue(configProps.get(HTTP_CONNECTION_TIMEOUT_PROP));
+if (connTimeOutValue != null) {
+
clientCfg.getHttpConduit().getClient().setConnectionTimeout(connTimeOutValue);
+}
+Long recTimeOutValue = 
getLongValue(configProps.get(HTTP_RECEIVE_TIMEOUT_PROP));
+if (recTimeOutValue != null) {
+
clientCfg.getHttpConduit().getClient().setReceiveTimeout(recTimeOutValue);
 }
 
 // start building the invocation
 return new 
InvocationBuilderImpl(WebClient.fromClient(targetClient));
 }
-
+private Long getLongValue(Object o) {
+return o instanceof Long ? (Long)o : o instanceof String ? 
Long.valueOf(o.toString()) : null;
+}
 private void initTargetClientIfNeeded() {
 URI uri = uriBuilder.build();
 if (targetClient == null) {

cxf git commit: [CXF-6353] Support for HTTP proxy properties

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 0a900283e -> 071545f1e


[CXF-6353] Support for HTTP proxy properties


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/071545f1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/071545f1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/071545f1

Branch: refs/heads/master
Commit: 071545f1ea83650da2624ebde2bedbdef7ebb4cc
Parents: 0a90028
Author: Sergey Beryozkin 
Authored: Fri Apr 17 17:29:28 2015 +0100
Committer: Sergey Beryozkin 
Committed: Fri Apr 17 17:29:28 2015 +0100

--
 .../cxf/jaxrs/client/spec/ClientImpl.java   | 30 
 1 file changed, 24 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/071545f1/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index 95c7650..f19a32f 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -50,6 +50,8 @@ import org.apache.cxf.transport.https.SSLUtils;
 public class ClientImpl implements Client {
 private static final String HTTP_CONNECTION_TIMEOUT_PROP = 
"http.connection.timeout";
 private static final String HTTP_RECEIVE_TIMEOUT_PROP = 
"http.receive.timeout";
+private static final String HTTP_PROXY_SERVER_PROP = 
"http.proxy.server.uri";
+private static final String HTTP_PROXY_SERVER_PORT_PROP = 
"http.proxy.server.port";
 
 private Configurable configImpl;
 private TLSConfiguration secConfig;
@@ -271,6 +273,13 @@ public class ClientImpl implements Client {
 || tlsParams.getTrustManagers() != null) {
 clientCfg.getHttpConduit().setTlsClientParameters(tlsParams);
 }
+
+setConnectionProperties(configProps, clientCfg);
+
+// start building the invocation
+return new 
InvocationBuilderImpl(WebClient.fromClient(targetClient));
+}
+private void setConnectionProperties(Map configProps, 
ClientConfiguration clientCfg) {
 Long connTimeOutValue = 
getLongValue(configProps.get(HTTP_CONNECTION_TIMEOUT_PROP));
 if (connTimeOutValue != null) {
 
clientCfg.getHttpConduit().getClient().setConnectionTimeout(connTimeOutValue);
@@ -279,13 +288,16 @@ public class ClientImpl implements Client {
 if (recTimeOutValue != null) {
 
clientCfg.getHttpConduit().getClient().setReceiveTimeout(recTimeOutValue);
 }
-
-// start building the invocation
-return new 
InvocationBuilderImpl(WebClient.fromClient(targetClient));
-}
-private Long getLongValue(Object o) {
-return o instanceof Long ? (Long)o : o instanceof String ? 
Long.valueOf(o.toString()) : null;
+Object proxyServerValue = configProps.get(HTTP_PROXY_SERVER_PROP);
+if (proxyServerValue != null) {
+
clientCfg.getHttpConduit().getClient().setProxyServer((String)proxyServerValue);
+}
+Integer proxyServerPortValue = 
getIntValue(configProps.get(HTTP_PROXY_SERVER_PORT_PROP));
+if (proxyServerPortValue != null) {
+
clientCfg.getHttpConduit().getClient().setProxyServerPort(proxyServerPortValue);
+}
 }
+
 private void initTargetClientIfNeeded() {
 URI uri = uriBuilder.build();
 if (targetClient == null) {
@@ -483,4 +495,10 @@ public class ClientImpl implements Client {
 checkNull(templatesMap.values().toArray());
 }
 }
+private static Long getLongValue(Object o) {
+return o instanceof Long ? (Long)o : o instanceof String ? 
Long.valueOf(o.toString()) : null;
+}
+private static Integer getIntValue(Object o) {
+return o instanceof Integer ? (Integer)o : o instanceof String ? 
Integer.valueOf(o.toString()) : null;
+}
 }