svn commit: r947995 - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-search.html
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
!-- Content --
div class=wiki-content
div id=ConfluenceContenth1 id=JAX-RSSearch-JAX-RSSearchJAX-RS
Search/h1p#160;/ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1419015870456 {padding: 0px;}
-div.rbtoc1419015870456 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1419015870456 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1429263985081 {padding: 0px;}
+div.rbtoc1429263985081 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1429263985081 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1419015870456
+/*]]*//style/pdiv class=toc-macro rbtoc1429263985081
ul class=toc-indentationlia shape=rect
href=#JAX-RSSearch-JAX-RSSearchJAX-RS Search/a
ul class=toc-indentationlia shape=rect
href=#JAX-RSSearch-AdvancedSearchQueriesAdvanced Search
Queries/a/lilia shape=rect
href=#JAX-RSSearch-SupportedQueryLanguagesSupported Query Languages/a
ul class=toc-indentationlia shape=rect
href=#JAX-RSSearch-FeedItemQueryLanguageFeed Item Query
Language/a/lilia shape=rect href=#JAX-RSSearch-OpenDataProtocolOpen
Data Protocol/a/li/ul
@@ -138,7 +138,9 @@ div.rbtoc1419015870456 li {margin-left:
ul class=toc-indentationlia shape=rect
href=#JAX-RSSearch-BasicqueriesBasic queries/a/lilia shape=rect
href=#JAX-RSSearch-ComplexqueriesComplex queries/a/li/ul
/lilia shape=rect
href=#JAX-RSSearch-ValidationValidation/a/lilia shape=rect
href=#JAX-RSSearch-BuildingthequeriesBuilding the queries/a
ul class=toc-indentationlia shape=rect
href=#JAX-RSSearch-FIQLFIQL/a/li/ul
-/lilia shape=rect href=#JAX-RSSearch-UsingdatesinqueriesUsing dates
in queries/a/lilia shape=rect
href=#JAX-RSSearch-AlternativequerylanguagesAlternative query languages/a
+/lilia shape=rect href=#JAX-RSSearch-UsingdatesinqueriesUsing dates
in queries/a
+ul class=toc-indentationlia shape=rect
href=#JAX-RSSearch-RelativedatesRelative dates/a/li/ul
+/lilia shape=rect
href=#JAX-RSSearch-AlternativequerylanguagesAlternative query languages/a
ul class=toc-indentationlia shape=rect
href=#JAX-RSSearch-ODataOData/a/li/ul
/lilia shape=rect href=#JAX-RSSearch-ContentExtractionContent
Extraction/a
ul class=toc-indentationlia shape=rect
href=#JAX-RSSearch-UsingTikaContentExtractorUsing#160;TikaContentExtractor/a/lilia
shape=rect
href=#JAX-RSSearch-UsingTikaLuceneContentExtractorUsing#160;TikaLuceneContentExtractor/a/li/ul
@@ -927,7 +929,10 @@ FiqlSearchConditionBuilder bCustom = new
String ret = bCustom.is(quot;fooquot;).equalTo(d).query();
assertEquals(quot;foo==2011-03-01T12:34:00quot;, ret);
]]/script
-/div/divh2 id=JAX-RSSearch-AlternativequerylanguagesAlternative query
languages/h2pCustom org.apache.cxf.jaxrs.ext.search.SearchConditionParser
implementations can be registered as a search.parser contextual property
starting from CXF 3.0.0-milestone2./ph3
id=JAX-RSSearch-ODataOData/h3p#160;/ppPlease 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 a
shape=rect class=external-link
href=http://svn.apache.org/repos/asf/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java;test/a,
see the startServers function./ppAnd here is also an XML Spring
configuration example (using SearchBean in this specific case):/pdiv
class=code panel pdl style=border-widt
h: 1px;div class=codeContent panelContent pdl
+/div/divdiv class=action-body floodedp#160;/ph3
id=JAX-RSSearch-RelativedatesRelative dates/h3pDate value can be
specified as a duration from the current date/time, as its string
representation, PnYnMnDTnHnMnS.br clear=none Resulted date will be
calculated as a current date + specified duration. For example:/pdiv
class=code panel pdl style=border-width: 1px;div class=codeContent
panelContent pdl
+script class=theme: Default; brush: java; gutter: false
type=syntaxhighlighter![CDATA[?_search=date=ge=-P90D
+]]/script
+/div/divp#160;/ppThis query will search for a date which is 90 days
in the past or newer./p/divh2
[11/38] cxf git commit: Switching encryption username
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 cohei...@apache.org Authored: Fri Apr 17 10:34:21 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org 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
[25/38] cxf git commit: Switching encryption cfg
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 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ entry key=security.encryption.username value=alice/ -entry key=ws-security.encryption.properties value=alice.properties/ +entry key=security.encryption.properties value=alice.properties/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -171,7 +171,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ entry key=security.encryption.username value=alice/ -entry key=ws-security.encryption.properties value=alice.properties/ +entry key=security.encryption.properties value=alice.properties/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -186,7 +186,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ entry key=security.encryption.username value=alice/ -entry key=ws-security.encryption.properties value=alice.properties/ +entry key=security.encryption.properties value=alice.properties/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -201,7 +201,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ entry key=security.encryption.username value=alice/ -entry key=ws-security.encryption.properties value=alice.properties/ +entry key=security.encryption.properties value=alice.properties/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -216,7 +216,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ entry key=security.encryption.username value=alice/ -entry key=ws-security.encryption.properties value=alice.properties/ +entry key=security.encryption.properties value=alice.properties/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -231,7 +231,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ entry key=security.encryption.username value=alice/ -entry key=ws-security.encryption.properties value=alice.properties/ +entry key=security.encryption.properties value=alice.properties/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -246,7 +246,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ entry key=security.encryption.username value=alice/ -entry key=ws-security.encryption.properties value=alice.properties/ +entry key=security.encryption.properties value=alice.properties/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties
[32/38] cxf git commit: Switching signature properties
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 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler.sct
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
-entry key=ws-security.signature.properties.sct
value=bob.properties/
+entry key=security.signature.properties.sct
value=bob.properties/
entry key=security.encryption.username.sct
value=useReqSigCert/
entry key=ws-security.subject.cert.constraints.sct
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
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 @@
jaxws:endpoint
xmlns:ns1=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
-entry key=ws-security.signature.properties
value=cxfca.properties/
+entry key=security.signature.properties
value=cxfca.properties/
/jaxws:properties
/jaxws:endpoint
/beans
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 @@
entry key=security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
entry key=security.encryption.properties
value=bob.properties/
entry key=security.encryption.username value=bob/
-entry key=ws-security.signature.properties
value=alice.properties/
+entry key=security.signature.properties
value=alice.properties/
entry key=security.signature.username value=alice/
/jaxws:properties
/jaxws:client
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
---
[20/38] cxf git commit: Switching CallbackHandler
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 @@
bean
class=org.springframework.beans.factory.config.PropertyPlaceholderConfigurer/
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
+entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
entry key=ws-security.signature.properties
value=serviceKeystore.properties/
entry key=ws-security.is-bsp-compliant value=false/
entry key=ws-security.enable.streaming value=true/
@@ -29,7 +29,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
+entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
entry key=ws-security.signature.properties
value=serviceKeystore.properties/
entry key=ws-security.is-bsp-compliant value=false/
entry key=ws-security.enable.streaming value=true/
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 @@
/bean
jaxws:endpoint
xmlns:ns1=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
+entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint
xmlns:ns1=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
+entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
/jaxws:properties
/jaxws:endpoint
[07/38] cxf git commit: Switching signature username
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 cohei...@apache.org Authored: Fri Apr 17 10:33:05 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org 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 ---
[09/38] cxf git commit: Switching encryption username
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 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ entry key=security.signature.username value=alice/ /jaxws:properties @@ -44,7 +44,7 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ entry key=security.signature.username value=alice/ /jaxws:properties @@ -59,7 +59,7 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ entry key=security.signature.username value=alice/ /jaxws:properties @@ -74,7 +74,7 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ entry key=security.signature.username value=alice/ /jaxws:properties @@ -89,7 +89,7 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ entry key=security.signature.username value=alice/ /jaxws:properties @@ -104,7 +104,7 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ entry key=security.signature.username value=alice/ /jaxws:properties @@ -119,7 +119,7 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ entry key=security.signature.username value=alice/ /jaxws:properties @@ -134,7 +134,7 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry
[05/38] cxf git commit: Switching signature username
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 @@ entry key=ws-security.encryption.properties value=bob.properties/ entry key=ws-security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ -entry key=ws-security.signature.username value=alice/ +entry key=security.signature.username value=alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/ /jaxws:properties /jaxws:client @@ -86,7 +86,7 @@ entry key=ws-security.encryption.properties value=bob.properties/ entry key=ws-security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ -entry key=ws-security.signature.username value=alice/ +entry key=security.signature.username value=alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/ /jaxws:properties /jaxws:client @@ -101,7 +101,7 @@ entry key=ws-security.encryption.properties value=bob.properties/ entry key=ws-security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ -entry key=ws-security.signature.username value=alice/ +entry key=security.signature.username value=alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/ /jaxws:properties /jaxws:client @@ -110,7 +110,7 @@ entry key=ws-security.encryption.properties value=bob.properties/ entry key=ws-security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ -entry key=ws-security.signature.username value=alice/ +entry key=security.signature.username value=alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/ /jaxws:properties /jaxws:client @@ -119,7 +119,7 @@ entry key=ws-security.encryption.properties value=bob.properties/ entry key=ws-security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ -entry key=ws-security.signature.username value=alice/ +entry key=security.signature.username value=alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/ /jaxws:properties /jaxws:client @@ -128,7 +128,7 @@ entry key=ws-security.encryption.properties value=bob-enc.properties/ entry key=ws-security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice-enc.properties/ -entry key=ws-security.signature.username value=alice/ +entry key=security.signature.username value=alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/ /jaxws:properties /jaxws:client @@ -137,7 +137,7 @@ entry key=ws-security.encryption.properties value=bob.properties/ entry key=ws-security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ -entry key=ws-security.signature.username value=alice/ +entry key=security.signature.username value=alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/ entry key=ws-security.asymmetric.signature.algorithm value=http://www.w3.org/2001/04/xmldsig-more#rsa-sha256/ /jaxws:properties @@ -147,7 +147,7 @@ entry key=ws-security.encryption.properties value=bob.properties/ entry key=ws-security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ -entry key=ws-security.signature.username value=alice/ +entry key=security.signature.username value=alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
[02/38] cxf git commit: Switching username cfg tag
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 @@
/cxf:bus
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1EndorsingPort;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=myclientkey/
+entry key=security.username value=myclientkey/
entry key=ws-security.signature.properties
value=clientKeystore.properties/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
entry key=ws-security.sts.client
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 @@
property name=onBehalfOf
ref=delegationCallbackHandler/
property name=properties
map
-entry key=ws-security.username value=bob/
+entry key=security.username value=bob/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
entry key=ws-security.sts.token.username
value=myclientkey/
entry key=ws-security.sts.token.properties
value=clientKeystore.properties/
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 @@
property name=onBehalfOf
ref=delegationCallbackHandler/
property name=properties
map
-entry key=ws-security.username value=bob/
+entry key=security.username value=bob/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
entry key=ws-security.sts.token.username
value=myclientkey/
entry key=ws-security.sts.token.properties
value=clientKeystore.properties/
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 @@
/cxf:bus
jaxws:client
[06/38] cxf git commit: Switching signature username
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 @@
property name=endpointName
value={http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port/
property name=properties
map
-entry key=ws-security.signature.username
value=myservicekey/
+entry key=security.signature.username value=myservicekey/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
entry key=ws-security.signature.properties
value=serviceKeystore.properties/
entry key=ws-security.encryption.properties
value=serviceKeystore.properties/
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 @@
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
entry key=ws-security.signature.properties
value=alice.properties/
-entry key=ws-security.signature.username value=alice/
+entry key=security.signature.username value=alice/
entry key=ws-security.kerberos.client
bean
class=org.apache.cxf.ws.security.kerberos.KerberosClient
constructor-arg ref=cxf/
@@ -128,7 +128,7 @@
/bean
/entry
entry key=ws-security.signature.properties
value=alice.properties/
-entry key=ws-security.signature.username value=alice/
+entry key=security.signature.username value=alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback/
/jaxws:properties
/jaxws:client
@@ -138,7 +138,7 @@
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
entry key=ws-security.signature.properties
value=alice.properties/
-entry key=ws-security.signature.username value=alice/
+entry key=security.signature.username value=alice/
entry key=ws-security.kerberos.client
bean
class=org.apache.cxf.ws.security.kerberos.KerberosClient
constructor-arg ref=cxf/
@@ -183,7 +183,7 @@
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
entry key=ws-security.signature.properties
value=alice.properties/
-entry key=ws-security.signature.username value=alice/
+entry key=security.signature.username value=alice/
entry key=ws-security.kerberos.client
bean
class=org.apache.cxf.ws.security.kerberos.KerberosClient
constructor-arg ref=cxf/
@@ -200,7 +200,7 @@
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
entry key=ws-security.signature.properties
value=alice.properties/
-entry key=ws-security.signature.username value=alice/
+entry key=security.signature.username value=alice/
entry key=ws-security.kerberos.client
bean
class=org.apache.cxf.ws.security.kerberos.KerberosClient
constructor-arg ref=cxf/
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
[19/38] cxf git commit: Switching CallbackHandler
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 @@ jaxws:properties entry key=ws-security.signature.properties value=clientKeystore.properties/ entry key=security.signature.username value=myclientkey/ -entry key=ws-security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ +entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ entry key=ws-security.encryption.properties value=clientKeystore.properties/ entry key=security.encryption.username value=myservicekey/ entry key=ws-security.sts.client @@ -41,7 +41,7 @@ property name=properties map entry key=security.signature.username value=myclientkey/ -entry key=ws-security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ +entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ entry key=ws-security.signature.properties value=clientKeystore.properties/ entry key=ws-security.encryption.properties value=clientKeystore.properties/ entry key=security.encryption.username value=mystskey/ @@ -57,7 +57,7 @@ jaxws:properties entry key=ws-security.signature.properties value=clientKeystore.properties/ entry key=security.signature.username value=myclientkey/ -entry key=ws-security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ +entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ entry key=ws-security.encryption.properties value=clientKeystore.properties/ entry key=security.encryption.username value=myservicekey/ entry key=ws-security.sts.client @@ -70,7 +70,7 @@ property name=properties map entry key=security.signature.username value=myclientkey/ -entry key=ws-security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ +entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ entry key=ws-security.signature.properties value=clientKeystore.properties/ entry key=ws-security.encryption.properties value=clientKeystore.properties/ entry key=security.encryption.username value=mystskey/ @@ -86,7 +86,7 @@ jaxws:properties entry key=ws-security.signature.properties value=clientKeystore.properties/ entry key=security.signature.username value=myclientkey/ -entry key=ws-security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ +entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ entry key=ws-security.encryption.properties value=clientKeystore.properties/ entry key=security.encryption.username value=myservicekey/ entry key=ws-security.sts.client @@ -99,7 +99,7 @@ property name=properties map entry key=security.signature.username value=myclientkey/ -entry key=ws-security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ +entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ entry key=ws-security.signature.properties value=clientKeystore.properties/ entry key=ws-security.encryption.properties value=clientKeystore.properties/ entry key=security.encryption.username value=mystskey/ @@ -115,7 +115,7 @@ jaxws:properties entry key=ws-security.signature.properties value=clientKeystore.properties/
[15/38] cxf git commit: Switching CallbackHandler
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 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=security.encryption.username value=bob/
entry key=ws-security.signature.properties
value=alice.properties/
@@ -65,7 +65,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort2;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=security.encryption.username value=bob/
entry key=ws-security.signature.properties
value=alice.properties/
@@ -79,35 +79,35 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSaml1SelfSignedTransportPort;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.username value=alice/
entry key=ws-security.signature.properties
value=alice.properties/
/jaxws:properties
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSaml1SelfSignedTransportSP11Port;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.username value=alice/
entry key=ws-security.signature.properties
value=alice.properties/
/jaxws:properties
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingTransportPort;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.username value=alice/
entry key=ws-security.signature.properties
value=alice.properties/
/jaxws:properties
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingTransportSP11Port;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.username value=alice/
entry key=ws-security.signature.properties
value=alice.properties/
/jaxws:properties
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSamlInitiatorPort;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=security.encryption.username value=bob/
entry key=ws-security.signature.properties
value=alice.properties/
@@ -122,7 +122,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedPort;
createdFromAPI=true
[16/38] cxf git commit: Switching CallbackHandler
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 @@
/cxf:bus
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSoap11Port;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=security.encryption.username value=bob/
/jaxws:properties
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSoap12Port;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=security.encryption.username value=bob/
/jaxws:properties
@@ -45,7 +45,7 @@
entry key=security.encryption.username value=bob/
entry key=ws-security.signature.properties
value=alice-enc.properties/
entry key=security.signature.username value=alice/
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
/jaxws:properties
/jaxws:client
/beans
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 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=ws-security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
@@ -37,7 +37,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=ws-security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
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
[34/38] cxf git commit: Switching signature properties
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 @@
jaxws:properties
entry key=security.signature.username value=myservicekey/
entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
-entry key=ws-security.signature.properties
value=serviceKeystore.properties/
+entry key=security.signature.properties
value=serviceKeystore.properties/
entry key=ws-security.is-bsp-compliant value=false/
entry key=ws-security.enable.streaming value=true/
/jaxws:properties
@@ -32,7 +32,7 @@
jaxws:properties
entry key=security.signature.username value=myservicekey/
entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
-entry key=ws-security.signature.properties
value=serviceKeystore.properties/
+entry key=security.signature.properties
value=serviceKeystore.properties/
entry key=ws-security.enable.streaming value=true/
/jaxws:properties
/jaxws:endpoint
@@ -40,7 +40,7 @@
jaxws:properties
entry key=security.signature.username value=myservicekey/
entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
-entry key=ws-security.signature.properties
value=serviceKeystore.properties/
+entry key=security.signature.properties
value=serviceKeystore.properties/
entry key=ws-security.is-bsp-compliant value=false/
entry key=ws-security.enable.streaming value=true/
/jaxws:properties
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 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
-entry key=ws-security.signature.properties
value=serviceKeystore.properties/
+entry key=security.signature.properties
value=serviceKeystore.properties/
entry key=ws-security.is-bsp-compliant value=false/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/
-entry key=ws-security.signature.properties
value=serviceKeystore.properties/
+entry key=security.signature.properties
value=serviceKeystore.properties/
entry key=ws-security.is-bsp-compliant value=false/
/jaxws:properties
/jaxws:endpoint
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
[31/38] cxf git commit: Switching signature properties
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 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
@@ -42,7 +42,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
@@ -56,7 +56,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
@@ -70,7 +70,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
@@ -84,7 +84,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
[13/38] cxf git commit: Switching CallbackHandler
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 @@
jaxws:client
name={http://WSSec/wssec10}UserNameOverTransport_IPingService;
createdFromAPI=true
jaxws:properties
entry key=security.username value=Alice/
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
/jaxws:properties
/jaxws:client
jaxws:client name={http://WSSec/wssec10}UserName_IPingService;
createdFromAPI=true
jaxws:properties
entry key=security.username value=Alice/
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
/jaxws:properties
/jaxws:client
http:conduit name=https://.*/UserNameOverTransport.*;
@@ -55,7 +55,7 @@
jaxws:client
name={http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService;
createdFromAPI=true
jaxws:properties
entry key=security.username value=Alice/
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=alice.properties/
entry key=ws-security.encryption.properties
value=bob.properties/
/jaxws:properties
@@ -66,7 +66,7 @@
jaxws:client
name={http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService;
createdFromAPI=true
jaxws:properties
entry key=security.username value=Alice/
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=alice.properties/
entry key=ws-security.encryption.properties
value=bob.properties/
/jaxws:properties
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 @@
jaxws:client
name={http://WSSec/wssec10}UserNameOverTransport_IPingService;
createdFromAPI=true
jaxws:properties
entry key=security.username value=Alice/
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
/jaxws:properties
/jaxws:client
jaxws:client name={http://WSSec/wssec10}UserName_IPingService;
createdFromAPI=true
jaxws:properties
entry key=security.username value=Alice/
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
/jaxws:properties
/jaxws:client
http:conduit name=https://.*/UserNameOverTransport.*;
@@ -55,7 +55,7 @@
jaxws:client
name={http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService;
createdFromAPI=true
jaxws:properties
entry key=security.username value=Alice/
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
[01/38] cxf git commit: Switching username cfg tag
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 @@
/cxf:bus
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=Alice/
+entry key=security.username value=Alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
@@ -42,7 +42,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort2;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=Alice/
+entry key=security.username value=Alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
@@ -58,7 +58,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort3;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=Alice/
+entry key=security.username value=Alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
@@ -74,7 +74,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=Alice/
+entry key=security.username value=Alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
@@ -90,7 +90,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort2;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=Alice/
+entry key=security.username value=Alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
@@ -106,7 +106,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort3;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=Alice/
+entry key=security.username value=Alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
@@ -122,7 +122,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedSupportingPort;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=Alice/
+entry key=security.username value=Alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.encryption.properties
value=bob.properties/
entry key=ws-security.encryption.username value=bob/
@@ -138,7 +138,7 @@
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedSupportingPort2;
createdFromAPI=true
jaxws:properties
-entry key=ws-security.username value=Alice/
+entry key=security.username value=Alice/
entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry
[18/38] cxf git commit: Switching CallbackHandler
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 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=ws-security.kerberos.jaas.context value=bob/
-entry key=ws-security.callback-handler
value-ref=kerberosCallbackHandler/
+entry key=security.callback-handler
value-ref=kerberosCallbackHandler/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=ws-security.kerberos.jaas.context value=bob/
-entry key=ws-security.callback-handler
value-ref=kerberosCallbackHandler/
+entry key=security.callback-handler
value-ref=kerberosCallbackHandler/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=ws-security.kerberos.jaas.context value=bob/
-entry key=ws-security.callback-handler
value-ref=kerberosCallbackHandler/
+entry key=security.callback-handler
value-ref=kerberosCallbackHandler/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=ws-security.kerberos.jaas.context value=bob/
-entry key=ws-security.callback-handler
value-ref=kerberosCallbackHandler/
+entry key=security.callback-handler
value-ref=kerberosCallbackHandler/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=ws-security.kerberos.jaas.context value=bob/
-entry key=ws-security.callback-handler
value-ref=kerberosCallbackHandler/
+entry key=security.callback-handler
value-ref=kerberosCallbackHandler/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=ws-security.kerberos.jaas.context value=bob/
-entry key=ws-security.callback-handler
value-ref=kerberosCallbackHandler/
+
[04/38] cxf git commit: Switching password tag value
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 cohei...@apache.org
Authored: Fri Apr 17 10:30:59 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
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 @@
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort;
createdFromAPI=true
jaxws:properties
entry key=security.username value=alice/
-entry key=ws-security.password value=trombone/
+entry key=security.password value=trombone/
/jaxws:properties
/jaxws:client
jaxws:client
name={http://www.example.org/contract/DoubleIt}DoubleItTransportUTAuthorizationPort;
createdFromAPI=true
jaxws:properties
entry key=security.username value=alice/
-entry key=ws-security.password value=trombone/
+entry key=security.password value=trombone/
/jaxws:properties
/jaxws:client
http:conduit name=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 @@
property name=properties
map
entry key=security.username value=bob/
-entry key=ws-security.password value=trombone/
+entry key=security.password value=trombone/
/map
/property
property name=claimsCallbackHandler
ref=roleClaimsCallbackHandler/
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);
+
[24/38] cxf git commit: Switching encryption cfg
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 @@
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
/jaxws:properties
/jaxws:endpoint
@@ -123,7 +123,7 @@
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
/jaxws:properties
/jaxws:endpoint
@@ -131,7 +131,7 @@
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
/jaxws:properties
/jaxws:endpoint
@@ -139,7 +139,7 @@
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=bob-enc.properties/
-entry key=ws-security.encryption.properties
value=alice-enc.properties/
+entry key=security.encryption.properties
value=alice-enc.properties/
entry key=security.encryption.username value=alice/
/jaxws:properties
/jaxws:endpoint
@@ -147,7 +147,7 @@
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
entry key=ws-security.asymmetric.signature.algorithm
value=http://www.w3.org/2001/04/xmldsig-more#rsa-sha256/
/jaxws:properties
@@ -210,7 +210,7 @@
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
/jaxws:properties
/jaxws:endpoint
@@ -301,7 +301,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=ws-security.is-bsp-compliant value=false/
/jaxws:properties
/jaxws:endpoint
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
---
[10/38] cxf git commit: Switching encryption username
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 @@ entry key=ws-security.signature.properties.sct value=alice.properties/ entry key=security.signature.username.sct value=alice/ entry key=ws-security.encryption.properties.sct value=bob.properties/ -entry key=ws-security.encryption.username.sct value=bob/ +entry key=security.encryption.username.sct value=bob/ /jaxws:properties /jaxws:client /beans 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 @@ jaxws:properties entry key=ws-security.callback-handler.sct value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/ entry key=ws-security.signature.properties.sct value=bob.properties/ -entry key=ws-security.encryption.username.sct value=useReqSigCert/ +entry key=security.encryption.username.sct value=useReqSigCert/ entry key=ws-security.subject.cert.constraints.sct value=.*O=apache.org.*/ /jaxws:properties /jaxws:endpoint 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 @@ jaxws:properties entry key=ws-security.callback-handler.sct value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/ entry key=ws-security.signature.properties.sct value=bob.properties/ -entry key=ws-security.encryption.username.sct value=useReqSigCert/ +entry key=security.encryption.username.sct value=useReqSigCert/ entry key=ws-security.subject.cert.constraints.sct value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties 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 @@ entry key=security.username value=Alice/ entry key=ws-security.callback-handler value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/ entry key=ws-security.encryption.properties value=bob.properties/ -entry key=ws-security.encryption.username value=bob/ +entry key=security.encryption.username value=bob/ entry key=ws-security.signature.properties value=alice.properties/ entry
[30/38] cxf git commit: Switching signature properties
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 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
@@ -42,7 +42,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
@@ -56,7 +56,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
@@ -70,7 +70,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
entry key=ws-security.enable.streaming value=true/
@@ -84,7 +84,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry
[28/38] cxf git commit: Switching signature properties
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 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
-entry key=ws-security.signature.properties
value=alice.properties/
+entry key=security.signature.properties
value=alice.properties/
entry key=ws-security.return.security.error value=true/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
-entry key=ws-security.signature.crypto value-ref=crypto/
+entry key=security.signature.crypto value-ref=crypto/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
-entry key=ws-security.signature.crypto value-ref=crypto/
+entry key=security.signature.crypto value-ref=crypto/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
-entry key=ws-security.signature.crypto value-ref=crypto/
+entry key=security.signature.crypto value-ref=crypto/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
-entry key=ws-security.signature.crypto value-ref=crypto/
+entry key=security.signature.crypto value-ref=crypto/
/jaxws:properties
/jaxws:endpoint
bean id=crypto class=org.apache.wss4j.common.crypto.CryptoFactory
factory-method=getInstance
@@ -78,43 +78,43 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
-entry
[37/38] cxf git commit: Switching remaining SAML Cfg tags
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 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=security.signature.properties value=bob.properties/ entry key=security.encryption.username value=useReqSigCert/ -entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ +entry key=security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties jaxws:features @@ -44,7 +44,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=security.signature.properties value=bob.properties/ entry key=security.encryption.username value=useReqSigCert/ -entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ +entry key=security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties jaxws:features @@ -58,7 +58,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=security.signature.properties value=bob.properties/ entry key=security.encryption.username value=useReqSigCert/ -entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ +entry key=security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties jaxws:features @@ -72,7 +72,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=security.signature.properties value=bob.properties/ entry key=security.encryption.username value=useReqSigCert/ -entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ +entry key=security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties jaxws:features @@ -86,7 +86,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=security.signature.properties value=bob.properties/ entry key=security.encryption.username value=useReqSigCert/ -entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ +entry key=security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties jaxws:features @@ -100,7 +100,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=security.signature.properties value=bob.properties/ entry key=security.encryption.username value=useReqSigCert/ -entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ +entry key=security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties jaxws:features @@ -114,7 +114,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=security.signature.properties value=bob.properties/ entry key=security.encryption.username value=useReqSigCert/ -entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ +entry key=security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties jaxws:features @@ -128,7 +128,7 @@ entry key=security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=security.signature.properties value=bob.properties/ entry key=security.encryption.username value=useReqSigCert/ -entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ +entry key=security.subject.cert.constraints value=.*O=apache.org.*/ entry
[29/38] cxf git commit: Switching signature properties
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 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
@@ -41,7 +41,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
@@ -54,7 +54,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
@@ -67,7 +67,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
@@ -80,7 +80,7 @@
jaxws:endpoint xmlns:s=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
jaxws:properties
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
-entry key=ws-security.signature.properties
value=bob.properties/
+entry key=security.signature.properties value=bob.properties/
entry
[08/38] cxf git commit: Switching encryption username
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 @@ jaxws:properties entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ -entry key=ws-security.encryption.username value=useReqSigCert/ +entry key=security.encryption.username value=useReqSigCert/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -43,7 +43,7 @@ jaxws:properties entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ -entry key=ws-security.encryption.username value=useReqSigCert/ +entry key=security.encryption.username value=useReqSigCert/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -57,7 +57,7 @@ jaxws:properties entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ -entry key=ws-security.encryption.username value=useReqSigCert/ +entry key=security.encryption.username value=useReqSigCert/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -71,7 +71,7 @@ jaxws:properties entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ -entry key=ws-security.encryption.username value=useReqSigCert/ +entry key=security.encryption.username value=useReqSigCert/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -85,7 +85,7 @@ jaxws:properties entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ -entry key=ws-security.encryption.username value=useReqSigCert/ +entry key=security.encryption.username value=useReqSigCert/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -99,7 +99,7 @@ jaxws:properties entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ -entry key=ws-security.encryption.username value=useReqSigCert/ +entry key=security.encryption.username value=useReqSigCert/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -113,7 +113,7 @@ jaxws:properties entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ -entry key=ws-security.encryption.username value=useReqSigCert/ +entry key=security.encryption.username value=useReqSigCert/ entry key=ws-security.subject.cert.constraints value=.*O=apache.org.*/ entry key=ws-security.enable.streaming value=true/ /jaxws:properties @@ -127,7 +127,7 @@ jaxws:properties entry key=ws-security.callback-handler value=org.apache.cxf.systest.ws.common.UTPasswordCallback/ entry key=ws-security.signature.properties value=bob.properties/ -entry key=ws-security.encryption.username value=useReqSigCert/ +entry key=security.encryption.username value=useReqSigCert/ entry
[17/38] cxf git commit: Switching CallbackHandler
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 @@
/cxf:bus
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
@@ -36,7 +36,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
@@ -45,7 +45,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
entry key=security.signature.username value=bob/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
@@ -54,7 +54,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback/
!-- TODO Fix the way these properties are inverted --
entry key=security.signature.username value=bob/
entry key=ws-security.encryption.properties
value=bob.properties/
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
[14/38] cxf git commit: Switching CallbackHandler
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 @@
/cxf:bus
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
@@ -41,7 +41,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
@@ -55,7 +55,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
@@ -69,7 +69,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
@@ -83,7 +83,7 @@
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.UTPasswordCallback/
entry key=ws-security.signature.properties
[33/38] cxf git commit: Switching signature properties
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 @@ jaxws:properties entry key=security.signature.username value=myservicekey/ entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ -entry key=ws-security.signature.properties value=serviceKeystore.properties/ +entry key=security.signature.properties value=serviceKeystore.properties/ entry key=security.encryption.properties value=clientKeystore.properties/ entry key=ws-security.saml2.validator bean class=org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator/ @@ -35,7 +35,7 @@ jaxws:properties entry key=security.signature.username value=myservicekey/ entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ -entry key=ws-security.signature.properties value=serviceKeystore.properties/ +entry key=security.signature.properties value=serviceKeystore.properties/ entry key=security.encryption.properties value=clientKeystore.properties/ entry key=ws-security.saml2.validator bean class=org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator/ @@ -47,7 +47,7 @@ jaxws:properties entry key=security.signature.username value=myservicekey/ entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ -entry key=ws-security.signature.properties value=serviceKeystore.properties/ +entry key=security.signature.properties value=serviceKeystore.properties/ entry key=security.encryption.properties value=clientKeystore.properties/ entry key=ws-security.saml2.validator bean class=org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator/ @@ -59,7 +59,7 @@ jaxws:properties entry key=security.signature.username value=myservicekey/ entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ -entry key=ws-security.signature.properties value=serviceKeystore.properties/ +entry key=security.signature.properties value=serviceKeystore.properties/ entry key=security.encryption.properties value=clientKeystore.properties/ entry key=ws-security.saml2.validator bean class=org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator/ @@ -72,7 +72,7 @@ jaxws:properties entry key=security.signature.username value=myservicekey/ entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ -entry key=ws-security.signature.properties value=serviceKeystore.properties/ +entry key=security.signature.properties value=serviceKeystore.properties/ entry key=security.encryption.properties value=clientKeystore.properties/ entry key=ws-security.saml2.validator bean class=org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator/ 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 @@ jaxws:properties entry key=security.signature.username value=myservicekey/ entry key=security.callback-handler value=org.apache.cxf.systest.sts.common.CommonCallbackHandler/ -entry
[12/38] cxf git commit: Switching CallbackHandler
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 @@
/httpj:engine-factory
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.properties
value=alice.properties/
entry key=ws-security.return.security.error value=true/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.crypto value-ref=crypto/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.crypto value-ref=crypto/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.crypto value-ref=crypto/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
jaxws:properties
-entry key=ws-security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
+entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=ws-security.signature.crypto value-ref=crypto/
/jaxws:properties
/jaxws:endpoint
@@ -77,43 +77,43 @@
/bean
jaxws:endpoint xmlns:s=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
[03/38] cxf git commit: Switching username cfg tag
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 cohei...@apache.org Authored: Fri Apr 17 10:29:49 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org 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 +--
[35/38] cxf git commit: Switching signature properties
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 cohei...@apache.org Authored: Fri Apr 17 10:39:09 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org 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 +-
[26/38] cxf git commit: Switching encryption cfg
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 @@
entry key=security.username value=bob/
entry key=security.callback-handler
value=org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
entry key=ws-security.is-bsp-compliant value=false/
entry key=ws-security.enable.streaming value=true/
@@ -101,7 +101,7 @@
entry key=security.username value=bob/
entry key=security.callback-handler
value=org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
entry key=ws-security.is-bsp-compliant value=false/
entry key=ws-security.enable.streaming value=true/
@@ -126,7 +126,7 @@
entry key=security.username value=bob/
entry key=security.callback-handler
value=org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
entry key=ws-security.is-bsp-compliant value=false/
entry key=ws-security.enable.streaming value=true/
@@ -137,7 +137,7 @@
entry key=security.username value=bob/
entry key=security.callback-handler
value=org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback/
entry key=ws-security.signature.properties
value=bob.properties/
-entry key=ws-security.encryption.properties
value=alice.properties/
+entry key=security.encryption.properties
value=alice.properties/
entry key=security.encryption.username value=alice/
entry key=ws-security.is-bsp-compliant value=false/
entry key=ws-security.enable.streaming value=true/
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);
[2/2] cxf-fediz git commit: Fixed failing test
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 cohei...@apache.org
Authored: Fri Apr 17 14:41:01 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
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 @@
property name=parameters
util:map
entry key=sign.request value=true /
+entry key=support.deflate.encoding value=true /
/util:map
/property
/bean
[1/2] cxf-fediz git commit: Don't require deflate encoding by default
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 cohei...@apache.org
Authored: Fri Apr 17 14:25:04 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
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
svn commit: r948001 - in /websites/production/cxf/content: cache/docs.pageCache docs/31-migration-guide.html
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 td height=100% !-- Content -- div class=wiki-content -div id=ConfluenceContenth3 id=id-3.1MigrationGuide-MajorNotesMajor Notes/h3ulliCXF 3.1 no longer supports Java 6. #160; You must use Java 7 or Java 8./liliThe JAX-WS/Simple frontend ServerFactoryBean will automatically call reset at the end of the create() call. #160; This allows resources to be cleaned up and garbage collected sooner. #160;However, it also prevents multiple calls to create() from sharing the same ServerInfo/EndpointInfo/etc... objects like they would we 3.0.x. #160; 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./liliThe Karaf features.xml file for CXF 3.1 no longer will install spring or spring-dm when installing the cxf feature. #160;If you require spring/spring-dm, you will need to install those features prior to installing the CXF feature./liliThe 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)./li/ulp#160;/ph3 id=id-3.1MigrationGuide-NewFeaturesNew Features/h3ulliThe CXF JAX-WS code generator has a new option seiSuper that can be used to specify additional super interfaces for the SEI. #160;This makes the code nonportable to other JAX-WS containers. #160; The primary use would be to add AutoCloseable to the interface to allow use of the clients in Java7 try with resource blocks./liliNew Metrics feature for collecting metrics about a CXF services. #160; Codahale/DropWizard based collector included./liliNew Throttling feature for easily throttling CXF services. #160;Sample included that uses the Metrics component to help make the throttling decisions./liliNew Logging feature for more advanced logging than the logging available in cxf-core/lili pThe 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. #160; Code that used to look like:/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +div id=ConfluenceContenth3 id=id-3.1MigrationGuide-MajorNotesMajor Notes/h3ulliCXF 3.1 no longer supports Java 6. #160; You must use Java 7 or Java 8./liliThe JAX-WS/Simple frontend ServerFactoryBean will automatically call reset at the end of the create() call. #160; This allows resources to be cleaned up and garbage collected sooner. #160;However, it also prevents multiple calls to create() from sharing the same ServerInfo/EndpointInfo/etc... objects like they would we 3.0.x. #160; 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./liliThe Karaf features.xml file for CXF 3.1 no longer will install spring or spring-dm when installing the cxf feature. #160;If you require spring/spring-dm, you will need to install those features prior to installing the CXF feature./li/ulh3 id=id-3.1MigrationGuide-SecuritychangesSecurity changes/h3ulliThe 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)./liliSome 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./liliThe SAML/XACML functionality previously available in the cxf-rt-security module is now in the cxf-rt-security-saml module./liliIf 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
cxf git commit: [CXF-6352] Support for multiple links with no 'rel'
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 sberyoz...@talend.com
Authored: Fri Apr 17 12:33:56 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
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) {
-SetMap.EntryString, Link entries = getAllLinks().entrySet();
-for (Map.EntryString, Link entry : entries) {
-if (entry.getKey().contains(relation)) {
-return entry.getValue();
+SetLink 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 SetLink getLinks() {
-return new HashSetLink(getAllLinks().values());
+return new HashSetLink(getAllLinks());
}
-private MapString, Link getAllLinks() {
+private SetLink getAllLinks() {
ListObject linkValues = metadata.get(HttpHeaders.LINK);
if (linkValues == null) {
-return Collections.emptyMap();
+return Collections.emptySet();
} else {
-MapString, Link links = new LinkedHashMapString, Link();
+SetLink links = new LinkedHashSetLink();
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);
+MetadataMapString, Object meta = new MetadataMapString, Object();
+ri.addMetadata(meta);
+
+SetLink links = ri.getLinks();
+assertTrue(links.isEmpty());
+
+meta.add(HttpHeaders.LINK, http://next);
+meta.add(HttpHeaders.LINK, http://prev);
+
+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();
+
cxf git commit: Recording .gitmergeinfo Changes
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 cohei...@apache.org Authored: Fri Apr 17 12:11:26 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org 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 git commit: [CXF-6352] Support for multiple links with no 'rel'
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 sberyoz...@talend.com
Authored: Fri Apr 17 12:33:56 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
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) {
-SetMap.EntryString, Link entries = getAllLinks().entrySet();
-for (Map.EntryString, Link entry : entries) {
-if (entry.getKey().contains(relation)) {
-return entry.getValue();
+SetLink 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 SetLink getLinks() {
-return new HashSetLink(getAllLinks().values());
+return new HashSetLink(getAllLinks());
}
-private MapString, Link getAllLinks() {
+private SetLink getAllLinks() {
ListObject linkValues = metadata.get(HttpHeaders.LINK);
if (linkValues == null) {
-return Collections.emptyMap();
+return Collections.emptySet();
} else {
-MapString, Link links = new LinkedHashMapString, Link();
+SetLink links = new LinkedHashSetLink();
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);
+MetadataMapString, Object meta = new MetadataMapString, Object();
+ri.addMetadata(meta);
+
+SetLink links = ri.getLinks();
+assertTrue(links.isEmpty());
+
+meta.add(HttpHeaders.LINK, http://next);
+meta.add(HttpHeaders.LINK, http://prev);
+
+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();
+
[38/38] cxf git commit: Switching remaining SAML Cfg tags
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 cohei...@apache.org
Authored: Fri Apr 17 10:43:38 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
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 @@
bean
class=org.apache.cxf.systest.sts.username_actas.ActAsValidator/
/entry
entry key=ws-security.is-bsp-compliant value=false/
-entry key=ws-security.validate.audience-restriction
value=false/
+entry key=security.validate.audience-restriction value=false/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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
---
[36/38] cxf git commit: Switching remaining SAML Cfg tags
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 @@
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
-entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
+entry key=security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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 @@
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
-entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
+entry key=security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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 @@
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
-entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
+entry key=security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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 @@
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
-entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
+entry key=security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=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 @@
entry key=security.callback-handler
value=org.apache.cxf.systest.ws.common.KeystorePasswordCallback/
entry key=security.signature.properties value=bob.properties/
entry key=security.encryption.username value=useReqSigCert/
-entry key=ws-security.subject.cert.constraints
value=.*O=apache.org.*/
+entry key=security.subject.cert.constraints
value=.*O=apache.org.*/
/jaxws:properties
/jaxws:endpoint
jaxws:endpoint xmlns:s=http://www.example.org/contract/DoubleIt;
id=AsymmetricSignature
address=http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricSignature;
serviceName=s:DoubleItService
endpointName=s:DoubleItAsymmetricSignaturePort
[22/38] cxf git commit: Switching CallbackHandler
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 cohei...@apache.org Authored: Fri Apr 17 10:35:33 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org 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 +-
