cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1245619 - in /cxf/branches/2.3.x-fixes: ./ api/src/main/java/org/apache/cxf/service/model/ rt/core/src/main/java/org/apache/cxf/wsdl11/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ rt/ws/policy/src/test/java/org/apache/cxf...
Date Fri, 17 Feb 2012 15:41:41 GMT
Author: dkulp
Date: Fri Feb 17 15:41:40 2012
New Revision: 1245619

URL: http://svn.apache.org/viewvc?rev=1245619&view=rev
Log:
Merged revisions 1244328 via  svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

........
  r1244328 | dkulp | 2012-02-14 22:15:48 -0500 (Tue, 14 Feb 2012) | 18 lines
  
  Merged revisions 1244304 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1244304 | dkulp | 2012-02-14 20:54:42 -0500 (Tue, 14 Feb 2012) | 10 lines
    
    Merged revisions 1244146 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1244146 | dkulp | 2012-02-14 13:23:23 -0500 (Tue, 14 Feb 2012) | 3 lines
    
      [CXF-4110] Fix problems of description not being set in servicemodel
      which is leading to @Policy annotations not working.
    
    ........
  ........
  
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java
    cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
    cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
    cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
    cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
    cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java
    cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml
    cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml
    cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml
    cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml
    cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml
    cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml
    cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java
(original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java
Fri Feb 17 15:41:40 2012
@@ -21,14 +21,6 @@ package org.apache.cxf.service.model;
 
 public abstract class AbstractDescriptionElement extends AbstractPropertiesHolder {
 
-    DescriptionInfo description;
-
-    public void setDescription(DescriptionInfo d) {
-        description = d;
-    }
-
-    public DescriptionInfo getDescription() {
-        return description;
-    }
+    public abstract DescriptionInfo getDescription();
     
 }

Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
(original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
Fri Feb 17 15:41:40 2012
@@ -45,6 +45,13 @@ public class BindingInfo extends Abstrac
         this.bindingId = bindingId;
     }
     
+    public DescriptionInfo getDescription() {
+        if (service == null) {
+            return null;
+        }
+        return service.getDescription();
+    }
+
     public InterfaceInfo getInterface() {
         return service.getInterface();
     }

Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
(original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
Fri Feb 17 15:41:40 2012
@@ -42,6 +42,13 @@ public class EndpointInfo extends Abstra
         service = serv;
     }
     
+    public DescriptionInfo getDescription() {
+        if (service == null) {
+            return null;
+        }
+        return service.getDescription();
+    }
+
     
     public String getTransportId() {
         return transportId;

Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
(original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
Fri Feb 17 15:41:40 2012
@@ -43,7 +43,13 @@ public class InterfaceInfo extends Abstr
         service = info;
         info.setInterface(this);
     }
-    
+    public DescriptionInfo getDescription() {
+        if (service == null) {
+            return null;
+        }
+        return service.getDescription();
+    }
+
     public ServiceInfo getService() {
         return service;
     }

Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
(original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
Fri Feb 17 15:41:40 2012
@@ -41,11 +41,19 @@ public class ServiceInfo extends Abstrac
     List<SchemaInfo> schemas = new ArrayList<SchemaInfo>(4);
     private SchemaCollection xmlSchemaCollection;
     private String topLevelDoc;
+    private DescriptionInfo description;
 
     public ServiceInfo() {
         xmlSchemaCollection = new SchemaCollection();
     }
     
+    public DescriptionInfo getDescription() {
+        return description;
+    }
+    public void setDescription(DescriptionInfo d) {
+        description = d;
+    }
+
     public String getTopLevelDoc() {
         return topLevelDoc;
     }

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Fri Feb 17 15:41:40 2012
@@ -475,7 +475,6 @@ public class WSDLServiceBuilder {
         service.addEndpoint(ei);
         DescriptionInfo d = service.getDescription();
         if (null != d) {
-            ei.setDescription(d);
             d.getDescribed().add(ei);
         }
         return ei;
@@ -538,7 +537,6 @@ public class WSDLServiceBuilder {
         service.addBinding(bi);
         DescriptionInfo d = service.getDescription();
         if (null != d) {
-            bi.setDescription(d);
             d.getDescribed().add(bi);
         }
         return bi;
@@ -564,7 +562,6 @@ public class WSDLServiceBuilder {
         InterfaceInfo inf = si.createInterface(p.getQName());
         DescriptionInfo d = si.getDescription();
         if (null != d) {
-            inf.setDescription(si.getDescription());
             d.getDescribed().add(inf);
         }
         copyDocumentation(inf, p);

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
Fri Feb 17 15:41:40 2012
@@ -311,7 +311,6 @@ public class JaxWsEndpointImpl extends E
                     DescriptionInfo description = new DescriptionInfo();
                     description.setName(bindingInfo.getService().getName());
                     bindingInfo.getService().setDescription(description);
-                    bindingInfo.setDescription(description);
                 }
                 bindingInfo.getService().getDescription().addExtensor(uel);
                 

Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java
Fri Feb 17 15:41:40 2012
@@ -40,6 +40,8 @@ import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.helpers.XPathUtils;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.ws.policy.EndpointPolicy;
+import org.apache.cxf.ws.policy.PolicyEngine;
 import org.apache.cxf.wsdl.WSDLManager;
 import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
 
@@ -106,11 +108,17 @@ public class PolicyAnnotationTest extend
                   "echoIntBindingOpInputPolicy");
             check(xpu, wsdl, "/wsdl:definitions/wsdl:binding/wsdl:operation/wsdl:output",
                   "echoIntBindingOpOutputPolicy");
+            
+            
+            EndpointPolicy policy = bus.getExtension(PolicyEngine.class)
+                .getServerEndpointPolicy(s.getEndpoint().getEndpointInfo(), null);
+            assertNotNull(policy);
+            assertEquals(1, policy.getChosenAlternative().size());
         } finally {
             bus.shutdown(true);
         }
     }
-    
+
     private void check(XPathUtils xpu, Element wsdl, String path, String uri) {
         assertTrue(uri + " not found",
                    xpu.isExist("/wsdl:definitions/wsp:Policy[@wsu:Id='" + uri + "']",
@@ -152,7 +160,7 @@ public class PolicyAnnotationTest extend
     
     
     @Policies({
-        @Policy(uri = "annotationpolicies/TestImplPolicy.xml")
+        @Policy(uri = "annotationpolicies/TestImplPolicy.xml"),
     }
     )
     @WebService()

Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml
Fri Feb 17 15:41:40 2012
@@ -18,5 +18,6 @@
   under the License.
 -->
 <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:ExactlyOne />
+    <!-- impl -->
+	<wsp:All />
 </wsp:Policy>
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml
Fri Feb 17 15:41:40 2012
@@ -18,5 +18,8 @@
   under the License.
 -->
 <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:ExactlyOne />
+    <!-- interface -->
+	<wsp:All>
+	    <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"/>
+	</wsp:All>
 </wsp:Policy>
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml
Fri Feb 17 15:41:40 2012
@@ -18,5 +18,5 @@
   under the License.
 -->
 <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:ExactlyOne />
+	<wsp:All />
 </wsp:Policy>
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml
Fri Feb 17 15:41:40 2012
@@ -18,5 +18,5 @@
   under the License.
 -->
 <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:ExactlyOne />
+	<wsp:All />
 </wsp:Policy>
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml
Fri Feb 17 15:41:40 2012
@@ -18,5 +18,5 @@
   under the License.
 -->
 <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:ExactlyOne />
+	<wsp:All/>
 </wsp:Policy>
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml
Fri Feb 17 15:41:40 2012
@@ -18,5 +18,5 @@
   under the License.
 -->
 <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:ExactlyOne />
+	<wsp:All />
 </wsp:Policy>
\ No newline at end of file

Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml?rev=1245619&r1=1245618&r2=1245619&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml
Fri Feb 17 15:41:40 2012
@@ -18,5 +18,6 @@
   under the License.
 -->
 <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:ExactlyOne />
+    <!-- porttype -->
+	<wsp:All />
 </wsp:Policy>
\ No newline at end of file



Mime
View raw message