Author: dandiep
Date: Wed Aug 29 10:15:33 2007
New Revision: 570870
URL: http://svn.apache.org/viewvc?rev=570870&view=rev
Log:
CXF-947: Make FaultInfoExceptions work
Bring policy namespace in line with the other namespaces and remove the
"-config"
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionService.java
(with props)
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
(with props)
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
(with props)
incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd
- copied, changed from r570233,
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy-config.xsd
Removed:
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy-config.xsd
Modified:
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.handlers
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionService.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionService.java?rev=570870&view=auto
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionService.java
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionService.java
Wed Aug 29 10:15:33 2007
@@ -0,0 +1,23 @@
+/**
+ * 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.aegis.exception;
+
+public interface ExceptionService {
+ String sayHiWithException() throws HelloException;
+}
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionService.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java?rev=570870&view=auto
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
Wed Aug 29 10:15:33 2007
@@ -0,0 +1,64 @@
+/**
+ * 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.aegis.exception;
+
+import org.apache.cxf.aegis.AbstractAegisTest;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.frontend.ClientProxyFactoryBean;
+import org.apache.cxf.service.invoker.BeanInvoker;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExceptionTest extends AbstractAegisTest {
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ Server s = createService(ExceptionService.class, null);
+ s.getEndpoint().getService().setInvoker(new BeanInvoker(new
ExceptionServiceImpl()));
+ }
+
+ @Test
+ public void testHeaders() throws Exception {
+ ClientProxyFactoryBean proxyFac = new ClientProxyFactoryBean();
+ proxyFac.setAddress("local://ExceptionService");
+ proxyFac.setServiceClass(ExceptionService.class);
+ proxyFac.setBus(getBus());
+ setupAegis(proxyFac.getClientFactoryBean());
+
+ ExceptionService client = (ExceptionService)proxyFac.create();
+
+ try {
+ client.sayHiWithException();
+ fail("Must throw exception!");
+ } catch (HelloException e) {
+ // nothing
+ }
+ }
+
+ public static class ExceptionServiceImpl implements ExceptionService {
+
+ public String sayHiWithException() throws HelloException {
+ HelloException ex = new HelloException();
+ ex.setFaultInfo("test");
+ throw ex;
+ }
+
+ }
+}
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/ExceptionTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java?rev=570870&view=auto
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
Wed Aug 29 10:15:33 2007
@@ -0,0 +1,43 @@
+/**
+ * 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.aegis.exception;
+
+import org.apache.cxf.frontend.FaultInfoException;
+
+public class HelloException extends FaultInfoException {
+
+ String faultInfo;
+
+ public HelloException() {
+ super();
+ }
+
+ public HelloException(String message, String faultInfo) {
+ super(message);
+ this.faultInfo = faultInfo;
+ }
+
+ public void setFaultInfo(String faultInfo) {
+ this.faultInfo = faultInfo;
+ }
+
+ public String getFaultInfo() {
+ return faultInfo;
+ }
+}
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=570870&r1=570869&r2=570870&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Wed Aug 29 10:15:33 2007
@@ -48,6 +48,7 @@
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.endpoint.EndpointImpl;
+import org.apache.cxf.frontend.FaultInfoException;
import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.frontend.SimpleMethodDispatcher;
import org.apache.cxf.helpers.MethodComparator;
@@ -1154,6 +1155,19 @@
if (java.rmi.RemoteException.class.isAssignableFrom(exClass)) {
return null;
}
+
+ if (FaultInfoException.class.isAssignableFrom(exClass)) {
+ try {
+ Method m = exClass.getMethod("getFaultInfo");
+ return m.getReturnType();
+ } catch (SecurityException e) {
+ throw new ServiceConstructionException(e);
+ } catch (NoSuchMethodException e) {
+ throw new ServiceConstructionException(e);
+ }
+ }
+
+
return exClass;
}
Modified:
incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.handlers
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.handlers?rev=570870&r1=570869&r2=570870&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.handlers
(original)
+++
incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.handlers
Wed Aug 29 10:15:33 2007
@@ -18,6 +18,6 @@
# under the License.
#
#
-http\://cxf.apache.org/policy-config=org.apache.cxf.ws.policy.spring.NamespaceHandler
+http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler
http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
Added:
incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas?rev=570870&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas
(added)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas
Wed Aug 29 10:15:33 2007
@@ -0,0 +1,26 @@
+#
+#
+# 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.
+#
+#
+http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd
+http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd
+http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
+http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd
+http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd
+http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd
Copied: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd
(from r570233,
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy-config.xsd)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd?p2=incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd&p1=incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy-config.xsd&r1=570233&r2=570870&rev=570870&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy-config.xsd
(original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd Wed
Aug 29 10:15:33 2007
@@ -21,7 +21,7 @@
xmlns:beans="http://www.springframework.org/schema/beans";
xmlns:cxf-beans="http://cxf.apache.org/configuration/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- targetNamespace="http://cxf.apache.org/policy-config";
+ targetNamespace="http://cxf.apache.org/policy";
elementFormDefault="qualified"
attributeFormDefault="unqualified" >
Modified:
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml?rev=570870&r1=570869&r2=570870&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml
(original)
+++
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/beans.xml
Wed Aug 29 10:15:33 2007
@@ -19,7 +19,7 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:p="http://cxf.apache.org/policy-config";
+ xmlns:p="http://cxf.apache.org/policy";
xmlns:wsp-200607="http://www.w3.org/2006/07/ws-policy";
xmlns:wsp-200409="http://schemas.xmlsoap.org/ws/2004/09/policy";
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
@@ -27,7 +27,7 @@
http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
http://schemas.xmlsoap.org/ws/2004/09/policy
http://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-http://cxf.apache.org/policy-config
http://cxf.apache.org/schemas/policy-config.xsd
+http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
<p:engine
Modified:
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml?rev=570870&r1=570869&r2=570870&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml
(original)
+++
incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml
Wed Aug 29 10:15:33 2007
@@ -20,7 +20,7 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:jaxws="http://cxf.apache.org/jaxws";
- xmlns:p="http://cxf.apache.org/policy-config";
+ xmlns:p="http://cxf.apache.org/policy";
xmlns:wsp-200607="http://www.w3.org/2006/07/ws-policy";
xmlns:wsp-200409="http://schemas.xmlsoap.org/ws/2004/09/policy";
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
@@ -28,7 +28,7 @@
http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
http://schemas.xmlsoap.org/ws/2004/09/policy
http://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-http://cxf.apache.org/policy-config
http://cxf.apache.org/schemas/policy-config.xsd
+http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
<jaxws:server id="test" abstract="true">
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml?rev=570870&r1=570869&r2=570870&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
Wed Aug 29 10:15:33 2007
@@ -23,13 +23,13 @@
xmlns:wsa="http://cxf.apache.org/ws/addressing";
xmlns:wsp="http://www.w3.org/2006/07/ws-policy";
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
- xmlns:p="http://cxf.apache.org/policy-config";
+ xmlns:p="http://cxf.apache.org/policy";
xmlns:jaxws="http://cxf.apache.org/jaxws";
xsi:schemaLocation="
http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
http://cxf.apache.org/ws/addressing
http://cxf.apache.org/schema/ws/addressing.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
-http://cxf.apache.org/policy-conf
http://cxf.apache.org/schemas/policy-config.xsd
+http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml?rev=570870&r1=570869&r2=570870&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
Wed Aug 29 10:15:33 2007
@@ -20,12 +20,12 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:http="http://cxf.apache.org/transports/http/configuration";
xmlns:cxf="http://cxf.apache.org/core";
- xmlns:p="http://cxf.apache.org/policy-config";
+ xmlns:p="http://cxf.apache.org/policy";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-http://cxf.apache.org/policy-config
http://cxf.apache.org/schemas/policy-config.xsd
+http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
<http:conduit
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml?rev=570870&r1=570869&r2=570870&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
Wed Aug 29 10:15:33 2007
@@ -20,12 +20,12 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:http="http://cxf.apache.org/transports/http/configuration";
xmlns:cxf="http://cxf.apache.org/core";
- xmlns:p="http://cxf.apache.org/policy-config";
+ xmlns:p="http://cxf.apache.org/policy";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="
http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-http://cxf.apache.org/policy-config
http://cxf.apache.org/schemas/policy-config.xsd
+http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
<http:conduit
name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit";>
