cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r596528 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/ tools/wsdlto/front...
Date Tue, 20 Nov 2007 03:39:22 GMT
Author: ningjiang
Date: Mon Nov 19 19:39:22 2007
New Revision: 596528

URL: http://svn.apache.org/viewvc?rev=596528&view=rev
Log:
Merged revisions 596192-596468,596470-596500 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r596192 | mmao | 2007-11-19 12:29:56 +0800 (Mon, 19 Nov 2007) | 4 lines
  
  CXF-1216 
   WS-Addressing & .net Interop, Thanks Adrian for the patch
........
  r596221 | ema | 2007-11-19 16:25:08 +0800 (Mon, 19 Nov 2007) | 1 line
  
  Renamed service.validator.xml to avoid loading the same name file from cxf-rt-bindings-xml.jar
when it is placed in classpath before cxf-tools-frontend-jaxws.jar.
........
  r596228 | ema | 2007-11-19 16:57:08 +0800 (Mon, 19 Nov 2007) | 1 line
  
  Add tools.service.validator.xml to fix build.
........
  r596253 | mmao | 2007-11-19 18:20:26 +0800 (Mon, 19 Nov 2007) | 4 lines
  
  CXF-1218
     Memory Leak in Policy Engine
........
  r596500 | ningjiang | 2007-11-20 08:45:03 +0800 (Tue, 20 Nov 2007) | 1 line
  
  Fixed a check style error in PolicyEngineImpl
........

Added:
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml
      - copied unchanged from r596253, incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/META-INF/tools.service.validator.xml
      - copied unchanged from r596253, incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/META-INF/tools.service.validator.xml
Removed:
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/service.validator.xml
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
    incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
    incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java?rev=596528&r1=596527&r2=596528&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
Mon Nov 19 19:39:22 2007
@@ -236,12 +236,10 @@
             exposed.setValue(internal.getValue());
             String internalRelationshipType = internal.getRelationshipType();
             if (internalRelationshipType != null) {
-                QName exposedRelationshipType = 
-                    Names.WSA_RELATIONSHIP_REPLY.equals(
-                                                    internalRelationshipType)
-                    ? new QName(Names200408.WSA_NAMESPACE_NAME,
-                                Names.WSA_REPLY_NAME)
-                    : new QName(internalRelationshipType);
+                QName exposedRelationshipType = null;
+                if (!Names.WSA_RELATIONSHIP_REPLY.equals(internalRelationshipType)) {
+                    exposedRelationshipType = new QName(internalRelationshipType);
+                }
                 exposed.setRelationshipType(exposedRelationshipType);
             }
             putAll(exposed.getOtherAttributes(), internal.getOtherAttributes());

Modified: incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java?rev=596528&r1=596527&r2=596528&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
Mon Nov 19 19:39:22 2007
@@ -31,6 +31,8 @@
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerLifeCycleListener;
 import org.apache.cxf.extension.BusExtension;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.service.model.BindingFaultInfo;
@@ -52,7 +54,7 @@
 /**
  * 
  */
-public class PolicyEngineImpl implements PolicyEngine, BusExtension {
+public class PolicyEngineImpl implements PolicyEngine, BusExtension, ServerLifeCycleListener
{
     
     private Bus bus;
     private PolicyRegistry registry;
@@ -521,7 +523,15 @@
         }
         return true;
     }
-    
+
+    public void startServer(Server server) {
+        // emptry
+    }
+
+    public void stopServer(Server server) {
+        EndpointInfo ei = server.getEndpoint().getEndpointInfo();
+        endpointInfo.remove(ei);
+    }
     
     /**
      * Class used as key in the client request policy and server response policy maps.

Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=596528&r1=596527&r2=596528&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Mon Nov 19 19:39:22 2007
@@ -72,7 +72,7 @@
 
     protected static final Logger LOG = LogUtils.getL7dLogger(WSDLToJavaContainer.class);
     private static final String DEFAULT_NS2PACKAGE = "http://www.w3.org/2005/08/addressing";
-    private static final String SERVICE_VALIDATOR = "META-INF/service.validator.xml";
+    private static final String SERVICE_VALIDATOR = "META-INF/tools.service.validator.xml";
     String toolName;
 
     public WSDLToJavaContainer(String name, ToolSpec toolspec) throws Exception {



Mime
View raw message