ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r642040 - in /ode/branches/APACHE_ODE_1.1: axis2/src/main/java/org/apache/ode/axis2/ axis2/src/main/java/org/apache/ode/axis2/util/ axis2/src/test/java/org/apache/ode/axis2/ bpel-epr/src/main/java/org/apache/ode/il/config/
Date Fri, 28 Mar 2008 00:07:23 GMT
Author: mriou
Date: Thu Mar 27 17:07:19 2008
New Revision: 642040

URL: http://svn.apache.org/viewvc?rev=642040&view=rev
Log:
ODE-252 cleanup replicateEmptyNS

Modified:
    ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
    ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
    ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
    ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
    ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
    ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java

Modified: ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java?rev=642040&r1=642039&r2=642040&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
(original)
+++ ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ExternalService.java
Thu Mar 27 17:07:19 2008
@@ -76,7 +76,6 @@
     private QName _serviceName;
     private String _portName;
     private AxisConfiguration _axisConfig;
-    private boolean _isReplicateEmptyNS = false;
     private SoapMessageConverter _converter;
     private Scheduler _sched;
     private BpelServer _server;
@@ -89,7 +88,7 @@
         _executorService = executorService;
         _axisConfig = axisConfig;
         _sched = sched;
-        _converter = new SoapMessageConverter(definition, serviceName, portName, _isReplicateEmptyNS);
+        _converter = new SoapMessageConverter(definition, serviceName, portName);
         _server = server;
     }
 
@@ -259,15 +258,6 @@
 
     public void close() {
         // nothing
-    }
-
-    public void setReplicateEmptyNS(boolean isReplicateEmptyNS) {
-        _isReplicateEmptyNS = isReplicateEmptyNS;
-        try {
-            _converter = new SoapMessageConverter(_definition, _serviceName, _portName, _isReplicateEmptyNS);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
     }
 
     public String getPortName() {

Modified: ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=642040&r1=642039&r2=642040&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Thu
Mar 27 17:07:19 2008
@@ -301,10 +301,6 @@
         destroyService(serviceName, portName);
         AxisService axisService = ODEAxisService.createService(_axisConfig, pconf, serviceName,
portName);
         ODEService odeService = new ODEService(axisService, pconf.getDefinitionForService(serviceName),
serviceName, portName, _server, _txMgr);
-        if (_odeConfig.isReplicateEmptyNS()) {
-            __log.debug("Setting service with empty namespace replication");
-            odeService.setReplicateEmptyNS(true);
-        }
 
         _services.put(serviceName, portName, odeService);
 
@@ -332,10 +328,6 @@
             throw new ContextException("Error creating external service.", ex);
         }
 
-        if (_odeConfig.isReplicateEmptyNS()) {
-            __log.debug("Setting external service with empty namespace replication");
-            extService.setReplicateEmptyNS(true);
-        }
         _externalServices.put(serviceName, portName, extService);
         __log.debug("Created external service " + serviceName);
         return extService;

Modified: ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEService.java?rev=642040&r1=642039&r2=642040&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEService.java (original)
+++ ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/ODEService.java Thu
Mar 27 17:07:19 2008
@@ -68,7 +68,6 @@
     private QName _serviceName;
     private String _portName;
     private WSAEndpoint _serviceRef;
-    private boolean _isReplicateEmptyNS = false;
     private SoapMessageConverter _converter;
 
     public ODEService(AxisService axisService, Definition def, QName serviceName, String
portName, BpelServer server,
@@ -80,7 +79,7 @@
         _serviceName = serviceName;
         _portName = portName;
         _serviceRef = EndpointFactory.convertToWSA(createServiceRef(genEPRfromWSDL(_wsdlDef,
serviceName, portName)));
-        _converter = new SoapMessageConverter(def, serviceName, portName, _isReplicateEmptyNS);
+        _converter = new SoapMessageConverter(def, serviceName, portName);
 
     }
 
@@ -355,9 +354,5 @@
         }
 
         return EndpointFactory.createEndpoint(doc.getDocumentElement());
-    }
-
-    public void setReplicateEmptyNS(boolean isReplicateEmptyNS) {
-        _isReplicateEmptyNS = isReplicateEmptyNS;
     }
 }

Modified: ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java?rev=642040&r1=642039&r2=642040&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
(original)
+++ ode/branches/APACHE_ODE_1.1/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
Thu Mar 27 17:07:19 2008
@@ -97,8 +97,7 @@
 
     private SOAPBinding _soapBinding;
 
-    public SoapMessageConverter(Definition def, QName serviceName, String portName,
-            boolean replicateEmptyNS) throws AxisFault {
+    public SoapMessageConverter(Definition def, QName serviceName, String portName) throws
AxisFault {
         if (def == null)
             throw new NullPointerException("Null wsdl def.");
         if (serviceName == null)

Modified: ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java?rev=642040&r1=642039&r2=642040&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
(original)
+++ ode/branches/APACHE_ODE_1.1/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
Thu Mar 27 17:07:19 2008
@@ -69,7 +69,7 @@
     }
 
     public void setUp() throws Exception {
-        portmapper = new SoapMessageConverter(wsdl1, repoService, portName, true);
+        portmapper = new SoapMessageConverter(wsdl1, repoService, portName);
     }
 
     public void tearDown() {
@@ -78,7 +78,7 @@
 
     public void testBadPortName() {
         try {
-            new SoapMessageConverter(wsdl1, repoService, "badPort", true);
+            new SoapMessageConverter(wsdl1, repoService, "badPort");
             fail("Should have thrown axis error.");
         } catch (AxisFault af) {
             ;// expected
@@ -87,7 +87,7 @@
 
     public void testBadServiceName() {
         try {
-            new SoapMessageConverter(wsdl1, new QName(wsdl1tns, "foobar"), portName, true);
+            new SoapMessageConverter(wsdl1, new QName(wsdl1tns, "foobar"), portName);
             fail("Should have thrown axis error.");
         } catch (AxisFault af) {
             ;// expected
@@ -152,7 +152,7 @@
     /** Make sure hello world request parses correctly. */
     public void testHelloWorldRequest() throws Exception {
         SoapMessageConverter portmaper1 = new SoapMessageConverter(wsdlHW, new QName(wsdlHW
-                .getTargetNamespace(), "HelloService"), "HelloPort", false);
+                .getTargetNamespace(), "HelloService"), "HelloPort");
 
         XMLStreamReader sr = XMLInputFactory.newInstance().createXMLStreamReader(
                 getClass().getResourceAsStream("/HelloWorldRequest.soap"));

Modified: ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?rev=642040&r1=642039&r2=642040&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
(original)
+++ ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
Thu Mar 27 17:07:19 2008
@@ -72,8 +72,6 @@
 
     public static final String PROP_WORKING_DIR = "working.dir";
 
-    public static final String PROP_REPLICATE_EMPTYNS = "message.replicate.emptyns";
-
     public static final String PROP_EVENT_LISTENERS = "event.listeners";
 
     public static final String PROP_MEX_INTERCEPTORS = "mex.interceptors";
@@ -226,10 +224,6 @@
 
     public String getTxFactoryClass() {
         return getProperty(OdeConfigProperties.PROP_TX_FACTORY_CLASS, "org.apache.ode.il.EmbeddedGeronimoFactory");
-    }
-
-    public boolean isReplicateEmptyNS() {
-        return Boolean.valueOf(getProperty(OdeConfigProperties.PROP_REPLICATE_EMPTYNS, "true"));
     }
 
     public String getEventListeners() {



Mime
View raw message