cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From egl...@apache.org
Subject svn commit: r573580 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/ws/policy/ api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/ distribution/src/main/release/samples/ws_policy/wsdl/ rt/ws/policy/src/main/resources/META-INF/ rt/...
Date Fri, 07 Sep 2007 13:36:19 GMT
Author: eglynn
Date: Fri Sep  7 06:36:17 2007
New Revision: 573580

URL: http://svn.apache.org/viewvc?rev=573580&view=rev
Log:
Applying patch for CXF-872 on behalf of Sergey Beryozkin.


Added:
    incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xjb   (with props)
    incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd   (with props)
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyTestUtils.java   (with props)
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml   (with props)
Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java
    incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/wsdl/hello_world_addr_policy.wsdl
    incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.handlers
    incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/resources/attachments4.xml
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/referred.wsdl
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
    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/http_server_greeter.wsdl
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java Fri Sep  7 06:36:17 2007
@@ -28,12 +28,16 @@
  */
 public final class PolicyConstants implements BusExtension {
     
-    public static final String NAMESPACE_XMLSOAP_200409
-        = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+    public static final String NAMESPACE_WS_POLICY
+        = "http://www.w3.org/ns/ws-policy";
     
     public static final String NAMESPACE_W3_200607
         = "http://www.w3.org/2006/07/ws-policy";
     
+    public static final String NAMESPACE_XMLSOAP_200409
+        = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+    
+    
     public static final String CLIENT_POLICY_OUT_INTERCEPTOR_ID
         = "org.apache.cxf.ws.policy.ClientPolicyOutInterceptor";
     public static final String CLIENT_POLICY_IN_INTERCEPTOR_ID
@@ -106,7 +110,7 @@
     
     
     public PolicyConstants() {
-        setNamespace(NAMESPACE_W3_200607);
+        setNamespace(NAMESPACE_WS_POLICY);
     }
     
     public Class<?> getRegistrationType() {

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/NestedPrimitiveAssertionBuilderTest.java Fri Sep  7 06:36:17 2007
@@ -27,9 +27,11 @@
 
 import org.w3c.dom.Element;
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
 import org.apache.cxf.ws.policy.PolicyBuilder;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.PolicyException;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.Policy;
@@ -67,7 +69,7 @@
     }
     
     @Test
-    public void testBuildFail() throws Exception {
+    public void testBuildFailOlderNs() throws Exception {
         String data = 
             "<wsam:Addressing wsp:Optional=\"true\""
             + " xmlns:wsp=\"http://www.w3.org/2006/07/ws-policy\""
@@ -82,7 +84,25 @@
     }
     
     @Test
-    public void testBuild() throws Exception {
+    public void testBuildDefaultNs() throws Exception {
+        String data = 
+            "<wsam:Addressing wsp:Optional=\"true\""
+            + " xmlns:wsp=\"http://www.w3.org/ns/ws-policy\""
+            + " xmlns:wsam=\"http://www.w3.org/2007/01/addressing/metadata\">"
+            + "<wsp:Policy/></wsam:Addressing>";
+ 
+        Policy nested = control.createMock(Policy.class);
+        EasyMock.expect(builder.getPolicy(EasyMock.isA(Element.class))).andReturn(nested);
+        control.replay();
+        NestedPrimitiveAssertion npc = (NestedPrimitiveAssertion)npab.build(getElement(data));
+        assertEquals(TEST_NAME1, npc.getName());
+        assertSame(nested, npc.getNested());
+        assertTrue(npc.isOptional());
+        control.verify();
+    }
+    
+    @Test
+    public void testBuildOlderNs() throws Exception {
         String data = 
             "<wsam:Addressing wsp:Optional=\"true\""
             + " xmlns:wsp=\"http://www.w3.org/2006/07/ws-policy\""
@@ -91,7 +111,14 @@
  
         Policy nested = control.createMock(Policy.class);
         EasyMock.expect(builder.getPolicy(EasyMock.isA(Element.class))).andReturn(nested);
+        
+        PolicyConstants pc = new PolicyConstants();
+        pc.setNamespace(PolicyConstants.NAMESPACE_W3_200607);
+        Bus bus = control.createMock(Bus.class);
+        EasyMock.expect(bus.getExtension(PolicyConstants.class)).andReturn(pc);
         control.replay();
+        
+        npab.setBus(bus);
         NestedPrimitiveAssertion npc = (NestedPrimitiveAssertion)npab.build(getElement(data));
         assertEquals(TEST_NAME1, npc.getName());
         assertSame(nested, npc.getNested());

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/wsdl/hello_world_addr_policy.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/wsdl/hello_world_addr_policy.wsdl?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/wsdl/hello_world_addr_policy.wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/wsdl/hello_world_addr_policy.wsdl Fri Sep  7 06:36:17 2007
@@ -167,12 +167,11 @@
     <wsdl:service name="SOAPService">
         <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
             <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
-            <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
+            <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
                 <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata">
                     <wsp:Policy/>
                 </wsam:Addressing>
             </wsp:Policy>
-            <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/02/addressing/wsdl"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>

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=573580&r1=573579&r2=573580&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 Fri Sep  7 06:36:17 2007
@@ -19,5 +19,6 @@
 #
 #
 http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler
+http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
 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
\ No newline at end of file
+http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler

Modified: 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=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/spring.schemas Fri Sep  7 06:36:17 2007
@@ -18,6 +18,7 @@
 #    under the License.
 #
 #
+http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd
 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

Added: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xjb
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xjb?rev=573580&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xjb (added)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xjb Fri Sep  7 06:36:17 2007
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  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.
+-->
+<jaxb:bindings version="1.0" 
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  jaxb:extensionBindingPrefixes="xjc">
+    <jaxb:bindings schemaLocation="ws-policy-200702.xsd" node="/xs:schema">
+        <jaxb:schemaBindings>
+            <jaxb:package name="org.apache.cxf.ws.policy.v200702"/>
+        </jaxb:schemaBindings>
+    </jaxb:bindings>
+</jaxb:bindings>

Propchange: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xjb
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xjb
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xjb
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd?rev=573580&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd (added)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd Fri Sep  7 06:36:17 2007
@@ -0,0 +1,141 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!--
+
+    W3C XML Schema defined in the Web Services Policy 1.5
+    Framework specification
+
+    http://www.w3.org/TR/ws-policy-framework
+
+   Copyright © 2006 World Wide Web Consortium,
+
+   (Massachusetts Institute of Technology, European Research Consortium for
+   Informatics and Mathematics, Keio University). All Rights Reserved. This
+   work is distributed under the W3C® Software License [1] in the hope that
+   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+   $Id: ws-policy.xsd,v 1.2 2007/02/14 16:38:37 fsasaki Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:tns="http://www.w3.org/ns/ws-policy"
+	xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+	targetNamespace="http://www.w3.org/ns/ws-policy" blockDefault="#all"
+	elementFormDefault="qualified">
+	
+  <xs:import 
+      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" />
+
+  <xs:import 
+      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" />
+  
+  <xs:import
+      namespace="http://www.w3.org/XML/1998/namespace"
+      schemaLocation="http://www.w3.org/2001/xml.xsd" />
+  
+	<!-- Constructs from the Web Services Policy 1.5 Framework -->
+
+  <xs:element name="Policy" >
+    <xs:complexType>
+
+      <xs:complexContent>
+        <xs:extension base="tns:OperatorContentType" >
+          <xs:attribute name="Name" type="xs:anyURI" />
+          <xs:anyAttribute namespace="##any" processContents="lax" />
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="All" type="tns:OperatorContentType" />
+  <xs:element name="ExactlyOne" type="tns:OperatorContentType" />
+
+  <xs:complexType name="OperatorContentType" >
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded" >
+        <xs:element ref="tns:Policy" />
+        <xs:element ref="tns:All" />
+        <xs:element ref="tns:ExactlyOne" />
+
+        <xs:element ref="tns:PolicyReference" />
+        <xs:any namespace="##other" processContents="lax" />
+      </xs:choice>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:element name="PolicyReference" >
+    <xs:complexType>
+      <xs:sequence>
+        <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute name="URI" type="xs:anyURI" use="required" />
+
+      <xs:attribute name="Digest" type="xs:base64Binary" />
+      <xs:attribute name="DigestAlgorithm" 
+                    type="xs:anyURI" 
+                    default="http://www.w3.org/ns/ws-policy/Sha1Exc"
+                    />
+      <xs:anyAttribute namespace="##any" processContents="lax" />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attribute name="Optional" type="xs:boolean" default="false" />
+  <xs:attribute name="Ignorable" type="xs:boolean" default="false" />
+  	
+	<!-- Constructs from the Web Services Policy 1.5 Attachment -->
+
+  <xs:attribute name="PolicyURIs" >
+    <xs:simpleType>
+      <xs:list itemType="xs:anyURI" />
+    </xs:simpleType>
+  </xs:attribute>
+
+  <xs:element name="PolicyAttachment" >
+    <xs:complexType>
+      <xs:sequence>
+
+        <xs:element ref="tns:AppliesTo" />
+        <xs:choice maxOccurs="unbounded" >
+          <xs:element ref="tns:Policy" />
+          <xs:element ref="tns:PolicyReference" />
+        </xs:choice>
+        <!-- omitted only because it causes the content model to be non-determistic
+        <xs:element ref="wsse:Security" minOccurs="0" />
+-->
+        <xs:any namespace="##other"
+		processContents="lax"
+		minOccurs="0"
+		maxOccurs="unbounded" />
+      </xs:sequence>
+      <xs:anyAttribute namespace="##any" processContents="lax" />
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="AppliesTo" >
+    <xs:complexType>
+      <xs:sequence>
+        <xs:any namespace="##any"
+		processContents="lax"
+		maxOccurs="unbounded" />
+      </xs:sequence>
+      <xs:anyAttribute namespace="##any" processContents="lax" />
+
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="URI">
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base="xs:anyURI">
+          <xs:anyAttribute namespace="##any" processContents="lax" />
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+  	
+</xs:schema>

Propchange: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java Fri Sep  7 06:36:17 2007
@@ -53,7 +53,7 @@
     public void testNormalise() throws Exception {
         Bus bus = control.createMock(Bus.class);
         PolicyConstants constants = new PolicyConstants();
-        constants.setNamespace("http://schemas.xmlsoap.org/ws/2004/09/policy");
+        constants.setNamespace(PolicyConstants.NAMESPACE_XMLSOAP_200409);
         EasyMock.expect(bus.getExtension(PolicyConstants.class)).andReturn(constants).anyTimes();
         control.replay();
         PolicyBuilderImpl builder = new PolicyBuilderImpl();

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/ExternalAttachmentProviderTest.java Fri Sep  7 06:36:17 2007
@@ -36,6 +36,7 @@
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.ws.policy.PolicyBuilder;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.PolicyException;
 import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
 import org.apache.neethi.Assertion;
@@ -48,6 +49,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 
+
 /**
  * 
  */
@@ -187,7 +189,12 @@
     
     @Test
     public void testReadDocumentUnknownDomainExpression() throws MalformedURLException {
+
+        PolicyConstants pc = new PolicyConstants();
+        pc.setNamespace(PolicyConstants.NAMESPACE_W3_200607);
         Bus bus = control.createMock(Bus.class);
+        EasyMock.expect(bus.getExtension(PolicyConstants.class)).andReturn(pc);
+        
         eap = new ExternalAttachmentProvider(bus);
         DomainExpressionBuilderRegistry debr = control.createMock(DomainExpressionBuilderRegistry.class);
         EasyMock.expect(bus.getExtension(DomainExpressionBuilderRegistry.class)).andReturn(debr);
@@ -209,7 +216,9 @@
     
     @Test
     public void testReadDocumentEPRDomainExpression() throws MalformedURLException {
+        
         Bus bus = control.createMock(Bus.class);
+        
         eap = new ExternalAttachmentProvider(bus);
         DomainExpressionBuilderRegistry debr = control.createMock(DomainExpressionBuilderRegistry.class);
         EasyMock.expect(bus.getExtension(DomainExpressionBuilderRegistry.class)).andReturn(debr);

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/resources/attachments4.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/resources/attachments4.xml?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/resources/attachments4.xml (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/resources/attachments4.xml Fri Sep  7 06:36:17 2007
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<attachments xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:test="http://x.y.z/Assertions">
+<attachments xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:test="http://x.y.z/Assertions">
     <wsp:PolicyAttachment>
         <wsp:AppliesTo>
             <wsa:EndpointReferenceType xmlns:wsa="http://www.w3.org/2005/08/addressing">

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java Fri Sep  7 06:36:17 2007
@@ -118,8 +118,19 @@
     }
     
     @Test
-    public void testRemoteReferenceResolver() {
+    public void testRemoteReferenceResolverWithOlderNs() {
         
+        doTestRemoteResolver(PolicyConstants.NAMESPACE_W3_200607);
+    }
+    
+    @Test
+    public void testRemoteReferenceResolverWithDefaultNs() {
+        doTestRemoteResolver(PolicyConstants.NAMESPACE_WS_POLICY);
+    }
+    
+    private void doTestRemoteResolver(String policyNs) {
+        
+        constants.setNamespace(policyNs);
         URL url = ReferenceResolverTest.class.getResource("referring.wsdl");
         String baseURI = url.toString();
         PolicyBuilder builder = control.createMock(PolicyBuilder.class);
@@ -132,6 +143,7 @@
         
         control.replay();
         assertSame(p, resolver.resolveReference("referred.wsdl#PolicyA"));
-        control.verify();   
+        control.verify(); 
+        control.reset();
     }
 }

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/referred.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/referred.wsdl?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/referred.wsdl (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/referred.wsdl Fri Sep  7 06:36:17 2007
@@ -26,8 +26,18 @@
     xmlns:x1="http://apache.org/cxf/calculator/types"
     xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
     xmlns:ta="http://cxf.apache.org/test/assertions"
-    xmlns:wsp="http://www.w3.org/2006/07/ws-policy"
+    xmlns:wsp2006="http://www.w3.org/2006/07/ws-policy"
+    xmlns:wsp="http://www.w3.org/ns/ws-policy"
     xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" >
+    
+    <wsp2006:Policy wsu:Id="PolicyA">
+        <ta:A>A</ta:A>
+        <ta:B>B></ta:B>
+    </wsp2006:Policy>
+    
+    <wsp2006:Policy wsu:Id="PolicyC">
+        <ta:C>C</ta:C>
+    </wsp2006:Policy>
     
     <wsp:Policy wsu:Id="PolicyA">
         <ta:A>A</ta:A>

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyBeansTest.java Fri Sep  7 06:36:17 2007
@@ -53,7 +53,7 @@
         assertEquals(MaximalAlternativeSelector.class.getName(), 
                      pe.getAlternativeSelector().getClass().getName()); 
         
-        assertEquals("http://www.w3.org/ns/ws-policy",
+        assertEquals(PolicyConstants.NAMESPACE_WS_POLICY,
                      bus.getExtension(PolicyConstants.class).getNamespace());
         
         PolicyEngineImpl pei = (PolicyEngineImpl)pe;

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java Fri Sep  7 06:36:17 2007
@@ -45,6 +45,7 @@
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.PolicyEngine;
 import org.apache.cxf.ws.policy.WSPolicyFeature;
 import org.apache.cxf.ws.policy.selector.FirstAlternativeSelector;
@@ -93,6 +94,8 @@
             policyElements.add(DOMUtils.readXml(
                 getClass().getResourceAsStream("mtom-policy-optional.xml"))
                            .getDocumentElement());
+            getBus().getExtension(PolicyConstants.class)
+               .setNamespace(PolicyConstants.NAMESPACE_W3_200607);
         } 
         policyFeature.setPolicyElements(policyElements);       
         

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xml?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xml Fri Sep  7 06:36:17 2007
@@ -16,7 +16,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy"
+<wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy"
 	xmlns:mtom="http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization">
 	<mtom:OptimizedMimeSerialization />
 </wsp:Policy>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java Fri Sep  7 06:36:17 2007
@@ -37,6 +37,7 @@
 import org.apache.cxf.systest.ws.util.ConnectionHelper;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.ServerPolicyInInterceptor;
 import org.apache.cxf.ws.policy.ServerPolicyOutInterceptor;
 import org.apache.neethi.Policy;
@@ -83,11 +84,16 @@
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly", launchServer(Server.class));
     }
-         
+    
     @Test
     public void testUsingAddressing() throws Exception {
+        
         SpringBusFactory bf = new SpringBusFactory();
-        bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-inline-policy.xml");
+        
+        bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml");
+        PolicyTestUtils.setPolicyConstants(bus, 
+                                           PolicyConstants.NAMESPACE_W3_200607);
+        
         BusFactory.setDefaultBus(bus);
         
         BasicGreeterService gs = new BasicGreeterService();

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java Fri Sep  7 06:36:17 2007
@@ -37,6 +37,7 @@
 import org.apache.cxf.systest.ws.util.OutMessageRecorder;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.PolicyEngine;
 import org.apache.cxf.ws.policy.selector.MinimalAlternativeSelector;
 import org.apache.cxf.ws.rm.RMUtils;
@@ -57,6 +58,8 @@
         protected void run()  {            
             SpringBusFactory bf = new SpringBusFactory();
             Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml");
+            PolicyTestUtils.setPolicyConstants(bus, 
+                                               PolicyConstants.NAMESPACE_W3_200607);
             BusFactory.setDefaultBus(bus);
             LoggingInInterceptor in = new LoggingInInterceptor();
             bus.getInInterceptors().add(in);
@@ -95,6 +98,9 @@
     public void testUsingAddressing() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml");
+        Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/addr-optional.xml");
+        PolicyTestUtils.setPolicyConstants(bus, 
+                                           PolicyConstants.NAMESPACE_W3_200607);
         BusFactory.setDefaultBus(bus);
         InMessageRecorder in = new InMessageRecorder();
         bus.getInInterceptors().add(in);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java Fri Sep  7 06:36:17 2007
@@ -37,6 +37,7 @@
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.policy.PolicyException;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -61,6 +62,7 @@
         protected void run()  {            
             SpringBusFactory bf = new SpringBusFactory();
             Bus bus = bf.createBus();
+            
             BusFactory.setDefaultBus(bus);
             LoggingInInterceptor in = new LoggingInInterceptor();
             LoggingOutInterceptor out = new LoggingOutInterceptor();           
@@ -99,6 +101,10 @@
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("org/apache/cxf/systest/ws/policy/http.xml");
         BusFactory.setDefaultBus(bus);
+        
+        PolicyTestUtils.setPolicyConstants(bus, 
+                                           PolicyConstants.NAMESPACE_W3_200607);
+        
         LoggingInInterceptor in = new LoggingInInterceptor();
         bus.getInInterceptors().add(in);
         bus.getInFaultInterceptors().add(in);

Added: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyTestUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyTestUtils.java?rev=573580&view=auto
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyTestUtils.java (added)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyTestUtils.java Fri Sep  7 06:36:17 2007
@@ -0,0 +1,35 @@
+/**
+ * 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.policy;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.ws.policy.PolicyConstants;
+
+public final class PolicyTestUtils {
+
+    private PolicyTestUtils() {
+        // utility class
+    }
+    
+    public static void setPolicyConstants(Bus bus, String policyNs) {
+        PolicyConstants pc = bus.getExtension(PolicyConstants.class);
+        pc.setNamespace(policyNs);
+    }
+}

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyTestUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/PolicyTestUtils.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java Fri Sep  7 06:36:17 2007
@@ -39,6 +39,7 @@
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.ws.addressing.Names;
+import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.rm.RMConstants;
 
 import org.junit.BeforeClass;
@@ -65,6 +66,8 @@
         protected void run()  {            
             SpringBusFactory bf = new SpringBusFactory();
             Bus bus = bf.createBus("org/apache/cxf/systest/ws/policy/rmwsdl.xml");
+            PolicyTestUtils.setPolicyConstants(bus, 
+                                               PolicyConstants.NAMESPACE_W3_200607);
             BusFactory.setDefaultBus(bus);
             LoggingInInterceptor in = new LoggingInInterceptor();
             bus.getInInterceptors().add(in);
@@ -78,7 +81,6 @@
             LOG.info("Published greeter endpoint.");
         }
         
-
         public static void main(String[] args) {
             try { 
                 Server s = new Server(); 
@@ -91,7 +93,7 @@
             }
         }
     }    
-
+    
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly", launchServer(Server.class));
@@ -101,6 +103,8 @@
     public void testUsingRM() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("org/apache/cxf/systest/ws/policy/rmwsdl.xml");
+        PolicyTestUtils.setPolicyConstants(bus, 
+                                           PolicyConstants.NAMESPACE_W3_200607);
         BusFactory.setDefaultBus(bus);
         OutMessageRecorder outRecorder = new OutMessageRecorder();
         bus.getOutInterceptors().add(outRecorder);

Added: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml?rev=573580&view=auto
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml (added)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml Fri Sep  7 06:36:17 2007
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:http="http://cxf.apache.org/transports/http/configuration"
+	xmlns:wsa="http://cxf.apache.org/ws/addressing"
+	xmlns:wsp2006="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"
+	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 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">
+
+	<http:conduit
+		name="{http://cxf.apache.org/greeter_control}GreeterPort.http-conduit">
+		<http:client
+			DecoupledEndpoint="http://localhost:9999/decoupled_endpoint" />
+	</http:conduit>
+
+	<jaxws:endpoint name="{http://cxf.apache.org/greeter_control}GreeterPort" createdFromAPI="true">
+		<jaxws:features>
+			<bean class="org.apache.cxf.feature.LoggingFeature"/>
+                        <p:policies>
+                            <wsp2006:PolicyReference URI="#AddressingPolicy"/>
+                        </p:policies>
+		</jaxws:features>
+	</jaxws:endpoint>
+
+	<jaxws:client name="{http://cxf.apache.org/greeter_control}GreeterPort" createdFromAPI="true">
+		<jaxws:features>
+			<bean class="org.apache.cxf.feature.LoggingFeature"/>
+                        <p:policies>
+                            <wsp2006:PolicyReference URI="#AddressingPolicy"/>
+                        </p:policies>
+		</jaxws:features>
+	</jaxws:client>
+
+	<wsp2006:Policy wsu:Id="AddressingPolicy"
+		xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata">
+		<wsam:Addressing>
+			<wsp2006:Policy />
+		</wsam:Addressing>
+	</wsp2006:Policy>
+</beans>
\ No newline at end of file

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy-old.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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=573580&r1=573579&r2=573580&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 Fri Sep  7 06:36:17 2007
@@ -21,12 +21,12 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:http="http://cxf.apache.org/transports/http/configuration"
 	xmlns:wsa="http://cxf.apache.org/ws/addressing"
-	xmlns:wsp="http://www.w3.org/2006/07/ws-policy"
+	xmlns:wsp="http://www.w3.org/ns/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"
 	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://www.w3.org/ns/ws-policy	http://www.w3.org/2007/02/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 http://cxf.apache.org/schemas/policy.xsd

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http_server_greeter.wsdl Fri Sep  7 06:36:17 2007
@@ -104,7 +104,7 @@
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
             <!-- causes a PolicyException as it is incompatible with policy attached to port element -->
-            <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
+            <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
                 <http-conf:server xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
                     ContentType="application/soap+xml"/>
             </wsp:Policy>
@@ -170,7 +170,7 @@
                 <!-- although incomaptible with the policy attached to the port this does not cause a 
                     policy exception as all server assertions are automatically asserted on the 
                     outbound path -->
-                <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
+                <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
                     <http-conf:server xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
                         ContentType="application/soap+xml"/>
                 </wsp:Policy>
@@ -184,7 +184,7 @@
         <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
             <soap:address location="http://localhost:9020/SoapContext/GreeterPort"/>
             <!-- policy to be used for all invocations on this endpoint -->
-            <wsp:Policy xmlns:wsp="http://www.w3.org/2006/07/ws-policy">
+            <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy">
                 <http-conf:server xmlns:http-conf="http://cxf.apache.org/transports/http/configuration"
                     ContentType="application/detergent+xml"/>
             </wsp:Policy>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml?rev=573580&r1=573579&r2=573580&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm-external.xml Fri Sep  7 06:36:17 2007
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<attachments xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
+<attachments xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsa="http://www.w3.org/2005/08/addressing">
     <wsp:PolicyAttachment>
         <wsp:AppliesTo>
             <wsa:EndpointReference>



Mime
View raw message