cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1231172 - in /cxf/trunk: api/pom.xml rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java rt/ws/policy/pom.xml
Date Fri, 13 Jan 2012 16:49:27 GMT
Author: dkulp
Date: Fri Jan 13 16:49:27 2012
New Revision: 1231172

URL: http://svn.apache.org/viewvc?rev=1231172&view=rev
Log:
Move the neethi dep down a layer

Modified:
    cxf/trunk/api/pom.xml
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
    cxf/trunk/rt/ws/policy/pom.xml

Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1231172&r1=1231171&r2=1231172&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Fri Jan 13 16:49:27 2012
@@ -74,8 +74,8 @@
         </dependency>
 
         <dependency>
-	  <groupId>org.apache.ws.xmlschema</groupId>
-	  <artifactId>xmlschema-core</artifactId>
+            <groupId>org.apache.ws.xmlschema</groupId>
+            <artifactId>xmlschema-core</artifactId>
         </dependency>
 
         <dependency>
@@ -94,10 +94,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <optional>true</optional>

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=1231172&r1=1231171&r2=1231172&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
Fri Jan 13 16:49:27 2012
@@ -86,7 +86,6 @@ import org.apache.cxf.ws.addressing.JAXW
 import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.addressing.WSAddressingFeature;
 import org.apache.cxf.wsdl.WSDLManager;
-import org.apache.neethi.Constants;
 
 /**
  * A JAX-WS specific implementation of the CXF {@link org.apache.cxf.endpoint.Endpoint} interface.
@@ -99,7 +98,9 @@ import org.apache.neethi.Constants;
 public class JaxWsEndpointImpl extends EndpointImpl {
     
     private static final long serialVersionUID = 4718088821386100282L;
-
+    private static final String URI_POLICY_NS = "http://www.w3.org/ns/ws-policy";
+    private static final String URI_WSU_NS 
+        = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
     private static final Logger LOG = LogUtils.getL7dLogger(JaxWsEndpointImpl.class);
 
     private Binding jaxwsBinding;
@@ -303,7 +304,7 @@ public class JaxWsEndpointImpl extends E
                 UnknownExtensibilityElement uel = new UnknownExtensibilityElement();
                 
                 W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
-                writer.writeStartElement("wsp", "PolicyReference", Constants.URI_POLICY_NS);
+                writer.writeStartElement("wsp", "PolicyReference", URI_POLICY_NS);
                 writer.writeAttribute("URI", "#" + polRefId.toString());
                 writer.writeEndElement();
                 Element pr = writer.getDocument().getDocumentElement();
@@ -312,15 +313,15 @@ public class JaxWsEndpointImpl extends E
                 bindingInfo.addExtensor(uel);
                 
                 writer = new W3CDOMStreamWriter();
-                writer.writeStartElement("wsp", "Policy", Constants.URI_POLICY_NS);
-                writer.writeAttribute("wsu", Constants.URI_WSU_NS,
-                                      Constants.ATTR_ID, polRefId.toString());
+                writer.writeStartElement("wsp", "Policy", URI_POLICY_NS);
+                writer.writeAttribute("wsu", URI_WSU_NS,
+                                      "Id", polRefId.toString());
                 writer.writeStartElement("wsam", "Addressing", JAXWSAConstants.NS_WSAM);
                 if (!addressing.required()) {
-                    writer.writeAttribute("wsp", Constants.URI_POLICY_NS,
+                    writer.writeAttribute("wsp", URI_POLICY_NS,
                                           "Optional", "true");
                 }
-                writer.writeStartElement("wsp", "Policy", Constants.URI_POLICY_NS);
+                writer.writeStartElement("wsp", "Policy", URI_POLICY_NS);
                 
                 String s = getAddressingRequirement(addressing);
                 if (s != null) {

Modified: cxf/trunk/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=1231172&r1=1231171&r2=1231172&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Fri Jan 13 16:49:27 2012
@@ -75,7 +75,10 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>



Mime
View raw message