You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/27 11:51:15 UTC
svn commit: r381314 - in /incubator/tuscany/java/sca:
binding.axis/src/main/java/org/apache/tuscany/binding/axis/builder/
binding.axis/src/main/java/org/apache/tuscany/binding/axis/config/
core/src/main/java/org/apache/tuscany/core/builder/impl/
Author: jsdelfino
Date: Mon Feb 27 02:51:10 2006
New Revision: 381314
URL: http://svn.apache.org/viewcvs?rev=381314&view=rev
Log:
resolved conflicts with Jims entrypoint configuration changes
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/BaseEntryPointRuntimeConfiguration.java
Modified:
incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/builder/WebServiceEntryPointConfigurationBuilder.java
incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/config/WebServiceEntryPointRuntimeConfiguration.java
Modified: incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/builder/WebServiceEntryPointConfigurationBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/builder/WebServiceEntryPointConfigurationBuilder.java?rev=381314&r1=381313&r2=381314&view=diff
==============================================================================
--- incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/builder/WebServiceEntryPointConfigurationBuilder.java (original)
+++ incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/builder/WebServiceEntryPointConfigurationBuilder.java Mon Feb 27 02:51:10 2006
@@ -114,7 +114,8 @@
WebServiceBinding wsBinding=(WebServiceBinding)entryPoint.getBindings().get(0);
- WebServiceEntryPointRuntimeConfiguration config = new WebServiceEntryPointRuntimeConfiguration(entryPoint.getName(), parentContext, messageFactory);
+ WebServiceEntryPointRuntimeConfiguration config = new WebServiceEntryPointRuntimeConfiguration(entryPoint.getName(), entryPoint.getConfiguredService()
+ .getService().getName(), messageFactory);
ConfiguredService configuredService = entryPoint.getConfiguredService();
Service service = configuredService.getService();
Modified: incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/config/WebServiceEntryPointRuntimeConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/config/WebServiceEntryPointRuntimeConfiguration.java?rev=381314&r1=381313&r2=381314&view=diff
==============================================================================
--- incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/config/WebServiceEntryPointRuntimeConfiguration.java (original)
+++ incubator/tuscany/java/sca/binding.axis/src/main/java/org/apache/tuscany/binding/axis/config/WebServiceEntryPointRuntimeConfiguration.java Mon Feb 27 02:51:10 2006
@@ -13,8 +13,7 @@
*/
package org.apache.tuscany.binding.axis.config;
-import org.apache.tuscany.core.builder.impl.BaseEntryPointRuntimeConfiguration;
-import org.apache.tuscany.core.context.AggregateContext;
+import org.apache.tuscany.core.builder.impl.EntryPointRuntimeConfiguration;
import org.apache.tuscany.core.message.MessageFactory;
/**
@@ -24,10 +23,10 @@
*
* @version $Rev$ $Date$
*/
-public class WebServiceEntryPointRuntimeConfiguration extends BaseEntryPointRuntimeConfiguration {
+public class WebServiceEntryPointRuntimeConfiguration extends EntryPointRuntimeConfiguration {
- public WebServiceEntryPointRuntimeConfiguration(String name, AggregateContext parentContext, MessageFactory messageFactory) {
- super(name, parentContext, messageFactory);
+ public WebServiceEntryPointRuntimeConfiguration(String name, String serviceName, MessageFactory messageFactory) {
+ super(name, serviceName, messageFactory);
}
}