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 2020/10/06 14:50:16 UTC
[cxf] branch master updated: Consolidate a lot of the systest
service implementations
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b6161ae Consolidate a lot of the systest service implementations
b6161ae is described below
commit b6161ae07acb23ed8e71f8caca1def321866aff4
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 6 14:45:40 2020 +0100
Consolidate a lot of the systest service implementations
---
.../systest/sts/common/DoubleItPortTypeImpl.java | 31 ++++++-
.../LocalDoubleItPortTypeImpl.java | 52 ------------
.../SAMLDoubleItPortTypeImpl.java | 52 ------------
.../sts/secure_conv/DoubleItPortTypeImpl.java | 36 --------
.../systest/sts/custom_onbehalfof/cxf-service.xml | 13 ++-
.../cxf/systest/sts/secure_conv/cxf-service.xml | 11 ++-
.../cxf/systest/sts/common/DoubleItImpl.java | 41 ---------
.../systest/sts/common/DoubleItPortTypeImpl.java | 19 ++++-
.../cxf/systest/sts/symmetric/cxf-service.xml | 7 +-
.../cxf/systest/sts/symmetric/cxf-stax-service.xml | 7 +-
.../cxf/systest/kerberos/common/DoubleItImpl.java | 40 ---------
.../kerberos/common/DoubleItPortTypeImpl.java | 22 ++++-
.../cxf/systest/kerberos/wssec/kerberos/server.xml | 5 +-
.../kerberos/wssec/kerberos/stax-server.xml | 7 +-
.../cxf/systest/kerberos/wssec/spnego/server.xml | 17 ++--
.../systest/kerberos/wssec/spnego/stax-server.xml | 15 ++--
.../wssec/examples/common/DoubleItImpl.java | 36 --------
.../examples/common/DoubleItPortTypeImpl.java | 18 +++-
.../cxf/systest/wssec/examples/saml/server.xml | 5 +-
.../systest/wssec/examples/saml/stax-server.xml | 5 +-
.../cxf/systest/wssec/examples/secconv/server.xml | 7 +-
.../systest/wssec/examples/secconv/stax-server.xml | 7 +-
.../cxf/systest/wssec/examples/x509/server.xml | 7 +-
.../systest/wssec/examples/x509/stax-server.xml | 7 +-
.../apache/cxf/systest/ws/action/ActionTest.java | 6 +-
.../org/apache/cxf/systest/ws/action/UTServer.java | 5 +-
.../ws/{parts => common}/DoubleIt3Impl.java | 2 +-
.../apache/cxf/systest/ws/common/DoubleItImpl.java | 40 ---------
.../systest/ws/common/DoubleItPortTypeImpl.java | 22 ++++-
.../systest/ws/security/SecurityPolicyTest.java | 28 +++---
.../apache/cxf/systest/ws/swa/DoubleIt3Impl.java | 53 ------------
.../org/apache/cxf/systest/ws/action/server.xml | 37 ++++----
.../cxf/systest/ws/action/signature-server.xml | 10 ++-
.../systest/ws/action/signature-stax-server.xml | 8 +-
.../org/apache/cxf/systest/ws/algsuite/server.xml | 29 ++++---
.../apache/cxf/systest/ws/algsuite/stax-server.xml | 15 ++--
.../org/apache/cxf/systest/ws/basicauth/server.xml | 9 +-
.../org/apache/cxf/systest/ws/bindings/server.xml | 47 +++++-----
.../apache/cxf/systest/ws/bindings/stax-server.xml | 47 +++++-----
.../org/apache/cxf/systest/ws/cache/server.xml | 8 +-
.../cxf/systest/ws/coverage_checker/server.xml | 19 +++--
.../systest/ws/coverage_checker/stax-server.xml | 15 ++--
.../cxf/systest/ws/fault/modified-server.xml | 10 ++-
.../org/apache/cxf/systest/ws/gcm/mgf-server.xml | 9 +-
.../apache/cxf/systest/ws/gcm/mgf-stax-server.xml | 9 +-
.../org/apache/cxf/systest/ws/gcm/server.xml | 11 ++-
.../org/apache/cxf/systest/ws/gcm/stax-server.xml | 11 ++-
.../org/apache/cxf/systest/ws/httpget/server.xml | 9 +-
.../org/apache/cxf/systest/ws/https/server.xml | 19 +++--
.../apache/cxf/systest/ws/https/stax-server.xml | 19 +++--
.../org/apache/cxf/systest/ws/mtom/server.xml | 10 ++-
.../org/apache/cxf/systest/ws/parts/server.xml | 47 +++++-----
.../apache/cxf/systest/ws/parts/stax-server.xml | 45 +++++-----
.../org/apache/cxf/systest/ws/password/server.xml | 12 ++-
.../org/apache/cxf/systest/ws/policy/server.xml | 9 +-
.../org/apache/cxf/systest/ws/saml/server.xml | 7 +-
.../apache/cxf/systest/ws/swa/policy-server.xml | 14 +--
.../org/apache/cxf/systest/ws/swa/server.xml | 10 +--
.../cxf/systest/ws/swa/stax-policy-server.xml | 14 +--
.../cxf/systest/ws/tokens/endorsing-server.xml | 17 ++--
.../org/apache/cxf/systest/ws/tokens/server.xml | 23 +++--
.../systest/ws/tokens/stax-endorsing-server.xml | 17 ++--
.../apache/cxf/systest/ws/tokens/stax-server.xml | 23 +++--
.../apache/cxf/systest/ws/tokens/tls-server.xml | 9 +-
.../cxf/systest/ws/tokens/tls-stax-server.xml | 9 +-
.../org/apache/cxf/systest/ws/ut/server.xml | 7 +-
.../org/apache/cxf/systest/ws/ut/stax-server.xml | 7 +-
.../org/apache/cxf/systest/ws/wssc/unit-server.xml | 11 ++-
.../org/apache/cxf/systest/ws/x509/server.xml | 99 +++++++++++-----------
.../org/apache/cxf/systest/ws/x509/stax-server.xml | 99 +++++++++++-----------
.../org/apache/cxf/systest/ws/xkms/server.xml | 8 +-
.../org/apache/cxf/systest/ws/xkms/stax-server.xml | 8 +-
72 files changed, 723 insertions(+), 746 deletions(-)
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
index 157df77..4489c3f 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
@@ -38,13 +38,38 @@ public class DoubleItPortTypeImpl implements DoubleItPortType {
@Resource
WebServiceContext wsContext;
+ private boolean enforcePrincipal = true;
+ private String requiredPrincipalName;
+
public int doubleIt(int numberToDouble) {
- Principal pr = wsContext.getUserPrincipal();
+ if (enforcePrincipal) {
+ Principal pr = wsContext.getUserPrincipal();
+
+ Assert.assertNotNull("Principal must not be null", pr);
+ Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
- Assert.assertNotNull("Principal must not be null", pr);
- Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
+ if (requiredPrincipalName != null) {
+ Assert.assertTrue(pr.getName().contains(requiredPrincipalName));
+ }
+ }
return numberToDouble * 2;
}
+ public boolean isEnforcePrincipal() {
+ return enforcePrincipal;
+ }
+
+ public void setEnforcePrincipal(boolean enforcePrincipal) {
+ this.enforcePrincipal = enforcePrincipal;
+ }
+
+ public String getRequiredPrincipalName() {
+ return requiredPrincipalName;
+ }
+
+ public void setRequiredPrincipalName(String requiredPrincipalName) {
+ this.requiredPrincipalName = requiredPrincipalName;
+ }
+
}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java
deleted file mode 100644
index bd6ae3d..0000000
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/LocalDoubleItPortTypeImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.sts.custom_onbehalfof;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-import org.apache.cxf.feature.Features;
-import org.example.contract.doubleit.DoubleItPortType;
-
-import org.junit.Assert;
-
-@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
- endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
-@Features(features = "org.apache.cxf.feature.LoggingFeature")
-public class LocalDoubleItPortTypeImpl implements DoubleItPortType {
-
- @Resource
- WebServiceContext wsContext;
-
- public int doubleIt(int numberToDouble) {
- Principal pr = wsContext.getUserPrincipal();
-
- Assert.assertNotNull("Principal must not be null", pr);
- Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
-
- Assert.assertTrue(pr.getName().contains("Custom"));
-
- return numberToDouble * 2;
- }
-
-}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java
deleted file mode 100644
index 3f87910..0000000
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/SAMLDoubleItPortTypeImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.sts.custom_onbehalfof;
-
-import java.security.Principal;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-import org.apache.cxf.feature.Features;
-import org.example.contract.doubleit.DoubleItPortType;
-
-import org.junit.Assert;
-
-@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
- endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
-@Features(features = "org.apache.cxf.feature.LoggingFeature")
-public class SAMLDoubleItPortTypeImpl implements DoubleItPortType {
-
- @Resource
- WebServiceContext wsContext;
-
- public int doubleIt(int numberToDouble) {
- Principal pr = wsContext.getUserPrincipal();
-
- Assert.assertNotNull("Principal must not be null", pr);
- Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
-
- Assert.assertTrue(pr.getName().contains("alice"));
-
- return numberToDouble * 2;
- }
-
-}
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/DoubleItPortTypeImpl.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/DoubleItPortTypeImpl.java
deleted file mode 100644
index 4142954..0000000
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/DoubleItPortTypeImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.sts.secure_conv;
-
-import javax.jws.WebService;
-
-import org.apache.cxf.feature.Features;
-import org.example.contract.doubleit.DoubleItPortType;
-
-@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
- endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
-@Features(features = "org.apache.cxf.feature.LoggingFeature")
-public class DoubleItPortTypeImpl implements DoubleItPortType {
-
- public int doubleIt(int numberToDouble) {
- return numberToDouble * 2;
- }
-
-}
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
index 5a34ae1..dc20b0f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
@@ -26,7 +26,12 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportbst" implementor="org.apache.cxf.systest.sts.custom_onbehalfof.SAMLDoubleItPortTypeImpl" endpointName="s:DoubleItTransportCustomBSTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.custom_onbehalfof.Server}/doubleit/services/doubleittransportcustombst" wsdlLocation="org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl">
+
+ <bean id="doubleItAlice" class="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl">
+ <property name="requiredPrincipalName" value="alice"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportbst" implementor="#doubleItAlice" endpointName="s:DoubleItTransportCustomBSTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.custom_onbehalfof.Server}/doubleit/services/doubleittransportcustombst" wsdlLocation="org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
@@ -51,7 +56,11 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportbstlocal" implementor="org.apache.cxf.systest.sts.custom_onbehalfof.LocalDoubleItPortTypeImpl" endpointName="s:DoubleItTransportCustomBSTLocalPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.custom_onbehalfof.Server}/doubleit/services/doubleittransportcustombstlocal" wsdlLocation="org/apache/cxf/systest/sts/custom_onbehalfof/Dou [...]
+ <bean id="doubleItCustom" class="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl">
+ <property name="requiredPrincipalName" value="Custom"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportbstlocal" implementor="#doubleItCustom" endpointName="s:DoubleItTransportCustomBSTLocalPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.custom_onbehalfof.Server}/doubleit/services/doubleittransportcustombstlocal" wsdlLocation="org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
index 161769c..f185c7b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
@@ -26,7 +26,12 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsecureconv" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSecureConvPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.secure_conv.Server}/doubleit/services/doubleittransportsecureconv" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsecureconv" implementor="#doubleItNoSecurity" endpointName="s:DoubleItTransportSecureConvPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.secure_conv.Server}/doubleit/services/doubleittransportsecureconv" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
@@ -44,7 +49,7 @@
</entry>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsecureconv" implementor="org.apache.cxf.systest.sts.secure_conv.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSecureConvPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.secure_conv.Server.2}/doubleit/services/doubleitsymmetricsecureconv" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsecureconv" implementor="#doubleItNoSecurity" endpointName="s:DoubleItSymmetricSecureConvPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.secure_conv.Server.2}/doubleit/services/doubleitsymmetricsecureconv" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
@@ -62,7 +67,7 @@
</entry>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsupporting" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSupportingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.secure_conv.Server}/doubleit/services/doubleittransportsupporting" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsupporting" implementor="#doubleItNoSecurity" endpointName="s:DoubleItTransportSupportingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.secure_conv.Server}/doubleit/services/doubleittransportsupporting" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItImpl.java
deleted file mode 100644
index 0aa44cd..0000000
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.sts.common;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-import org.apache.cxf.feature.Features;
-import org.example.contract.doubleit.DoubleItPortType;
-
-@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
- endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
-@Features(features = "org.apache.cxf.feature.LoggingFeature")
-public class DoubleItImpl implements DoubleItPortType {
-
- @Resource
- WebServiceContext wsContext;
-
- public int doubleIt(int numberToDouble) {
- return numberToDouble * 2;
- }
-
-}
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
index 3769a4e..d47027c 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/DoubleItPortTypeImpl.java
@@ -38,12 +38,25 @@ public class DoubleItPortTypeImpl implements DoubleItPortType {
@Resource
WebServiceContext wsContext;
+ private boolean enforcePrincipal = true;
+
public int doubleIt(int numberToDouble) {
- Principal pr = wsContext.getUserPrincipal();
+ if (enforcePrincipal) {
+ Principal pr = wsContext.getUserPrincipal();
+
+ Assert.assertNotNull("Principal must not be null", pr);
+ Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
+ }
- Assert.assertNotNull("Principal must not be null", pr);
- Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
return numberToDouble * 2;
}
+ public boolean isEnforcePrincipal() {
+ return enforcePrincipal;
+ }
+
+ public void setEnforcePrincipal(boolean enforcePrincipal) {
+ this.enforcePrincipal = enforcePrincipal;
+ }
+
}
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
index 3e2af26..7ca07ce 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml
@@ -26,6 +26,11 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.symmetric.Server}/doubleit/services/doubleitsymmetricsaml1" wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
@@ -54,7 +59,7 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2secureconv" implementor="org.apache.cxf.systest.sts.common.DoubleItImpl" endpointName="s:DoubleItSymmetricSAML2SecureConversationPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.symmetric.Server}/doubleit/services/doubleitsymmetricsaml2SecureConversation" wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2secureconv" implementor="#doubleItNoSecurity" endpointName="s:DoubleItSymmetricSAML2SecureConversationPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.symmetric.Server}/doubleit/services/doubleitsymmetricsaml2SecureConversation" wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml
index af95c26..b10a344 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml
@@ -26,6 +26,11 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http: [...]
<bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml1" wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
@@ -58,7 +63,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2secureconv" implementor="org.apache.cxf.systest.sts.common.DoubleItImpl" endpointName="s:DoubleItSymmetricSAML2SecureConversationPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml2SecureConversation" wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2secureconv" implementor="#doubleItNoSecurity" endpointName="s:DoubleItSymmetricSAML2SecureConversationPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml2SecureConversation" wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItImpl.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItImpl.java
deleted file mode 100644
index 87d1527..0000000
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.kerberos.common;
-
-import javax.jws.WebService;
-
-import org.apache.cxf.feature.Features;
-import org.example.contract.doubleit.DoubleItFault;
-import org.example.contract.doubleit.DoubleItPortType;
-
-@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
- endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
-@Features(features = "org.apache.cxf.feature.LoggingFeature")
-public class DoubleItImpl implements DoubleItPortType {
-
- public int doubleIt(int numberToDouble) throws DoubleItFault {
- if (numberToDouble == 0) {
- throw new DoubleItFault("0 can't be doubled!");
- }
- return numberToDouble * 2;
- }
-
-}
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java
index 99aa300..544a6c4 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/DoubleItPortTypeImpl.java
@@ -39,13 +39,29 @@ public class DoubleItPortTypeImpl implements DoubleItPortType {
@Resource
WebServiceContext wsContext;
+ private boolean enforcePrincipal = true;
+
public int doubleIt(int numberToDouble) throws DoubleItFault {
- Principal pr = wsContext.getUserPrincipal();
+ if (enforcePrincipal) {
+ Principal pr = wsContext.getUserPrincipal();
+
+ Assert.assertNotNull("Principal must not be null", pr);
+ Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
+ }
- Assert.assertNotNull("Principal must not be null", pr);
- Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
+ if (numberToDouble == 0) {
+ throw new DoubleItFault("0 can't be doubled!");
+ }
return numberToDouble * 2;
}
+ public boolean isEnforcePrincipal() {
+ return enforcePrincipal;
+ }
+
+ public void setEnforcePrincipal(boolean enforcePrincipal) {
+ this.enforcePrincipal = enforcePrincipal;
+ }
+
}
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
index e8c9411..8670fd5 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
@@ -55,6 +55,9 @@
<bean id="kerberosCallbackHandler"
class="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
<bean id="kerberosValidator" class="org.apache.wss4j.dom.validate.KerberosTokenValidator">
<property name="contextName" value="bob"/>
@@ -204,7 +207,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="STSClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server.3}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="#doubleItNoSecurity" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="STSClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server.3}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="serviceKeystore.properties"/>
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 50a43bb..d7003a2 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
@@ -51,6 +51,11 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItKerberosTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
@@ -79,7 +84,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosSupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KerberosSupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSupportingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
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 815a7e5..0401ab3 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
@@ -55,44 +55,47 @@
<bean id="kerberosCallbackHandler"
class="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
- <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: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="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<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: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="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<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: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="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<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: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="#doubleItNoSecurity" 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="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: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="#doubleItNoSecurity" 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="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: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="#doubleItNoSecurity" 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="security.callback-handler" value-ref="kerberosCallbackHandler"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricSecureConversation" address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricSecureConversationPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricSecureConversation" address="http://localhost:${testutil.ports.Server}/DoubleItSpnegoSymmetricSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricSecureConversationPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/spnego/DoubleItSpnego.wsdl">
<jaxws:properties>
<entry key="ws-security.kerberos.jaas.context" value="bob"/>
<entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
index 59aa18b..12baaaf 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml
@@ -55,43 +55,46 @@
<bean id="kerberosCallbackHandler"
class="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetric" address="http://localhost:${testutil.ports.StaxServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSpnegoSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricPort" implementor="#doubleItNoSecurity" 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.enable.streaming" value="true"/>
<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.StaxServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricDerived" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSpnegoSymmetricDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricDerivedPort" implementor="#doubleItNoSecurity" 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.enable.streaming" value="true"/>
<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.StaxServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverSymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSpnegoSymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoSymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" 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.enable.streaming" value="true"/>
<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.StaxServer.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSpnegoTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportPort" implementor="#doubleItNoSecurity" 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.enable.streaming" value="true"/>
<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.StaxServer.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsing" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSpnegoTransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingPort" implementor="#doubleItNoSecurity" 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.enable.streaming" value="true"/>
<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.StaxServer.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SpnegoOverTransportEndorsingSP11" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSpnegoTransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItSpnegoTransportEndorsingSP11Port" implementor="#doubleItNoSecurity" 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.enable.streaming" value="true"/>
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItImpl.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItImpl.java
deleted file mode 100644
index f50817d..0000000
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.wssec.examples.common;
-
-import javax.jws.WebService;
-
-import org.apache.cxf.feature.Features;
-import org.example.contract.doubleit.DoubleItPortType;
-
-@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
- endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
-@Features(features = "org.apache.cxf.feature.LoggingFeature")
-public class DoubleItImpl implements DoubleItPortType {
-
- public int doubleIt(int numberToDouble) {
- return numberToDouble * 2;
- }
-
-}
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java
index 12b804d..6016f6e 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/DoubleItPortTypeImpl.java
@@ -38,13 +38,25 @@ public class DoubleItPortTypeImpl implements DoubleItPortType {
@Resource
WebServiceContext wsContext;
+ private boolean enforcePrincipal = true;
+
public int doubleIt(int numberToDouble) {
- Principal pr = wsContext.getUserPrincipal();
+ if (enforcePrincipal) {
+ Principal pr = wsContext.getUserPrincipal();
- Assert.assertNotNull("Principal must not be null", pr);
- Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
+ Assert.assertNotNull("Principal must not be null", pr);
+ Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
+ }
return numberToDouble * 2;
}
+ public boolean isEnforcePrincipal() {
+ return enforcePrincipal;
+ }
+
+ public void setEnforcePrincipal(boolean enforcePrincipal) {
+ this.enforcePrincipal = enforcePrincipal;
+ }
+
}
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
index 9f1ef75..b374360 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
@@ -37,8 +37,11 @@
<bean id="allowUnsignedBearerAssertions" class="org.apache.wss4j.dom.validate.SamlAssertionValidator">
<property name="requireBearerSignature" value="false" />
</bean>
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Bearer" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlBearer" serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Bearer" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSamlBearer" serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.saml1.validator" value-ref="allowUnsignedBearerAssertions"/>
</jaxws:properties>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
index 44d8fcf..ce6ed8a 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
@@ -37,8 +37,11 @@
<bean id="allowUnsignedBearerAssertions" class="org.apache.wss4j.stax.validate.SamlTokenValidatorImpl">
<property name="requireBearerSignature" value="false" />
</bean>
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Bearer" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlBearer" serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Bearer" address="http://localhost:${testutil.ports.saml.StaxServer}/DoubleItSamlBearer" serviceName="s:DoubleItService" endpointName="s:DoubleItBearerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.enable.streaming" value="true"/>
<entry key="ws-security.saml1.validator" value-ref="allowUnsignedBearerAssertions"/>
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 1abeea6..131a4cb 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
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SecureConversation" address="http://localhost:${testutil.ports.secconv.Server}/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">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SecureConversation" address="http://localhost:${testutil.ports.secconv.Server}/DoubleItSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="#doubleItNoSecurity" 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="security.signature.properties.sct" value="bob.properties"/>
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 a37d0e4..511c6fc 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
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SecureConversation" address="http://localhost:${testutil.ports.secconv.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">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SecureConversation" address="http://localhost:${testutil.ports.secconv.StaxServer}/DoubleItSecureConversation" serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="#doubleItNoSecurity" 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="security.signature.properties.sct" value="bob.properties"/>
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
index 4b6b84c..8b959ab 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml
@@ -33,6 +33,11 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.Server}/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="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
@@ -49,7 +54,7 @@
<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="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.username" value="bob"/>
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 4cb5f0f..4627ee4 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
@@ -33,6 +33,11 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.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="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
@@ -51,7 +56,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
<entry key="security.signature.username" value="bob"/>
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index 75684ce..79087c2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -42,7 +42,7 @@ import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.DispatchImpl;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.cxf.systest.ws.common.DoubleItImpl;
+import org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl;
import org.apache.cxf.systest.ws.common.KeystorePasswordCallback;
import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor;
import org.apache.cxf.test.TestUtilities;
@@ -324,7 +324,9 @@ public class ActionTest extends AbstractBusClientServerTestBase {
svrFactory.setWsdlLocation(serviceWSDL.toString());
String address = "http://localhost:" + PORT2 + "/DoubleItAsymmetric";
svrFactory.setAddress(address);
- svrFactory.setServiceBean(new DoubleItImpl());
+ DoubleItPortTypeImpl serviceBean = new DoubleItPortTypeImpl();
+ serviceBean.setEnforcePrincipal(false);
+ svrFactory.setServiceBean(serviceBean);
QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricPort");
svrFactory.setEndpointName(portQName);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java
index f832e5c..d9ecced 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java
@@ -25,7 +25,7 @@ import java.util.Map;
import javax.xml.ws.Endpoint;
import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.systest.ws.common.DoubleItImpl;
+import org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
@@ -37,7 +37,8 @@ public class UTServer extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(UTServer.class);
protected void run() {
- Object implementor = new DoubleItImpl();
+ DoubleItPortTypeImpl implementor = new DoubleItPortTypeImpl();
+ implementor.setEnforcePrincipal(false);
String address = "http://localhost:" + PORT + "/DoubleItUsernameToken3";
EndpointImpl jaxWsEndpoint = (EndpointImpl)Endpoint.publish(address, implementor);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/DoubleIt3Impl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt3Impl.java
similarity index 97%
rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/DoubleIt3Impl.java
rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt3Impl.java
index daba4d6..bb0e7b4 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/DoubleIt3Impl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleIt3Impl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.systest.ws.parts;
+package org.apache.cxf.systest.ws.common;
import java.util.Arrays;
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItImpl.java
deleted file mode 100644
index 96664df..0000000
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.ws.common;
-
-import javax.jws.WebService;
-
-import org.apache.cxf.feature.Features;
-import org.example.contract.doubleit.DoubleItFault;
-import org.example.contract.doubleit.DoubleItPortType;
-
-@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
- endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
-@Features(features = "org.apache.cxf.feature.LoggingFeature")
-public class DoubleItImpl implements DoubleItPortType {
-
- public int doubleIt(int numberToDouble) throws DoubleItFault {
- if (numberToDouble == 0) {
- throw new DoubleItFault("0 can't be doubled!");
- }
- return numberToDouble * 2;
- }
-
-}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java
index a38cb83..6c347fc 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/DoubleItPortTypeImpl.java
@@ -39,13 +39,29 @@ public class DoubleItPortTypeImpl implements DoubleItPortType {
@Resource
WebServiceContext wsContext;
+ private boolean enforcePrincipal = true;
+
public int doubleIt(int numberToDouble) throws DoubleItFault {
- Principal pr = wsContext.getUserPrincipal();
+ if (enforcePrincipal) {
+ Principal pr = wsContext.getUserPrincipal();
+
+ Assert.assertNotNull("Principal must not be null", pr);
+ Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
+ }
- Assert.assertNotNull("Principal must not be null", pr);
- Assert.assertNotNull("Principal.getName() must not return null", pr.getName());
+ if (numberToDouble == 0) {
+ throw new DoubleItFault("0 can't be doubled!");
+ }
return numberToDouble * 2;
}
+ public boolean isEnforcePrincipal() {
+ return enforcePrincipal;
+ }
+
+ public void setEnforcePrincipal(boolean enforcePrincipal) {
+ this.enforcePrincipal = enforcePrincipal;
+ }
+
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
index 7b2fb09..4582a15 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
@@ -56,7 +56,7 @@ import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.cxf.systest.ws.common.DoubleItImpl;
+import org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl;
import org.apache.cxf.systest.ws.common.KeystorePasswordCallback;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -122,16 +122,18 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
.getExtension(PolicyEngine.class).setEnabled(true);
getStaticBus().getOutInterceptors().add(new LoggingOutInterceptor());
- EndpointImpl ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ DoubleItPortTypeImpl implementor = new DoubleItPortTypeImpl();
+ implementor.setEnforcePrincipal(false);
+ EndpointImpl ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortHttps"));
ep.setWsdlLocation(wsdl.getPath());
ep.setAddress(POLICY_HTTPS_ADDRESS);
ep.publish();
ep.getServer().getEndpoint().getEndpointInfo().setProperty(SecurityConstants.CALLBACK_HANDLER,
new ServerPasswordCallback());
- Endpoint.publish(POLICY_ADDRESS, new DoubleItImpl());
+ Endpoint.publish(POLICY_ADDRESS, implementor);
- ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(
new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortEncryptThenSign")
);
@@ -141,7 +143,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
EndpointInfo ei = ep.getServer().getEndpoint().getEndpointInfo();
setCryptoProperties(ei, "bob.properties", "alice.properties");
- ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(
new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortSignThenEncrypt")
);
@@ -151,7 +153,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
ei = ep.getServer().getEndpoint().getEndpointInfo();
setCryptoProperties(ei, "bob.properties", "alice.properties");
- ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortSign"));
ep.setWsdlLocation(wsdl.getPath());
ep.setAddress(POLICY_SIGN_ADDRESS);
@@ -159,7 +161,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
ei = ep.getServer().getEndpoint().getEndpointInfo();
setCryptoProperties(ei, "bob.properties", "alice.properties");
- ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortXPath"));
ep.setWsdlLocation(wsdl.getPath());
ep.setAddress(POLICY_XPATH_ADDRESS);
@@ -179,7 +181,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
ei = ep.getServer().getEndpoint().getEndpointInfo();
setCryptoProperties(ei, "bob.properties", "alice.properties");
- ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortSignedOnly"));
ep.setWsdlLocation(wsdl.getPath());
ep.setAddress(POLICY_SIGNONLY_ADDRESS);
@@ -187,7 +189,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
ei = ep.getServer().getEndpoint().getEndpointInfo();
setCryptoProperties(ei, "bob.properties", "alice.properties");
- ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortCXF3041"));
ep.setWsdlLocation(wsdl.getPath());
ep.setAddress(POLICY_CXF3041_ADDRESS);
@@ -195,7 +197,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
ei = ep.getServer().getEndpoint().getEndpointInfo();
setCryptoProperties(ei, "bob.properties", "alice.properties");
- ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortCXF3042"));
ep.setWsdlLocation(wsdl.getPath());
ep.setAddress(POLICY_CXF3042_ADDRESS);
@@ -203,7 +205,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
ei = ep.getServer().getEndpoint().getEndpointInfo();
setCryptoProperties(ei, "alice.properties", "alice.properties");
- ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortCXF3452"));
ep.setWsdlLocation(wsdl.getPath());
ep.setAddress(POLICY_CXF3452_ADDRESS);
@@ -650,7 +652,9 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase {
Bus epBus = BusFactory.newInstance().createBus();
BusFactory.setDefaultBus(epBus);
URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl");
- EndpointImpl ep = (EndpointImpl)Endpoint.create(new DoubleItImpl());
+ DoubleItPortTypeImpl implementor = new DoubleItPortTypeImpl();
+ implementor.setEnforcePrincipal(false);
+ EndpointImpl ep = (EndpointImpl)Endpoint.create(implementor);
ep.setEndpointName(
new QName("http://www.example.org/contract/DoubleIt", "DoubleItPortCXF4122")
);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/DoubleIt3Impl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/DoubleIt3Impl.java
deleted file mode 100644
index 60d1bfd..0000000
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/DoubleIt3Impl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.systest.ws.swa;
-
-import java.util.Arrays;
-
-import javax.jws.WebService;
-
-import org.apache.cxf.feature.Features;
-import org.example.contract.doubleit.DoubleItFault;
-import org.example.contract.doubleit.DoubleItSwaPortType;
-import org.example.schema.doubleit.DoubleIt3;
-import org.example.schema.doubleit.DoubleItResponse;
-
-@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
- endpointInterface = "org.example.contract.doubleit.DoubleItSwaPortType")
-@Features(features = "org.apache.cxf.feature.LoggingFeature")
-public class DoubleIt3Impl implements DoubleItSwaPortType {
-
- @Override
- public DoubleItResponse doubleIt3(DoubleIt3 parameters, byte[] attachment) throws DoubleItFault {
- int numberToDouble = parameters.getNumberToDouble();
- if (numberToDouble == 0) {
- throw new DoubleItFault("0 can't be doubled!");
- }
-
- if (!Arrays.equals(attachment, "12345".getBytes())) {
- throw new DoubleItFault("Unexpected attachment value!");
- }
-
- DoubleItResponse response = new DoubleItResponse();
- response.setDoubledNumber(numberToDouble * 2);
- return response;
- }
-
-}
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
index cb72c67..6c2aa57 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
@@ -34,7 +34,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TripleDESEncryption" address="http://localhost:${testutil.ports.action.Server}/DoubleIt3DESEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleIt3DESEncryptionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TripleDESEncryption" address="http://localhost:${testutil.ports.action.Server}/DoubleIt3DESEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleIt3DESEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -59,7 +64,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -71,7 +76,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken2" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameToken2" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -83,7 +88,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameTokenNoVal" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameTokenNoVal" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenNoValPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UsernameTokenNoVal" address="http://localhost:${testutil.ports.action.Server}/DoubleItUsernameTokenNoVal" serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenNoValPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -97,7 +102,7 @@
<entry key="ws-security.validate.token" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedPassword" address="http://localhost:${testutil.ports.action.Server}/DoubleItEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedPassword" address="http://localhost:${testutil.ports.action.Server}/DoubleItEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPasswordPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -122,7 +127,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedTimestamp" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignedTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedTimestampPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedTimestamp" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignedTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -148,7 +153,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.action.Server}/DoubleItAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.action.Server}/DoubleItAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -157,7 +162,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.action.Server}/DoubleItAsymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.action.Server}/DoubleItAsymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -166,7 +171,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Encryption" address="http://localhost:${testutil.ports.action.Server}/DoubleItEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Encryption" address="http://localhost:${testutil.ports.action.Server}/DoubleItEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -192,7 +197,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeClient" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeClient" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeClientPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeClient" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeClient" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeClientPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -218,7 +223,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeClient2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeClient2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeClientPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeClient2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeClient2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeClientPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -244,7 +249,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeServer" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeServer" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeServerPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeServer" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeServer" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeServerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -270,7 +275,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeServer2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeServer2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeServerPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureNegativeServer2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureNegativeServer2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureNegativeServerPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor">
<constructor-arg>
@@ -295,7 +300,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSAML" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignedSAML" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSAMLPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSAML" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignedSAML" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSAMLPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -308,7 +313,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -321,7 +326,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureConfig2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig2" address="http://localhost:${testutil.ports.action.Server}/DoubleItSignatureConfig2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
index c05f0d0..8e184dc 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
@@ -34,8 +34,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
-
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature" address="http://localhost:${testutil.ports.SignatureServer}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature" address="http://localhost:${testutil.ports.SignatureServer}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -61,7 +65,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature2" address="http://localhost:${testutil.ports.SignatureServer}/DoubleItSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature2" address="http://localhost:${testutil.ports.SignatureServer}/DoubleItSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-stax-server.xml
index 4933075..f10bb74 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-stax-server.xml
@@ -34,8 +34,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature" address="http://localhost:${testutil.ports.SignatureStaxServer}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature" address="http://localhost:${testutil.ports.SignatureStaxServer}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor">
<constructor-arg>
@@ -61,7 +65,7 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature2" address="http://localhost:${testutil.ports.SignatureStaxServer}/DoubleItSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Signature2" address="http://localhost:${testutil.ports.SignatureStaxServer}/DoubleItSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
index 1c6a9c9..1594ed5 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -45,7 +50,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128no2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128no2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -57,7 +62,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128no3" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128no3" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -69,7 +74,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128Inclusive" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128Inclusive" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -82,7 +87,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128Inclusive2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetric128Inclusive2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -95,7 +100,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndpointCombined" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetricCombined" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricCombinedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndpointCombined" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSymmetricCombined" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricCombinedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -107,7 +112,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEP" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEP" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -122,7 +127,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEP2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEP2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -137,7 +142,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint3" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEPno3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionOAEPEndpoint3" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItEncryptionOAEPno3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptionOAEPPort3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -152,7 +157,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEndpoint" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -166,7 +171,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSignatureno2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEndpoint2" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItSignatureno2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignaturePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -180,7 +185,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="DoubleItMultipleAlgSuites" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItMultipleAlgSuites" serviceName="s:DoubleItService" endpointName="s:DoubleItMultipleAlgSuitesPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="DoubleItMultipleAlgSuites" address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItMultipleAlgSuites" serviceName="s:DoubleItService" endpointName="s:DoubleItMultipleAlgSuitesPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
index 52e4648..d69b6c7 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -46,7 +51,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128no2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128no2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -59,7 +64,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128no3" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128no3" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -72,7 +77,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128Inclusive" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128Inclusive" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -86,7 +91,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128Inclusive2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.algsuite.StaxServer}/DoubleItSymmetric128Inclusive2" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
index ed85e1d..ee065af 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml
@@ -50,10 +50,15 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.basicauth.Server}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.basicauth.Server}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
<jaxws:properties />
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.basicauth.Server}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.basicauth.Server}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/basicauth/DoubleItBasicAuth.wsdl" depends-on="tls-settings">
<jaxws:properties />
</jaxws:endpoint>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
index a16d36f..5371233 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -46,7 +51,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItNotOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItNotOnlySignPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -59,7 +64,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -72,7 +77,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -85,7 +90,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItIncludeTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -98,7 +103,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItIncludeTimestamp2" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItIncludeTimestamp2" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -111,7 +116,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -124,7 +129,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptBeforeSigning2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItEncryptBeforeSigning2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -137,7 +142,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignBeforeEncrypting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignBeforeEncrypting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -150,7 +155,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignBeforeEncrypting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignBeforeEncrypting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -163,7 +168,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -176,7 +181,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampFirst2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampFirst2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -189,7 +194,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampLast" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampLast" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -202,7 +207,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampLast2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTimestampLast2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -215,7 +220,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItStrict" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItStrict" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -228,7 +233,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItStrict2" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItStrict2" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -241,7 +246,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTokenProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTokenProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -254,7 +259,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTokenProtection2" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItTokenProtection2" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -267,7 +272,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmation" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmation" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -280,7 +285,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmation2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmation2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -294,7 +299,7 @@
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmationEncBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.Server}/DoubleItSignatureConfirmationEncBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
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 51d1704..27f9bab 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
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.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">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -47,7 +52,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItNotOnlySign" serviceName="s:DoubleItService" endpointName="s:DoubleItNotOnlySignPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -61,7 +66,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.bindings.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -75,7 +80,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.bindings.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptSignature2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -89,7 +94,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.bindings.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItIncludeTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -103,7 +108,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItIncludeTimestamp2" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItIncludeTimestamp2" serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -117,7 +122,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -131,7 +136,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptBeforeSigning2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItEncryptBeforeSigning2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -145,7 +150,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignBeforeEncrypting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignBeforeEncrypting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -159,7 +164,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignBeforeEncrypting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignBeforeEncrypting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -173,7 +178,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampFirst" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -187,7 +192,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampFirst2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampFirst2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -201,7 +206,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampLast" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampLast" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -215,7 +220,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampLast2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTimestampLast2" serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -229,7 +234,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItStrict" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItStrict" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -243,7 +248,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItStrict2" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="StrictEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItStrict2" serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -257,7 +262,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTokenProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTokenProtection" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -271,7 +276,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTokenProtection2" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItTokenProtection2" serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -285,7 +290,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmation" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmation" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -299,7 +304,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmation2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmation2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -314,7 +319,7 @@
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmationEncBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.bindings.StaxServer}/DoubleItSignatureConfirmationEncBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
index 75775de..694d52c 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml
@@ -35,14 +35,18 @@
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CacheSymmetric" address="http://localhost:${testutil.ports.cache.Server}/DoubleItCacheSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CacheSymmetric" address="http://localhost:${testutil.ports.cache.Server}/DoubleItCacheSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.crypto" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CachePerProxySymmetric" address="http://localhost:${testutil.ports.cache.Server}/DoubleItCachePerProxySymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CachePerProxySymmetric" address="http://localhost:${testutil.ports.cache.Server}/DoubleItCachePerProxySymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.crypto" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
index 1edcd0f..8177e73 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestamp" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItBodyTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestamp" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItBodyTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -48,7 +53,7 @@
<bean class="org.apache.cxf.ws.security.wss4j.DefaultCryptoCoverageChecker"/>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestampSoap12" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItBodyTimestampSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampSoap12Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestampSoap12" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItBodyTimestampSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampSoap12Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -65,7 +70,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedBody" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedBodyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedBody" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -84,7 +89,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="WSA" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItWSA" serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="WSA" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItWSA" serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
@@ -101,7 +106,7 @@
<wsa:addressing xmlns:wsa="http://cxf.apache.org/ws/addressing"/>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ClientChecker" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItClientChecker" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ClientChecker" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItClientChecker" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -115,7 +120,7 @@
</bean>
</jaxws:outInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ClientChecker2" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItClientChecker2" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ClientChecker2" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItClientChecker2" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
@@ -141,7 +146,7 @@
</bean>
</jaxws:outFaultInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedUsernameToken" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItEncryptedUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedUsernameToken" address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItEncryptedUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
index 5366d04..776bd5f 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestamp" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItBodyTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestamp" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItBodyTimestamp" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
@@ -48,7 +53,7 @@
<bean class="org.apache.cxf.ws.security.wss4j.StaxCryptoCoverageChecker"/>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestampSoap12" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItBodyTimestampSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampSoap12Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BodyTimestampSoap12" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItBodyTimestampSoap12" serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampSoap12Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
@@ -65,7 +70,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedBody" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedBodyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedBody" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItSignedEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
@@ -84,7 +89,7 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="WSA" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItWSA" serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="WSA" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItWSA" serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
@@ -101,7 +106,7 @@
<wsa:addressing xmlns:wsa="http://cxf.apache.org/ws/addressing"/>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedUsernameToken" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItEncryptedUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedUsernameToken" address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItEncryptedUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedUsernameTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
<constructor-arg>
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 2a57ffb..2bbaf04 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
@@ -33,8 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
-
- <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">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <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="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -43,7 +47,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <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: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="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml
index 20a8717..b2f73db 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-server.xml
@@ -37,8 +37,11 @@
<bean id="mgfPolicyLoader" class="org.apache.cxf.systest.ws.gcm.MGF256AlgorithmSuiteLoader" >
<constructor-arg ref="cxf"/>
</bean>
-
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256MGFSHA256" address="http://localhost:${testutil.ports.gcm.MGFServer}/DoubleItGCM256MGFSHA256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256MGFSHA256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256MGFSHA256" address="http://localhost:${testutil.ports.gcm.MGFServer}/DoubleItGCM256MGFSHA256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256MGFSHA256Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -47,7 +50,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256MGFSHA256Digest" address="http://localhost:${testutil.ports.gcm.MGFServer}/DoubleItGCM256MGFSHA256digest" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256MGFSHA256DigestPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256MGFSHA256Digest" address="http://localhost:${testutil.ports.gcm.MGFServer}/DoubleItGCM256MGFSHA256digest" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256MGFSHA256DigestPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml
index 4b05409..1781b31 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/mgf-stax-server.xml
@@ -37,8 +37,11 @@
<bean id="mgfPolicyLoader" class="org.apache.cxf.systest.ws.gcm.MGF256AlgorithmSuiteLoader" >
<constructor-arg ref="cxf"/>
</bean>
-
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256MGFSHA256" address="http://localhost:${testutil.ports.gcm.MGFStaxServer}/DoubleItGCM256MGFSHA256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256MGFSHA256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256MGFSHA256" address="http://localhost:${testutil.ports.gcm.MGFStaxServer}/DoubleItGCM256MGFSHA256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256MGFSHA256Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -48,7 +51,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256MGFSHA256Digest" address="http://localhost:${testutil.ports.gcm.MGFStaxServer}/DoubleItGCM256MGFSHA256digest" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256MGFSHA256DigestPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256MGFSHA256Digest" address="http://localhost:${testutil.ports.gcm.MGFStaxServer}/DoubleItGCM256MGFSHA256digest" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256MGFSHA256DigestPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
index 0acf136..3a24fec 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM128" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM128" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM128" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM128" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -41,7 +46,7 @@
<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="GCM192" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM192" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -50,7 +55,7 @@
<entry key="ws-security.is-bsp-compliant" value="false"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256" address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
index f98c0bd..76bd2c3 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM128" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM128" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM128" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM128" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -42,7 +47,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM192" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM192" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -52,7 +57,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM256" address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM256" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
index a1cd5d2..a27ddb2 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
@@ -33,13 +33,18 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifier" address="http://localhost:${testutil.ports.httpget.Server}/DoubleItX509KeyIdentifier" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifier" address="http://localhost:${testutil.ports.httpget.Server}/DoubleItX509KeyIdentifier" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBody" address="http://localhost:${testutil.ports.httpget.Server}/DoubleItSignBody" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBodyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignBody" address="http://localhost:${testutil.ports.httpget.Server}/DoubleItSignBody" serviceName="s:DoubleItService" endpointName="s:DoubleItSignBodyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
<jaxws:inInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
index a385816..2f8922e 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
@@ -50,49 +50,54 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert" address="https://localhost:${testutil.ports.https.Server}/DoubleItRequireClientCert" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert" address="https://localhost:${testutil.ports.https.Server}/DoubleItRequireClientCert" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert2" address="https://localhost:${testutil.ports.https.Server}/DoubleItRequireClientCert2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert2" address="https://localhost:${testutil.ports.https.Server}/DoubleItRequireClientCert2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement" address="https://localhost:${testutil.ports.https.Server}/DoubleItNoClientCertRequirement" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement" address="https://localhost:${testutil.ports.https.Server}/DoubleItNoClientCertRequirement" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/clean-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement2" address="https://localhost:${testutil.ports.https.Server}/DoubleItNoClientCertRequirement2" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement2" address="https://localhost:${testutil.ports.https.Server}/DoubleItNoClientCertRequirement2" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/clean-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.https.Server}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.https.Server}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/basic-auth-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.https.Server}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.https.Server}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/basic-auth-policy.xml"/>
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoChildPolicy" address="https://localhost:${testutil.ports.https.Server}/DoubleItNoChildPolicy" serviceName="s:DoubleItService" endpointName="s:DoubleItNoChildPolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoChildPolicy" address="https://localhost:${testutil.ports.https.Server}/DoubleItNoChildPolicy" serviceName="s:DoubleItService" endpointName="s:DoubleItNoChildPolicyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/nochild-policy.xml"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
index b9b9cfe..c2a7a51 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
@@ -50,7 +50,12 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItRequireClientCert" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItRequireClientCert" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
@@ -60,7 +65,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert2" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItRequireClientCert2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequireClientCert2" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItRequireClientCert2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
@@ -70,7 +75,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItNoClientCertRequirement" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItNoClientCertRequirement" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/clean-policy.xml"/>
@@ -80,7 +85,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement2" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItNoClientCertRequirement2" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoClientCertRequirement2" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItNoClientCertRequirement2" serviceName="s:DoubleItService" endpointName="s:DoubleItNoClientCertRequirementPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/clean-policy.xml"/>
@@ -90,7 +95,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItBasicAuth" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/basic-auth-policy.xml"/>
@@ -100,7 +105,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="BasicAuth2" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItBasicAuth2" serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/basic-auth-policy.xml"/>
@@ -110,7 +115,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoChildPolicy" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItNoChildPolicy" serviceName="s:DoubleItService" endpointName="s:DoubleItNoChildPolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="NoChildPolicy" address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItNoChildPolicy" serviceName="s:DoubleItService" endpointName="s:DoubleItNoChildPolicyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" depends-on="tls-settings">
<jaxws:features>
<p:policies>
<wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy" URI="classpath:/org/apache/cxf/systest/ws/https/nochild-policy.xml"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
index 11093e4..74388f9 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
@@ -35,6 +35,10 @@
</cxf:features>
</cxf:bus>
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedMTOM"
address="http://localhost:${testutil.ports.mtom.Server}/DoubleItSignedMTOMInline"
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedMTOMInlinePort"
@@ -101,7 +105,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.mtom.Server}/DoubleItX509Asymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.mtom.Server}/DoubleItX509Asymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -111,7 +115,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.mtom.Server}/DoubleItX509Symmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.mtom.Server}/DoubleItX509Symmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -119,7 +123,7 @@
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Action" address="http://localhost:${testutil.ports.mtom.Server}/DoubleItX509Action" serviceName="s:DoubleItService" endpointName="s:DoubleItActionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Action" address="http://localhost:${testutil.ports.mtom.Server}/DoubleItX509Action" serviceName="s:DoubleItService" endpointName="s:DoubleItActionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
index b080230..e93749c 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredParts" address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredParts" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredParts" address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredParts" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -46,7 +51,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredParts2" address="http://localhost:${testutil.ports.parts.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredParts2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -59,7 +64,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredElements" address="http://localhost:${testutil.ports.parts.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredElements" address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredElements" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -72,7 +77,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredElements2" address="http://localhost:${testutil.ports.parts.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredElements2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -85,7 +90,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts" address="http://localhost:${testutil.ports.parts.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedParts" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -98,7 +103,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -111,7 +116,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts3" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedParts3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts3" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedParts3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -124,7 +129,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedElements" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedElements" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -137,7 +142,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedElements2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedElements2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -150,7 +155,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -164,7 +169,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -178,7 +183,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts3" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts3" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -192,7 +197,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -206,7 +211,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -220,7 +225,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements3" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements3" address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -234,7 +239,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements" address="http://localhost:${testutil.ports.parts.Server}/DoubleItContentEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements" address="http://localhost:${testutil.ports.parts.Server}/DoubleItContentEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -248,7 +253,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItContentEncryptedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements2" address="http://localhost:${testutil.ports.parts.Server}/DoubleItContentEncryptedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -266,7 +271,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedAttachments"
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedAttachments"
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedAttachmentsPort"
- implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -284,7 +289,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedAttachments2"
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedAttachments2"
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedAttachmentsPort2"
- implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -302,7 +307,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedAttachments"
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedAttachments"
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedAttachmentsPort"
- implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -320,7 +325,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedAttachments2"
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedAttachments2"
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedAttachmentsPort2"
- implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
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 ad20687..06fe60a 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
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredParts" address="http://localhost:${testutil.ports.parts.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">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredParts" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItRequiredParts" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -47,7 +52,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredParts2" address="http://localhost:${testutil.ports.parts.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredParts2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItRequiredParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -61,7 +66,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredElements" address="http://localhost:${testutil.ports.parts.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredElements" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItRequiredElements" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -75,7 +80,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredElements2" address="http://localhost:${testutil.ports.parts.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="RequiredElements2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItRequiredElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -89,7 +94,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts" address="http://localhost:${testutil.ports.parts.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedParts" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -103,7 +108,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -117,7 +122,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts3" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedParts3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedParts3" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedParts3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -131,7 +136,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedElements" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedElements" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -145,7 +150,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedElements2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedElements2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -159,7 +164,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -174,7 +179,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -189,7 +194,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts3" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedParts3" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -204,7 +209,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -219,7 +224,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedElements2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -234,7 +239,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItContentEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItContentEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -249,7 +254,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItContentEncryptedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements2" address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItContentEncryptedElements2" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -268,7 +273,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedAttachments"
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedAttachments"
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedAttachmentsPort"
- implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -287,7 +292,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedAttachments2"
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedAttachments2"
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedAttachmentsPort2"
- implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -306,7 +311,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedAttachments"
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedAttachments"
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedAttachmentsPort"
- implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -325,7 +330,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedAttachments2"
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedAttachments2"
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedAttachmentsPort2"
- implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml
index deae7da..b9ba118 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml
@@ -34,10 +34,14 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
-
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UT"
address="http://localhost:${testutil.ports.password.Server}/DoubleItUT" serviceName="s:DoubleItService"
- endpointName="s:DoubleItUTPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ endpointName="s:DoubleItUTPort" implementor="#doubleItNoSecurity"
wsdlLocation="org/apache/cxf/systest/ws/password/DoubleItPassword.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -46,7 +50,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="UTSigned"
address="http://localhost:${testutil.ports.password.Server}/DoubleItUTSigned" serviceName="s:DoubleItService"
- endpointName="s:DoubleItUTSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ endpointName="s:DoubleItUTSignedPort" implementor="#doubleItNoSecurity"
wsdlLocation="org/apache/cxf/systest/ws/password/DoubleItPassword.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -56,7 +60,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric"
address="http://localhost:${testutil.ports.password.Server}/DoubleItAsymmetric" serviceName="s:DoubleItService"
- endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ endpointName="s:DoubleItAsymmetricPort" implementor="#doubleItNoSecurity"
wsdlLocation="org/apache/cxf/systest/ws/password/DoubleItPassword.wsdl">
<jaxws:properties>
<entry key="security.signature.username" value="bob"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
index 422ad04..582c8b1 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml
@@ -47,6 +47,11 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEndpoint" address="http://localhost:${testutil.ports.policy.Server}/DoubleItAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -96,7 +101,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingSigned" address="https://localhost:${testutil.ports.policy.Server.2}/DoubleItTransportSupportingSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingSigned" address="https://localhost:${testutil.ports.policy.Server.2}/DoubleItTransportSupportingSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -107,7 +112,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportUTSupportingSigned" address="https://localhost:${testutil.ports.policy.Server.2}/DoubleItTransportUTSupportingSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportUTSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportUTSupportingSigned" address="https://localhost:${testutil.ports.policy.Server.2}/DoubleItTransportUTSupportingSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportUTSupportingSignedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
index cc88258..ca20bfc 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml
@@ -51,6 +51,11 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Saml1TokenOverTransport" address="https://localhost:${testutil.ports.saml.Server.2}/DoubleItSaml1Transport" serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings">
<jaxws:properties>
</jaxws:properties>
@@ -158,7 +163,7 @@
<entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Saml2TokenOverSymmetricSignedElements" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2SymmetricSignedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Saml2TokenOverSymmetricSignedElements" address="http://localhost:${testutil.ports.saml.Server}/DoubleItSaml2SymmetricSignedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricSignedElementsPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml
index 4d742c1..56c44ab 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml
@@ -38,7 +38,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureContentPolicy"
address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWASignatureContentPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureContentPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -49,7 +49,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureCompletePolicy"
address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWASignatureCompletePolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureCompletePolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -60,7 +60,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionPolicy"
address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWAEncryptionPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -71,7 +71,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionContentPolicy"
address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWAEncryptionContentPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionContentPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -82,7 +82,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CombinedPolicy"
address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWACombinedPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -93,7 +93,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CombinedDerivedPolicy"
address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWACombinedDerivedPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedDerivedPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -104,7 +104,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CombinedAsymmetricPolicy"
address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWACombinedAsymmetricPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedAsymmetricPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml
index fc9357a..92a941a 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml
@@ -38,7 +38,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureContentAction"
address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWASignatureContentAction"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureContentActionPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
@@ -68,7 +68,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureCompleteAction"
address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWASignatureCompleteAction"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureCompleteActionPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
@@ -98,7 +98,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionContentAction"
address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWAEncryptionContentAction"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionContentActionPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
@@ -128,7 +128,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionCompleteAction"
address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWAEncryptionCompleteAction"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionCompleteActionPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
@@ -158,7 +158,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureEncryptionContentAction"
address="http://localhost:${testutil.ports.swa.Server}/DoubleItSWASignatureEncryptionContentAction"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureEncryptionContentActionPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:outInterceptors>
<bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml
index bd2cbc1..99df113 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml
@@ -38,7 +38,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureContentPolicy"
address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWASignatureContentPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureContentPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -50,7 +50,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureCompletePolicy"
address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWASignatureCompletePolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWASignatureCompletePolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -62,7 +62,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionPolicy"
address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWAEncryptionPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -74,7 +74,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptionContentPolicy"
address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWAEncryptionContentPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWAEncryptionContentPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -86,7 +86,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CombinedPolicy"
address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWACombinedPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -98,7 +98,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CombinedDerivedPolicy"
address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWACombinedDerivedPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedDerivedPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
@@ -110,7 +110,7 @@
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="CombinedAsymmetricPolicy"
address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWACombinedAsymmetricPolicy"
serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedAsymmetricPolicyPort"
- implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl"
+ implementor="org.apache.cxf.systest.ws.common.DoubleIt3Impl"
wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
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 42f3f20..adc31df 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
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <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">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <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="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -46,7 +51,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <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: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="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -59,7 +64,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <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: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="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -72,7 +77,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <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: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="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -85,7 +90,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <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: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="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -98,7 +103,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEndorsingSupportingTokens3" address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItSignedEndorsingSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEndorsingSupportingTokens3" address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItSignedEndorsingSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
index 6fe1cef..bb31723 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -46,7 +51,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -59,7 +64,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -72,7 +77,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItEncryptedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -85,7 +90,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItEncryptedSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -98,7 +103,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItEncryptedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItEncryptedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -111,7 +116,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -124,7 +129,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -137,7 +142,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.Server}/DoubleItSignedEncryptedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml
index e85e4f3..dd30576 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EndorsingSupportingTokens" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItEndorsingSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EndorsingSupportingTokens" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItEndorsingSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -47,7 +52,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EndorsingSupportingTokens2" address="http://localhost:${testutil.ports.StaxEndorsingServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EndorsingSupportingTokens2" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItEndorsingSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -61,7 +66,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EndorsingSupportingTokens3" address="http://localhost:${testutil.ports.StaxEndorsingServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EndorsingSupportingTokens3" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItEndorsingSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -75,7 +80,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEndorsingSupportingTokens" address="http://localhost:${testutil.ports.StaxEndorsingServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEndorsingSupportingTokens" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItSignedEndorsingSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -89,7 +94,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEndorsingSupportingTokens2" address="http://localhost:${testutil.ports.StaxEndorsingServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEndorsingSupportingTokens2" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItSignedEndorsingSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -103,7 +108,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEndorsingSupportingTokens3" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItSignedEndorsingSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEndorsingSupportingTokens3" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItSignedEndorsingSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
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 f133950..4b8a8b8 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
@@ -33,7 +33,12 @@
<cxf:logging/>
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens" address="http://localhost:${testutil.ports.tokens.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">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -47,7 +52,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -61,7 +66,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -75,7 +80,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItEncryptedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -89,7 +94,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItEncryptedSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -103,7 +108,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItEncryptedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItEncryptedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -117,7 +122,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -131,7 +136,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting2" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -145,7 +150,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.tokens.StaxServer}/DoubleItSignedEncryptedSupporting3" serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml
index 347c3b8..01d9581 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml
@@ -46,7 +46,12 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens4" address="https://localhost:${testutil.ports.tokens.TLSServer}/DoubleItEncryptedSupporting4" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort4" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens4" address="https://localhost:${testutil.ports.tokens.TLSServer}/DoubleItEncryptedSupporting4" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort4" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -59,7 +64,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens5" address="https://localhost:${testutil.ports.tokens.TLSServer}/DoubleItEncryptedSupporting5" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort5" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens5" address="https://localhost:${testutil.ports.tokens.TLSServer}/DoubleItEncryptedSupporting5" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort5" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
index 10611de..98a2ee0 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-stax-server.xml
@@ -46,7 +46,12 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens4" address="https://localhost:${testutil.ports.tokens.TLSStaxServer}/DoubleItEncryptedSupporting4" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort4" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens4" address="https://localhost:${testutil.ports.tokens.TLSStaxServer}/DoubleItEncryptedSupporting4" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort4" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -60,7 +65,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens5" address="https://localhost:${testutil.ports.tokens.TLSStaxServer}/DoubleItEncryptedSupporting5" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort5" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="EncryptedSupportingTokens5" address="https://localhost:${testutil.ports.tokens.TLSStaxServer}/DoubleItEncryptedSupporting5" serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort5" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
index a270add..a1deddb 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml
@@ -50,6 +50,11 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Plaintext" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTPlaintext" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -101,7 +106,7 @@
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="InlinePolicy" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTInlinePolicy" serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="InlinePolicy" address="https://localhost:${testutil.ports.ut.Server}/DoubleItUTInlinePolicy" serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
</jaxws:properties>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
index eac32ac..90aedb3 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml
@@ -50,6 +50,11 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Plaintext" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTPlaintext" serviceName="s:DoubleItService" endpointName="s:DoubleItPlaintextPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
@@ -110,7 +115,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="InlinePolicy" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTInlinePolicy" serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="InlinePolicy" address="https://localhost:${testutil.ports.ut.StaxServer}/DoubleItUTInlinePolicy" serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="ws-security.enable.streaming" value="true"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
index 7740fbe..b4ddce8 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml
@@ -43,17 +43,22 @@
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Transport" address="https://localhost:${testutil.ports.UnitServer}/DoubleItTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/wssc/DoubleItWSSC.wsdl" depends-on="tls-settings">
+
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Transport" address="https://localhost:${testutil.ports.UnitServer}/DoubleItTransport" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/wssc/DoubleItWSSC.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSP12" address="https://localhost:${testutil.ports.UnitServer}/DoubleItTransportSP12" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSP12Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/wssc/DoubleItWSSC.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSP12" address="https://localhost:${testutil.ports.UnitServer}/DoubleItTransportSP12" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSP12Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/wssc/DoubleItWSSC.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.UnitServer.2}/DoubleItSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/wssc/DoubleItWSSC.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.UnitServer.2}/DoubleItSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/wssc/DoubleItWSSC.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
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 62f9ec0..14a57ea 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
@@ -52,21 +52,24 @@
<bean id="policyLoader" class="org.apache.cxf.systest.ws.x509.SHA512PolicyLoader" >
<constructor-arg ref="cxf"/>
</bean>
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricErrorMessage" address="http://localhost:${testutil.ports.x509.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricErrorMessage" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricErrorMessage" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricErrorMessagePort" implementor="#doubleItNoSecurity" 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="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.x509.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifier" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509KeyIdentifier" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" implementor="#doubleItNoSecurity" 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="security.signature.crypto" value-ref="crypto"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricAddressing" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricAddressing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricAddressingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricAddressing" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricAddressing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricAddressingPort" implementor="#doubleItNoSecurity" 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="security.signature.crypto" value-ref="crypto"/>
@@ -78,19 +81,19 @@
<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.x509.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierDerived" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509KeyIdentifierDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierDerivedPort" implementor="#doubleItNoSecurity" 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="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.x509.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierEncryptBeforeSigning" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509KeyIdentifierEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" 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="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.x509.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierEncryptBeforeSigningDerived" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509KeyIdentifierEncryptBeforeSigningDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierEncryptBeforeSigningDerivedPort" implementor="#doubleItNoSecurity" 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="security.signature.crypto" value-ref="crypto"/>
@@ -107,44 +110,44 @@
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IssuerSerial" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509IssuerSerial" serviceName="s:DoubleItService" endpointName="s:DoubleItIssuerSerialPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IssuerSerial" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509IssuerSerial" serviceName="s:DoubleItService" endpointName="s:DoubleItIssuerSerialPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Thumbprint" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509Thumbprint" serviceName="s:DoubleItService" endpointName="s:DoubleItThumbprintPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Thumbprint" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509Thumbprint" serviceName="s:DoubleItService" endpointName="s:DoubleItThumbprintPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricThumbprintEndorsing" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricThumbprintEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricThumbprintEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricThumbprintEndorsing" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricThumbprintEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricThumbprintEndorsingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509ContentEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509ContentEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric256" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509Symmetric256" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric256" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509Symmetric256" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric256Port" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.symmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509Asymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricIssuerSerialPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509Asymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricIssuerSerialPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -152,7 +155,7 @@
<entry key="security.encryption.username" value="alice"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricOperation" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricOperation" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricIssuerSerialOperationPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricOperation" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricOperation" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricIssuerSerialOperationPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -160,7 +163,7 @@
<entry key="security.encryption.username" value="alice"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSHA512" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSHA512" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSHA512Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSHA512" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSHA512" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSHA512Port" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -168,7 +171,7 @@
<entry key="security.encryption.username" value="alice"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricOldConfig" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricOldConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricOldConfigPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricOldConfig" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricOldConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricOldConfigPort" implementor="#doubleItNoSecurity" 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="ws-security.signature.properties" value="bob.properties"/>
@@ -176,7 +179,7 @@
<entry key="ws-security.encryption.username" value="alice"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricNoInitiatorReference" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricNoInitiatorReference" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricNoInitiatorReferencePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricNoInitiatorReference" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricNoInitiatorReference" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricNoInitiatorReferencePort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -184,7 +187,7 @@
<entry key="security.encryption.username" value="alice"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSP11" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSP11" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSP11Port" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -192,7 +195,7 @@
<entry key="security.encryption.username" value="alice"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptedPassword" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptedPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptedPassword" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptedPasswordPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob-enc.properties"/>
@@ -200,7 +203,7 @@
<entry key="security.encryption.username" value="alice"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSHA256" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSHA256" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSHA256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSHA256" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSHA256" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSHA256Port" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -209,7 +212,7 @@
<entry key="ws-security.asymmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricThumbprint" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricThumbprint" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricThumbprintPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricThumbprint" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricThumbprint" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricThumbprintPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -217,7 +220,7 @@
<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.x509.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">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricPKIPath" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricPKIPath" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPKIPathPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -225,7 +228,7 @@
<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.x509.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">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -233,7 +236,7 @@
<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.x509.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">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigningNoEnc" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEncryptBeforeSigningNoEnc" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningNoEncPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -241,7 +244,7 @@
<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.x509.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">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptSignature" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptSignaturePort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -249,21 +252,21 @@
<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.x509.Server}/DoubleItX509AsymmetricSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignature" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<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="AsymmetricSignatureSP11" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSignatureSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignatureSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignatureSP11" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSignatureSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignatureSP11Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<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="AsymmetricEncryption" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryption" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -271,14 +274,14 @@
<entry key="security.encryption.username" value="alice"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignatureEncryption" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSignatureEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignatureEncryptionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignatureEncryption" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricSignatureEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignatureEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<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"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricProtect" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricProtect" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -286,7 +289,7 @@
<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="AsymmetricUsernameToken" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricUsernameToken" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricUsernameTokenPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -294,7 +297,7 @@
<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="AsymmetricEndorsing" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEndorsing" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509AsymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEndorsingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -302,68 +305,68 @@
<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="SymmetricUsernameToken" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricUsernameToken" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricUsernameTokenPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricProtect" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectTokensPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricProtect" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectTokensPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsing" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsing" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<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="TransportEndorsingSP11" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingSP11" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingSP11Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<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="TransportSignedEndorsing" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSignedEndorsing" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSignedEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<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="TransportEndorsingEncrypted" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingEncrypted" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingEncryptedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<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="TransportSignedEndorsingEncrypted" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSignedEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSignedEndorsingEncrypted" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSignedEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSignedEndorsingEncryptedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<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="TransportSupportingSigned" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSupportingSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingSigned" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSupportingSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<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="TransportSupportingSignedCertConstraints" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSupportingSignedCertConstraints" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedCertConstraintsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingSignedCertConstraints" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSupportingSignedCertConstraints" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedCertConstraintsPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="cxfca.properties"/>
<entry key="security.cert.constraints.separator" value=";"/>
<entry key="security.subject.cert.constraints" value=".*CN=alice.*;.*CN=dave.*"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportKVT" address="https://localhost:${testutil.ports.x509.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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportKVT" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportKVT" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportKVTPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.encryption.properties" value="alice.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="TransportSupportingToken" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSupportingToken" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingToken" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSupportingToken" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -374,7 +377,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingToken2" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSupportingToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingTokenPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingToken2" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportSupportingToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingTokenPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -385,7 +388,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportPKISupportingToken" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportPKISupportingToken" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportPKISupportingTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportPKISupportingToken" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportPKISupportingToken" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportPKISupportingTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -396,7 +399,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingNegativeTest" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportNegativeEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportNegativeEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingNegativeTest" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportNegativeEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportNegativeEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -407,7 +410,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingNegativeTest2" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportNegativeEndorsing2" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportNegativeEndorsingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingNegativeTest2" address="https://localhost:${testutil.ports.x509.Server.2}/DoubleItX509TransportNegativeEndorsing2" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportNegativeEndorsingPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -418,7 +421,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignature" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignature" address="http://localhost:${testutil.ports.x509.Server}/DoubleItX509SymmetricSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
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 96ce5a5..88e25d7 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml
@@ -52,8 +52,11 @@
<bean id="policyLoader" class="org.apache.cxf.systest.ws.x509.SHA512PolicyLoader" >
<constructor-arg ref="cxf"/>
</bean>
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricErrorMessage" address="http://localhost:${testutil.ports.x509.StaxServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricErrorMessage" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricErrorMessage" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricErrorMessagePort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="alice.properties"/>
@@ -61,14 +64,14 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifier" address="http://localhost:${testutil.ports.x509.StaxServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifier" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509KeyIdentifier" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" implementor="#doubleItNoSecurity" 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="security.signature.crypto" value-ref="crypto"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricAddressing" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricAddressing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricAddressingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricAddressing" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricAddressing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricAddressingPort" implementor="#doubleItNoSecurity" 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="security.signature.crypto" value-ref="crypto"/>
@@ -82,21 +85,21 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierDerived" address="http://localhost:${testutil.ports.x509.StaxServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierDerived" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509KeyIdentifierDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierDerivedPort" implementor="#doubleItNoSecurity" 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="security.signature.crypto" value-ref="crypto"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierEncryptBeforeSigning" address="http://localhost:${testutil.ports.x509.StaxServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierEncryptBeforeSigning" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509KeyIdentifierEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" 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="security.signature.crypto" value-ref="crypto"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierEncryptBeforeSigningDerived" address="http://localhost:${testutil.ports.x509.StaxServer}/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:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="KeyIdentifierEncryptBeforeSigningDerived" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509KeyIdentifierEncryptBeforeSigningDerived" serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierEncryptBeforeSigningDerivedPort" implementor="#doubleItNoSecurity" 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="security.signature.crypto" value-ref="crypto"/>
@@ -115,42 +118,42 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IssuerSerial" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509IssuerSerial" serviceName="s:DoubleItService" endpointName="s:DoubleItIssuerSerialPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="IssuerSerial" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509IssuerSerial" serviceName="s:DoubleItService" endpointName="s:DoubleItIssuerSerialPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Thumbprint" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509Thumbprint" serviceName="s:DoubleItService" endpointName="s:DoubleItThumbprintPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Thumbprint" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509Thumbprint" serviceName="s:DoubleItService" endpointName="s:DoubleItThumbprintPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricThumbprintEndorsing" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricThumbprintEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricThumbprintEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricThumbprintEndorsing" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricThumbprintEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricThumbprintEndorsingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509ContentEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="ContentEncryptedElements" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509ContentEncryptedElements" serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric256" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509Symmetric256" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric256" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509Symmetric256" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric256Port" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -158,7 +161,7 @@
<entry key="ws-security.symmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509Asymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricIssuerSerialPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509Asymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricIssuerSerialPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -167,7 +170,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricOperation" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricOperation" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricIssuerSerialOperationPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricOperation" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricOperation" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricIssuerSerialOperationPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -176,7 +179,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSHA512" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSHA512" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSHA512Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSHA512" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSHA512" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSHA512Port" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -185,7 +188,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricOldConfig" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricOldConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricOldConfigPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricOldConfig" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricOldConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricOldConfigPort" implementor="#doubleItNoSecurity" 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="ws-security.signature.properties" value="bob.properties"/>
@@ -194,7 +197,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricNoInitiatorReference" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricNoInitiatorReference" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricNoInitiatorReferencePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricNoInitiatorReference" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricNoInitiatorReference" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricNoInitiatorReferencePort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -203,7 +206,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSP11" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSP11" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSP11Port" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -212,7 +215,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptedPassword" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptedPasswordPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptedPassword" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryptedPassword" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptedPasswordPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob-enc.properties"/>
@@ -221,7 +224,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSHA256" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSHA256" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSHA256Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSHA256" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSHA256" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSHA256Port" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -230,7 +233,7 @@
<entry key="ws-security.asymmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricThumbprint" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricThumbprint" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricThumbprintPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricThumbprint" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricThumbprint" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricThumbprintPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -239,7 +242,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricPKIPath" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricPKIPath" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPKIPathPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricPKIPath" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricPKIPath" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPKIPathPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -248,7 +251,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryptBeforeSigning" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -257,7 +260,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigningNoEnc" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryptBeforeSigningNoEnc" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningNoEncPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptBeforeSigningNoEnc" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryptBeforeSigningNoEnc" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningNoEncPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -266,7 +269,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptSignature" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryptSignature" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryptSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptSignaturePort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -275,7 +278,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignature" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignature" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -283,7 +286,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignatureSP11" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSignatureSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignatureSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignatureSP11" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSignatureSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignatureSP11Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -291,7 +294,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryption" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncryption" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -300,7 +303,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignatureEncryption" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSignatureEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignatureEncryptionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricSignatureEncryption" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricSignatureEncryption" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignatureEncryptionPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
@@ -308,7 +311,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricProtect" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricProtect" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -317,7 +320,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricUsernameToken" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricUsernameToken" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricUsernameTokenPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -326,7 +329,7 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEndorsing" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEndorsing" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509AsymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEndorsingPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
@@ -335,77 +338,77 @@
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricUsernameToken" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricUsernameToken" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricUsernameToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricUsernameTokenPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricProtect" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectTokensPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricProtectTokens" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricProtect" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricProtectTokensPort" implementor="#doubleItNoSecurity" 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="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsing" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsing" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingSP11" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingSP11" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportEndorsingSP11" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingSP11Port" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSignedEndorsing" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSignedEndorsing" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSignedEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSignedEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingEncrypted" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingEncrypted" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportEndorsingEncryptedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSignedEndorsingEncrypted" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSignedEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSignedEndorsingEncrypted" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSignedEndorsingEncrypted" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSignedEndorsingEncryptedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingSigned" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSupportingSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingSigned" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSupportingSigned" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingSignedCertConstraints" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSupportingSignedCertConstraints" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedCertConstraintsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingSignedCertConstraints" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSupportingSignedCertConstraints" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedCertConstraintsPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="cxfca.properties"/>
<entry key="security.subject.cert.constraints" value=".*CN=alice.*"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportKVT" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportKVT" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportKVTPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportKVT" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportKVT" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportKVTPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.encryption.properties" value="alice.properties"/>
<entry key="ws-security.is-bsp-compliant" value="false"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingToken" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSupportingToken" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingToken" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSupportingToken" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -417,7 +420,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingToken2" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSupportingToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingTokenPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportSupportingToken2" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportSupportingToken2" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingTokenPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -429,7 +432,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportPKISupportingToken" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportPKISupportingToken" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportPKISupportingTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportPKISupportingToken" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportPKISupportingToken" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportPKISupportingTokenPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -441,7 +444,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingNegativeTest" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportNegativeEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportNegativeEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingNegativeTest" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportNegativeEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportNegativeEndorsingPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -453,7 +456,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingNegativeTest2" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportNegativeEndorsing2" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportNegativeEndorsingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="TransportEndorsingNegativeTest2" address="https://localhost:${testutil.ports.x509.StaxServer.2}/DoubleItX509TransportNegativeEndorsing2" serviceName="s:DoubleItService" endpointName="s:DoubleItTransportNegativeEndorsingPort2" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl" depends-on="tls-settings">
<jaxws:properties>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/>
@@ -465,7 +468,7 @@
</p:policies>
</jaxws:features>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignature" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignature" address="http://localhost:${testutil.ports.x509.StaxServer}/DoubleItX509SymmetricSignature" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignaturePort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509Signature.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml
index dd5bc28..5b3ecf1 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml
@@ -35,13 +35,17 @@
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.xkms.Server}/DoubleItXKMSSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.xkms.Server}/DoubleItXKMSSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.xkms.Server}/DoubleItXKMSAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.xkms.Server}/DoubleItXKMSAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml
index e96820b..8de6756 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml
@@ -35,14 +35,18 @@
</cxf:features>
</cxf:bus>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.xkms.StaxServer}/DoubleItXKMSSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
+ <bean id="doubleItNoSecurity" class="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl">
+ <property name="enforcePrincipal" value="false"/>
+ </bean>
+
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Symmetric" address="http://localhost:${testutil.ports.xkms.StaxServer}/DoubleItXKMSSymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>
<entry key="ws-security.enable.streaming" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
- <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.xkms.StaxServer}/DoubleItXKMSAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
+ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Asymmetric" address="http://localhost:${testutil.ports.xkms.StaxServer}/DoubleItXKMSAsymmetric" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="#doubleItNoSecurity" wsdlLocation="org/apache/cxf/systest/ws/xkms/DoubleItXKMS.wsdl">
<jaxws:properties>
<entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
<entry key="security.signature.properties" value="bob.properties"/>