You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/10/20 17:07:24 UTC
[cxf] branch 3.1.x-fixes updated (7785fa6 -> 477c8b8)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 7785fa6 [CXF-7532]some clean up
new 3572d01 Adding spring properties example for WS-Security
new 477c8b8 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
.../src/test/resources/org/apache/cxf/systest/ws/x509/client.xml | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 477c8b84ebff587b5893dedee0c3c9cb2fc9d9a7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 20 17:57:54 2017 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a0db435..d1ea90c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -910,6 +910,7 @@ M f33f5f5bff7a3e399252eb4ac100b95bbcee3945
M f40e11663072ee940dd412821c3ab98230445e5a
M f462c797eab75e9b6c6c352b4baeb84429866068
M f5e8457e0fca31f8dc7af9b6368ba84331fcf742
+M f5fdf091c9a7cf6053b3d595084d443ac57fa45a
M f7f017f2187d59369a7b94bb053f1e297972dce7
M f8439a92170c4cc6a13cf7b9a3c0eec994ebeec5
M f91541bed7e44624556b394cfba9b1a43c9bbdca
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.
[cxf] 01/02: Adding spring properties example for WS-Security
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3572d01e9ee310e4896077f341be8b4386075712
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 20 17:56:48 2017 +0100
Adding spring properties example for WS-Security
# Conflicts:
# systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml
---
.../src/test/resources/org/apache/cxf/systest/ws/x509/client.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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 94dc7cd..6a05fee 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
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-b [...]
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans [...]
<cxf:bus>
<cxf:features>
<p:policies/>
@@ -107,9 +107,10 @@
<entry key="security.encryption.username" value="bob"/>
</jaxws:properties>
</jaxws:client>
+ <util:properties id="cryptoProperties" location="classpath:bob.properties"/>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetric256Port" createdFromAPI="true">
<jaxws:properties>
- <entry key="security.encryption.properties" value="bob.properties"/>
+ <entry key="security.encryption.properties" value-ref="cryptoProperties"/>
<entry key="security.encryption.username" value="bob"/>
<entry key="ws-security.symmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"/>
</jaxws:properties>
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.