You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/09 12:28:47 UTC
svn commit: r1501188 - in /cxf/branches/2.7.x-fixes:
benchmark/performance/soap_http_doc_lit/src/main/resources/etc/
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/
systests/ws-security/src/test/resources/org/apache/c...
Author: coheigea
Date: Tue Jul 9 10:28:46 2013
New Revision: 1501188
URL: http://svn.apache.org/r1501188
Log:
Removing "iona" namespaces from configuration files
Conflicts:
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server.xml
systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml
Modified:
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
Modified: cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml?rev=1501188&r1=1501187&r2=1501188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml (original)
+++ cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-client.xml Tue Jul 9 10:28:46 2013
@@ -23,7 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
xmlns:interop="http://InteropBaseAddress/interop"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
@@ -35,7 +34,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<http:conduit name="https://.*">
Modified: cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml?rev=1501188&r1=1501187&r2=1501188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml (original)
+++ cxf/branches/2.7.x-fixes/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/https-cfg-service.xml Tue Jul 9 10:28:46 2013
@@ -23,7 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
xmlns:interop="http://InteropBaseAddress/interop"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
@@ -35,7 +34,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<httpj:engine-factory id="tls-settings">
Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml?rev=1501188&r1=1501187&r2=1501188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml Tue Jul 9 10:28:46 2013
@@ -23,7 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
@@ -35,7 +34,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml?rev=1501188&r1=1501187&r2=1501188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/spnego/server/server.xml Tue Jul 9 10:28:46 2013
@@ -23,7 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
@@ -35,7 +34,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml?rev=1501188&r1=1501187&r2=1501188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml Tue Jul 9 10:28:46 2013
@@ -23,7 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
@@ -35,7 +34,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml?rev=1501188&r1=1501187&r2=1501188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml Tue Jul 9 10:28:46 2013
@@ -23,7 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
@@ -35,7 +34,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml?rev=1501188&r1=1501187&r2=1501188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml Tue Jul 9 10:28:46 2013
@@ -23,7 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
@@ -35,7 +34,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
Modified: cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml?rev=1501188&r1=1501187&r2=1501188&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml Tue Jul 9 10:28:46 2013
@@ -23,7 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
@@ -35,7 +34,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>