You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/12/30 22:42:28 UTC
svn commit: r491325 [5/6] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/binding/
kernel/core/src/main/java/org/apache/tuscany/core/binding/local/
kernel/core/src/main/java/org/apache/tuscany/core/builder/ kernel/co...
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiBindingBuilder.java Sat Dec 30 13:42:22 2006
@@ -20,7 +20,7 @@
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -46,12 +46,13 @@
return OSGiBindingDefinition.class;
}
- public Service build(CompositeComponent parent,
- BoundServiceDefinition<OSGiBindingDefinition> boundServiceDefinition,
- DeploymentContext deploymentContext) {
+ public ServiceBinding build(CompositeComponent parent,
+ BoundServiceDefinition boundServiceDefinition,
+ OSGiBindingDefinition bindingDefinition,
+ DeploymentContext deploymentContext) {
String name = boundServiceDefinition.getName();
- String osgiServiceName = boundServiceDefinition.getBinding().getService();
- return new OSGiService(name, parent, wireService, osgiServiceName, host);
+ String osgiServiceName = bindingDefinition.getService();
+ return new OSGiServiceBinding(name, parent, wireService, osgiServiceName, host);
}
public OSGiReference build(CompositeComponent parent,
@@ -61,7 +62,7 @@
return new OSGiReference(name, parent);
}
- protected Class<? extends Object> getServiceInterface(BoundServiceDefinition<OSGiBindingDefinition> boundServiceDefinition) {
+ protected Class<? extends Object> getServiceInterface(BoundServiceDefinition boundServiceDefinition) {
return boundServiceDefinition.getServiceContract().getInterfaceClass();
}
Modified: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiInvoker.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiInvoker.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiInvoker.java Sat Dec 30 13:42:22 2006
@@ -73,7 +73,7 @@
return false;
}
- // FIXME I think we can always have this cacheable as OSGi services are thread-safe
+ // FIXME I think we can always have this cacheable as OSGi serviceBindings are thread-safe
public void setCacheable(boolean cacheable) {
}
}
Copied: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java (from r490460, incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java?view=diff&rev=491325&p1=incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java&r1=490460&p2=incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiService.java (original)
+++ incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java Sat Dec 30 13:42:22 2006
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.SCAObjectStartException;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
import org.apache.tuscany.spi.wire.WireService;
import org.apache.tuscany.osgi.OSGiHost;
@@ -32,7 +32,7 @@
/**
* @version $Rev$ $Date$
*/
-public class OSGiService extends ServiceExtension {
+public class OSGiServiceBinding extends ServiceBindingExtension {
private final String osgiServiceName;
//private final Class<? extends Object> service;
private OSGiHost host;
@@ -47,7 +47,7 @@
* @param osgiServiceName the name to publish the service as to the OSGi hose
* @param host the OSGi host
*/
- public OSGiService(String name,
+ public OSGiServiceBinding(String name,
CompositeComponent parent,
WireService wireService,
String osgiServiceName,
Propchange: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/tuscany/java/sca/runtime/osgi/src/main/java/org/apache/tuscany/osgi/binding/OSGiServiceBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/resources/META-INF/tuscany/system.scdl?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/resources/META-INF/tuscany/system.scdl Sat Dec 30 13:42:22 2006
@@ -130,7 +130,7 @@
<property name="poolSize">10</property>
</component>
- <component name="workScheduler">
+ <component name="workSchCompositeContextImplTestCaseeduler">
<system:implementation.system class="org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler"/>
</component>
@@ -146,6 +146,15 @@
<component name="directoryScanExtender" initLevel="90">
<system:implementation.system class="org.apache.tuscany.runtime.standalone.host.DirectoryScanExtender"/>
<property name="path">extensions</property>
+ </component>
+
+ <!-- the local binding -->
+ <component name="localBindingLoader">
+ <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingLoader"/>
+ </component>
+
+ <component name="localBindingBuilder">
+ <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingBuilder"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl Sat Dec 30 13:42:22 2006
@@ -159,4 +159,14 @@
<component name="wireLoader">
<system:implementation.system class="org.apache.tuscany.core.loader.WireLoader"/>
</component>
+
+ <!-- the local binding -->
+ <component name="localBindingLoader">
+ <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingLoader"/>
+ </component>
+
+ <component name="localBindingBuilder">
+ <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingBuilder"/>
+ </component>
+
</composite>
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java Sat Dec 30 13:42:22 2006
@@ -21,17 +21,11 @@
import javax.wsdl.Port;
import javax.wsdl.PortType;
-import org.apache.axiom.om.OMElement;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.tuscany.binding.axis2.util.TuscanyAxisConfigurator;
-import org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospector;
-import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
@@ -42,10 +36,17 @@
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.IncompatibleServiceContractException;
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.tuscany.binding.axis2.util.TuscanyAxisConfigurator;
+import org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospector;
+import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
+
/**
* Builds a {@link org.osoa.sca.annotations.Service} or {@link org.apache.tuscany.spi.component.Reference} configured
* with the Axis2 binding
- *
+ *
* @version $Rev$ $Date$
*/
public class Axis2BindingBuilder extends BindingBuilderExtension<WebServiceBindingDefinition> {
@@ -56,7 +57,7 @@
private ConfigurationContext configContext;
private InterfaceWSDLIntrospector introspector;
-
+
private WorkContext workContext;
public Axis2BindingBuilder() throws BuilderConfigException {
@@ -75,20 +76,18 @@
public void setIntrospector(InterfaceWSDLIntrospector introspector) {
this.introspector = introspector;
}
-
+
@Autowire
public void setWorkContext(WorkContext workContext) {
this.workContext = workContext;
}
-
-
-
+
@SuppressWarnings("unchecked")
- public Service build(
- CompositeComponent parent,
- BoundServiceDefinition<WebServiceBindingDefinition> serviceDefinition,
- DeploymentContext deploymentContext) {
+ public ServiceBinding build(
+ CompositeComponent parent,
+ BoundServiceDefinition serviceDefinition,
+ WebServiceBindingDefinition wsBinding, DeploymentContext deploymentContext) {
try {
// Set the default databinding
@@ -98,22 +97,21 @@
}
// FIXME: We need to define how the WSDL PortType is honored in the case that
- // both the binding.ws and interface.wsdl are in place.
+ // both the service.ws and interface.wsdl are in place.
// The WSDL portType from the WSDL Port decides the incoming SOAP message format
// There are also cases that interface.java is used.
-
- ServiceContract<?> inboundContract = null;
- WebServiceBindingDefinition wsBinding = serviceDefinition.getBinding();
+
+ ServiceContract<?> inboundContract;
Port port = wsBinding.getWSDLPort();
if (port == null) {
- // FIXME: [rfeng] No WSDL is referenced by binding.ws, we need to create one from
+ // FIXME: [rfeng] No WSDL is referenced by service.ws, we need to create one from
// the outbound service contract if it's JavaServiceContract
inboundContract = outboundContract;
- }
-
+ }
+
PortType portType = wsBinding.getWSDLPort().getBinding().getPortType();
inboundContract = introspector.introspect(portType);
-
+
// FIXME:
inboundContract.setInterfaceClass(serviceDefinition.getServiceContract().getInterfaceClass());
inboundContract.setDataBinding(OM_DATA_BINDING);
@@ -124,13 +122,14 @@
} catch (IncompatibleServiceContractException e) {
throw new Axis2BindingBuilderRuntimeException(e);
}
-
- Service service = new Axis2Service(serviceDefinition.getName(), outboundContract, parent, wsBinding,
+
+ ServiceBinding serviceBinding =
+ new Axis2ServiceBinding(serviceDefinition.getName(), outboundContract, parent, wsBinding,
servletHost, configContext, workContext);
- service.setBindingServiceContract(inboundContract);
-
- return service;
-
+ serviceBinding.setBindingServiceContract(inboundContract);
+
+ return serviceBinding;
+
} catch (InvalidServiceContractException e) {
throw new Axis2BindingBuilderRuntimeException(e);
}
@@ -138,9 +137,9 @@
@SuppressWarnings("unchecked")
public Reference build(
- CompositeComponent parent,
- BoundReferenceDefinition<WebServiceBindingDefinition> boundReferenceDefinition,
- DeploymentContext deploymentContext) {
+ CompositeComponent parent,
+ BoundReferenceDefinition<WebServiceBindingDefinition> boundReferenceDefinition,
+ DeploymentContext deploymentContext) {
try {
// Set the default binding
@@ -148,7 +147,7 @@
if (WSDLServiceContract.class.isInstance(inboundContract)) {
inboundContract.setDataBinding(OM_DATA_BINDING);
}
-
+
// FIXME: We need to define how the WSDL PortType is honored in the case that
// both the binding.ws and interface.wsdl are in place
// The WSDL portType from the WSDL Port decides the incoming SOAP message format
@@ -163,24 +162,24 @@
}
PortType portType = port.getBinding().getPortType();
outboundContract = introspector.introspect(portType);
-
+
// Set the default databinding
outboundContract.setDataBinding(OM_DATA_BINDING);
//FIXME ... need to figure out how to specify scope on wsdl.
- outboundContract.setInteractionScope(inboundContract.getInteractionScope());
-
+ outboundContract.setInteractionScope(inboundContract.getInteractionScope());
+
try {
wireService.checkCompatibility(inboundContract, outboundContract, true);
} catch (IncompatibleServiceContractException e) {
throw new Axis2BindingBuilderRuntimeException(e);
}
-
+
Reference reference = new Axis2Reference(boundReferenceDefinition.getName(), parent, wsBinding,
- inboundContract, workContext);
+ inboundContract, workContext);
reference.setBindingServiceContract(outboundContract);
-
+
return reference;
-
+
} catch (InvalidServiceContractException e) {
throw new Axis2BindingBuilderRuntimeException(e);
}
Copied: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java (from r490475, incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java?view=diff&rev=491325&p1=incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java&r1=490475&p2=incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Service.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java Sat Dec 30 13:42:22 2006
@@ -37,7 +37,7 @@
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
import org.apache.tuscany.spi.host.ServletHost;
import org.apache.tuscany.spi.model.InteractionScope;
import org.apache.tuscany.spi.model.Scope;
@@ -65,11 +65,11 @@
// org.apache.tuscany.spi.model
/**
- * An implementation of a {@link ServiceExtension} configured with the Axis2 binding
+ * An implementation of a {@link ServiceBindingExtension} configured with the Axis2 binding
*
* @version $Rev$ $Date$
*/
-public class Axis2Service extends ServiceExtension {
+public class Axis2ServiceBinding extends ServiceBindingExtension {
private ServiceContract<?> serviceContract;
private ServletHost servletHost;
@@ -88,7 +88,7 @@
private Set<String> seenConversations = Collections.synchronizedSet(new HashSet<String>());
- public Axis2Service(String theName,
+ public Axis2ServiceBinding(String theName,
ServiceContract<?> serviceContract,
CompositeComponent parent,
WebServiceBindingDefinition binding,
Propchange: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceCallbackTargetInvoker.java Sat Dec 30 13:42:22 2006
@@ -31,13 +31,13 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.util.Utils;
-import org.apache.tuscany.binding.axis2.Axis2Service.InvocationContext;
+import org.apache.tuscany.binding.axis2.Axis2ServiceBinding.InvocationContext;
public class Axis2ServiceCallbackTargetInvoker implements TargetInvoker {
- private Axis2Service service;
+ private Axis2ServiceBinding service;
- public Axis2ServiceCallbackTargetInvoker(Axis2Service service) {
+ public Axis2ServiceCallbackTargetInvoker(Axis2ServiceBinding service) {
this.service = service;
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInMessageReceiver.java Sat Dec 30 13:42:22 2006
@@ -31,9 +31,9 @@
protected Operation<?> operation;
- private Axis2Service axis2Service;
+ private Axis2ServiceBinding axis2Service;
- public Axis2ServiceInMessageReceiver(Axis2Service service, Operation<?> operation) {
+ public Axis2ServiceInMessageReceiver(Axis2ServiceBinding service, Operation<?> operation) {
this.axis2Service = service;
this.operation = operation;
}
@@ -47,7 +47,7 @@
try {
OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement();
Object[] args = new Object[] {requestOM};
- String conversationID = axis2Service.isConversational() ? Axis2Service.getConversationID(inMC) : null;
+ String conversationID = axis2Service.isConversational() ? Axis2ServiceBinding.getConversationID(inMC) : null;
axis2Service.invokeTarget(operation, args, null, conversationID);
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutAsyncMessageReceiver.java Sat Dec 30 13:42:22 2006
@@ -25,7 +25,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.receivers.AbstractMessageReceiver;
-import org.apache.tuscany.binding.axis2.Axis2Service.InvocationContext;
+import org.apache.tuscany.binding.axis2.Axis2ServiceBinding.InvocationContext;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.MessageId;
@@ -34,9 +34,9 @@
private Operation<?> operation;
- private Axis2Service service;
+ private Axis2ServiceBinding service;
- public Axis2ServiceInOutAsyncMessageReceiver(Axis2Service service,
+ public Axis2ServiceInOutAsyncMessageReceiver(Axis2ServiceBinding service,
Operation operation) {
this.operation = operation;
this.service = service;
@@ -75,7 +75,7 @@
try {
OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement();
Object[] args = new Object[] {requestOM};
- String conversationID = service.isConversational() ? Axis2Service.getConversationID(inMC) : null;
+ String conversationID = service.isConversational() ? Axis2ServiceBinding.getConversationID(inMC) : null;
service.invokeTarget(operation, args, messageId, conversationID);
} catch (InvocationTargetException e) {
Throwable t = e.getCause();
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceInOutSyncMessageReceiver.java Sat Dec 30 13:42:22 2006
@@ -33,9 +33,9 @@
protected Operation<?> operation;
- private Axis2Service axis2Service;
+ private Axis2ServiceBinding axis2Service;
- public Axis2ServiceInOutSyncMessageReceiver(Axis2Service service, Operation<?> operation) {
+ public Axis2ServiceInOutSyncMessageReceiver(Axis2ServiceBinding service, Operation<?> operation) {
this.axis2Service = service;
this.operation = operation;
}
@@ -50,7 +50,7 @@
OMElement requestOM = inMC.getEnvelope().getBody().getFirstElement();
Object[] args = new Object[] {requestOM};
- String conversationID = axis2Service.isConversational() ? Axis2Service.getConversationID(inMC) : null;
+ String conversationID = axis2Service.isConversational() ? Axis2ServiceBinding.getConversationID(inMC) : null;
OMElement responseOM = (OMElement)axis2Service.invokeTarget(operation, args, null, conversationID);
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ReferenceTestCase.java Sat Dec 30 13:42:22 2006
@@ -56,7 +56,7 @@
public void testAsyncTargetInvoker() throws Exception {
Axis2Reference axis2Reference = createAxis2Reference("testWebAppName", "testServiceName");
- //Create a mocked InboundWire, make the call of ServiceExtension.getInterface() returns a Class
+ //Create a mocked InboundWire, make the call of ServiceBindingExtension.getInterface() returns a Class
InboundWire inboundWire = EasyMock.createNiceMock(InboundWire.class);
JavaServiceContract contract = new JavaServiceContract(Greeter.class);
contract.setCallbackName("");
@@ -91,7 +91,7 @@
"SOAPService"));
Port port = wsdlService.getPort("SoapPort");
WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
- //Create a mocked WireService, make the call of ServiceExtension.getServiceInstance() returns a proxy instance.
+ //Create a mocked WireService, make the call of ServiceBindingExtension.getServiceInstance() returns a proxy instance.
WireService wireService = EasyMock.createNiceMock(WireService.class);
EasyMock.replay(wireService);
CompositeComponent parent = EasyMock.createNiceMock(CompositeComponent.class);
Modified: incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/Axis2ServiceTestCase.java Sat Dec 30 13:42:22 2006
@@ -51,11 +51,11 @@
public void testInvokeService() throws Exception {
TestServletHost tomcatHost = new TestServletHost();
- Axis2Service axis2Service = createAxis2Service("testServiceName", tomcatHost, false);
+ Axis2ServiceBinding axis2Service = createAxis2Service("testServiceName", tomcatHost, false);
axis2Service.start();
if (true) return;
- Servlet servlet = tomcatHost.getMapping("testWebAppName/services/testServiceName");
+ Servlet servlet = tomcatHost.getMapping("testWebAppName/serviceBindings/testServiceName");
assertNotNull(servlet);
//Create mocked HttpRequest and HttpResponse object to test the Axis2Servlet
@@ -66,11 +66,11 @@
public void testAsyncMessageReceiver() throws Exception {
TestServletHost tomcatHost = new TestServletHost();
- Axis2Service axis2Service = createAxis2Service("testServiceName", tomcatHost, true);
+ Axis2ServiceBinding axis2Service = createAxis2Service("testServiceName", tomcatHost, true);
axis2Service.start();
}
- private Axis2Service createAxis2Service(String serviceName, ServletHost tomcatHost, boolean callback)
+ private Axis2ServiceBinding createAxis2Service(String serviceName, ServletHost tomcatHost, boolean callback)
throws Exception {
//Create WebServiceBindingDefinition
String wsdlLocation = "/wsdl/hello_world_doc_lit.wsdl";
@@ -87,13 +87,13 @@
Port port = wsdlService.getPort("SoapPort");
WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
- //Create a mocked WireService, make the call of ServiceExtension.getServiceInstance() returns a proxy instance.
+ //Create a mocked WireService, make the call of ServiceBindingExtension.getServiceInstance() returns a proxy instance.
WireService wireService = EasyMock.createNiceMock(WireService.class);
wireService.createProxy(EasyMock.isA(Class.class), EasyMock.isA(InboundWire.class));
EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(wireService);
- //Create a mocked InboundWire, make the call of ServiceExtension.getInterface() returns a Class
+ //Create a mocked InboundWire, make the call of ServiceBindingExtension.getInterface() returns a Class
InboundWire inboundWire = EasyMock.createNiceMock(InboundWire.class);
JavaServiceContract contract = new JavaServiceContract(Greeter.class);
Map<String, Operation<Type>> opMap = new HashMap<String, Operation<Type>>();
@@ -114,8 +114,8 @@
TuscanyAxisConfigurator tuscanyAxisConfigurator = new TuscanyAxisConfigurator();
ConfigurationContext configurationContext = tuscanyAxisConfigurator.getConfigurationContext();
- Axis2Service axis2Service =
- new Axis2Service(serviceName,
+ Axis2ServiceBinding axis2Service =
+ new Axis2ServiceBinding(serviceName,
contract,
null,
wsBinding,
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java Sat Dec 30 13:42:22 2006
@@ -23,7 +23,7 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -34,7 +34,7 @@
import org.objectweb.celtix.Bus;
/**
- * Builds a {@link org.apache.tuscany.spi.component.Service} or {@link org.apache.tuscany.spi.component.Reference}
+ * Builds a {@link org.apache.tuscany.spi.component.ServiceBinding} or {@link org.apache.tuscany.spi.component.Reference}
* configured with the Celtix binding
*
* @version $Rev$ $Date$
@@ -43,21 +43,21 @@
private Bus bus;
- public Service build(CompositeComponent parent,
- BoundServiceDefinition<WebServiceBindingDefinition> boundServiceDefinition,
- DeploymentContext deploymentContext) {
- WebServiceBindingDefinition wsBinding = boundServiceDefinition.getBinding();
+ public ServiceBinding build(CompositeComponent parent,
+ BoundServiceDefinition boundServiceDefinition,
+ WebServiceBindingDefinition bindingDefinition,
+ DeploymentContext deploymentContext) {
TypeHelper typeHelper = (TypeHelper) deploymentContext.getExtension(TypeHelper.class.getName());
if (typeHelper == null) {
typeHelper = TypeHelper.INSTANCE;
}
if (bus == null) {
- bus = getBus(wsBinding.getWSDLDefinitionRegistry());
+ bus = getBus(bindingDefinition.getWSDLDefinitionRegistry());
}
- return new CeltixService(
+ return new CeltixServiceBinding(
boundServiceDefinition.getName(),
parent,
- wsBinding,
+ bindingDefinition,
bus,
typeHelper);
}
Copied: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceBinding.java (from r490475, incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceBinding.java?view=diff&rev=491325&p1=incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java&r1=490475&p2=incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceBinding.java&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceBinding.java Sat Dec 30 13:42:22 2006
@@ -41,7 +41,7 @@
import org.apache.tuscany.spi.CoreRuntimeException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
import commonj.sdo.helper.TypeHelper;
import org.apache.tuscany.binding.celtix.io.SCAServerDataBindingCallback;
@@ -65,7 +65,7 @@
*
* @version $Rev$ $Date$
*/
-public class CeltixService extends ServiceExtension implements ServerBindingEndpointCallback {
+public class CeltixServiceBinding extends ServiceBindingExtension implements ServerBindingEndpointCallback {
private Bus bus;
private Port port;
@@ -78,7 +78,7 @@
new ConcurrentHashMap<QName, ServerDataBindingCallback>();
- public CeltixService(String theName,
+ public CeltixServiceBinding(String theName,
CompositeComponent parent,
WebServiceBindingDefinition binding,
Bus bus,
Propchange: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceInitException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceInitException.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceInitException.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixServiceInitException.java Sat Dec 30 13:42:22 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.spi.CoreRuntimeException;
/**
- * Denotes an exception starting a {@link CeltixService} instance
+ * Denotes an exception starting a {@link CeltixServiceBinding} instance
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/test/java/org/apache/tuscany/binding/celtix/CeltixServiceTestCase.java Sat Dec 30 13:42:22 2006
@@ -58,7 +58,7 @@
public class CeltixServiceTestCase extends TestCase {
public void testGetDataBindingCallback() throws Exception {
- CeltixService celtixService = createCeltixService();
+ CeltixServiceBinding celtixService = createCeltixService();
Message msg = new MessageImpl();
msg.setBody("Hello Celtix");
Interceptor interceptor = EasyMock.createMock(Interceptor.class);
@@ -87,7 +87,7 @@
}
@SuppressWarnings({"unchecked"})
- private CeltixService createCeltixService() throws Exception {
+ private CeltixServiceBinding createCeltixService() throws Exception {
//Make following call to return a mocked SOAPClientBinding:
//bus.getBindingManager().getBindingFactory(bindingId).createClientBinding(reference)
SOAPServerBinding serverBinding = EasyMock.createMock(SOAPServerBinding.class);
@@ -129,20 +129,20 @@
WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
- //Create mocked InboundWire, for ServiceExtension.getInterface()
+ //Create mocked InboundWire, for ServiceBindingExtension.getInterface()
InboundWire inboundWire = EasyMock.createNiceMock(InboundWire.class);
JavaServiceContract contract = new JavaServiceContract(Greeter.class);
EasyMock.expect(inboundWire.getServiceContract()).andReturn(contract).anyTimes();
EasyMock.replay(inboundWire);
- //Create mocked WireService, for ServiceExtension.getServiceInstance()
+ //Create mocked WireService, for ServiceBindingExtension.getServiceInstance()
WireService wireService = EasyMock.createNiceMock(WireService.class);
wireService.createProxy(EasyMock.isA(Class.class), EasyMock.isA(InboundWire.class));
EasyMock.expectLastCall().andReturn(new GreeterImpl()).anyTimes();
EasyMock.replay(wireService);
- CeltixService celtixService = new CeltixService("name", null, wsBinding, bus, null);
- //Not sure how InboundWire is set to CeltixService, is the following way correct?
+ CeltixServiceBinding celtixService = new CeltixServiceBinding("name", null, wsBinding, bus, null);
+ //Not sure how InboundWire is set to CeltixServiceBinding, is the following way correct?
celtixService.setInboundWire(inboundWire);
celtixService.start();
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java Sat Dec 30 13:42:22 2006
@@ -18,23 +18,23 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-
import javax.jms.Destination;
import javax.naming.NamingException;
-import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ServiceContract;
+import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.idl.wsdl.WSDLServiceContract;
+
/**
* Builds a Service or Reference for JMS binding.
- *
+ *
* @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
*/
@@ -49,11 +49,11 @@
return JMSBindingDefinition.class;
}
- public Service build(CompositeComponent parent,
- BoundServiceDefinition<JMSBindingDefinition> serviceDefinition,
- DeploymentContext deploymentContext) {
+ public ServiceBinding build(CompositeComponent parent,
+ BoundServiceDefinition serviceDefinition,
+ JMSBindingDefinition jmsBinding,
+ DeploymentContext deploymentContext) {
- JMSBindingDefinition jmsBinding = serviceDefinition.getBinding();
Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
ServiceContract serviceContract = serviceDefinition.getServiceContract();
@@ -70,23 +70,23 @@
OperationAndDataBinding responseODB =
getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
- Service service =
- new JMSService(serviceDefinition.getName(), parent, jmsBinding, jmsResourceFactory,
- requestODB, responseODB, interfaze);
- service.setBindingServiceContract(serviceContract);
+ ServiceBinding serviceBinding =
+ new JMSServiceBinding(serviceDefinition.getName(), parent, jmsBinding, jmsResourceFactory,
+ requestODB, responseODB, interfaze);
+ serviceBinding.setBindingServiceContract(serviceContract);
- return service;
+ return serviceBinding;
}
public JMSReference build(CompositeComponent parent,
- BoundReferenceDefinition<JMSBindingDefinition> referenceDefinition,
- DeploymentContext deploymentContext) {
+ BoundReferenceDefinition<JMSBindingDefinition> referenceDefinition,
+ DeploymentContext deploymentContext) {
String name = referenceDefinition.getName();
Class<?> interfaze = referenceDefinition.getServiceContract().getInterfaceClass();
ServiceContract serviceContract;
try {
- serviceContract = (ServiceContract)referenceDefinition.getServiceContract().clone();
+ serviceContract = (ServiceContract) referenceDefinition.getServiceContract().clone();
} catch (CloneNotSupportedException e) {
throw new JMSBindingException("Couldn't clone the Service Contract", e);
}
@@ -113,7 +113,7 @@
JMSReference reference =
new JMSReference(name, parent, jmsBinding, jmsResourceFactory, requestODB, responseODB,
- requestDest, replyDest);
+ requestDest, replyDest);
reference.setBindingServiceContract(serviceContract);
return reference;
@@ -124,8 +124,8 @@
if (className != null && !className.equals("")) {
try {
Class factoryClass = Class.forName(className != null ? className : DEFAULT_JMS_RESOURCE_FACTORY);
- Constructor constructor = factoryClass.getDeclaredConstructor(new Class[] {JMSBindingDefinition.class});
- return (JMSResourceFactory)constructor.newInstance(jmsBinding);
+ Constructor constructor = factoryClass.getDeclaredConstructor(new Class[]{JMSBindingDefinition.class});
+ return (JMSResourceFactory) constructor.newInstance(jmsBinding);
} catch (ClassNotFoundException e) {
throw new JMSBindingException("Error loading the JMSResourceFactory", e);
} catch (SecurityException e) {
@@ -147,19 +147,22 @@
}
- protected OperationAndDataBinding getRequestOperationAndDatabinding(JMSBindingDefinition jmsBinding, ClassLoader cl) {
+ protected OperationAndDataBinding getRequestOperationAndDatabinding(JMSBindingDefinition jmsBinding,
+ ClassLoader cl) {
String className = jmsBinding.getRequestOperationAndDatabindingName();
OperationAndDataBinding operationAndDataBinding = instantiateClass(jmsBinding, cl, className);
return operationAndDataBinding;
}
- protected OperationAndDataBinding getResponseOperationAndDatabinding(JMSBindingDefinition jmsBinding, ClassLoader cl) {
+ protected OperationAndDataBinding getResponseOperationAndDatabinding(JMSBindingDefinition jmsBinding,
+ ClassLoader cl) {
String className = jmsBinding.getResponseOperationAndDatabindingName();
OperationAndDataBinding operationAndDataBinding = instantiateClass(jmsBinding, cl, className);
return operationAndDataBinding;
}
- protected OperationAndDataBinding instantiateClass(JMSBindingDefinition jmsBinding, ClassLoader cl, String className) {
+ protected OperationAndDataBinding instantiateClass(JMSBindingDefinition jmsBinding, ClassLoader cl,
+ String className) {
OperationAndDataBinding operationAndDataBinding;
if (cl == null) {
cl = this.getClass().getClassLoader();
@@ -171,8 +174,8 @@
} catch (ClassNotFoundException e) {
clazz = this.getClass().getClassLoader().loadClass(className);
}
- Constructor constructor = clazz.getDeclaredConstructor(new Class[] {JMSBindingDefinition.class});
- operationAndDataBinding = (OperationAndDataBinding)constructor.newInstance(jmsBinding);
+ Constructor constructor = clazz.getDeclaredConstructor(new Class[]{JMSBindingDefinition.class});
+ operationAndDataBinding = (OperationAndDataBinding) constructor.newInstance(jmsBinding);
} catch (Throwable e) {
throw new JMSBindingException("Exception instantiating OperationAndDataBinding class", e);
Copied: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java (from r490475, incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java?view=diff&rev=491325&p1=incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java&r1=490475&p2=incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java Sat Dec 30 13:42:22 2006
@@ -25,12 +25,12 @@
import javax.naming.NamingException;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
/**
* @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
*/
-public class JMSService extends ServiceExtension {
+public class JMSServiceBinding extends ServiceBindingExtension {
private JMSBindingDefinition jmsBinding;
private JMSResourceFactory jmsResourceFactory;
@@ -38,7 +38,7 @@
protected OperationAndDataBinding requestOperationAndDataBinding;
protected OperationAndDataBinding responseOperationAndDataBinding;
- public JMSService(String name,
+ public JMSServiceBinding(String name,
CompositeComponent parent,
JMSBindingDefinition jmsBinding,
JMSResourceFactory jmsResourceFactory,
@@ -58,7 +58,7 @@
try {
registerListerner();
} catch (Exception e) {
- throw new JMSBindingException("Error starting JMSService", e);
+ throw new JMSBindingException("Error starting JMSServiceBinding", e);
}
}
@@ -68,7 +68,7 @@
consumer.close();
jmsResourceFactory.closeConnection();
} catch (Exception e) {
- throw new JMSBindingException("Error stopping JMSService", e);
+ throw new JMSBindingException("Error stopping JMSServiceBinding", e);
}
super.stop();
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSServiceBinding.java
------------------------------------------------------------------------------
--- svn:ignores (added)
+++ svn:ignores Sat Dec 30 13:42:22 2006
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilder.java Sat Dec 30 13:42:22 2006
@@ -20,7 +20,7 @@
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.host.ServletHost;
@@ -57,12 +57,10 @@
}
@SuppressWarnings("unchecked")
- public Service build(CompositeComponent parent,
- BoundServiceDefinition<JSONRPCBindingDefinition> serviceDefinition,
- DeploymentContext deploymentContext) {
- Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
-
- return new JSONRPCService(serviceDefinition.getName(), parent, this.wireService, servletHost);
+ public ServiceBinding build(CompositeComponent parent,
+ BoundServiceDefinition serviceDefinition,
+ JSONRPCBindingDefinition bindingDefinition, DeploymentContext deploymentContext) {
+ return new JSONRPCServiceBinding(serviceDefinition.getName(), parent, this.wireService, servletHost);
}
}
Copied: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java (from r490460, incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java?view=diff&rev=491325&p1=incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCService.java&r1=490460&p2=incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java Sat Dec 30 13:42:22 2006
@@ -21,14 +21,14 @@
import org.osoa.sca.annotations.Destroy;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
import org.apache.tuscany.spi.host.ServletHost;
import org.apache.tuscany.spi.wire.WireService;
/**
* @version $Rev$ $Date$
*/
-public class JSONRPCService extends ServiceExtension {
+public class JSONRPCServiceBinding extends ServiceBindingExtension {
private static int servletRegistrationCount = 0;
@@ -38,7 +38,7 @@
public static final String SCRIPT_GETTER_SERVICE_MAPPING = "/SCA/scripts";
- public JSONRPCService(String theName, CompositeComponent parent, WireService wireService, ServletHost servletHost) {
+ public JSONRPCServiceBinding(String theName, CompositeComponent parent, WireService wireService, ServletHost servletHost) {
super(theName, parent);
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/ScriptGetterServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/ScriptGetterServlet.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/ScriptGetterServlet.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/ScriptGetterServlet.java Sat Dec 30 13:42:22 2006
@@ -31,7 +31,7 @@
private static final long serialVersionUID = 1L;
- // private static final String SCA_INIT_JS = "SCA = new JSONRpcClient(\"services/HelloWorldService\");";
+ // private static final String SCA_INIT_JS = "SCA = new JSONRpcClient(\"serviceBindings/HelloWorldService\");";
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
URL url = getClass().getResource("jsonrpc.js");
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingBuilderTestCase.java Sat Dec 30 13:42:22 2006
@@ -52,11 +52,10 @@
JSONRPCBindingBuilder bindingBuilder = new JSONRPCBindingBuilder();
CompositeComponent mockParent = createMock(CompositeComponent.class);
replay(mockParent);
- BoundServiceDefinition<JSONRPCBindingDefinition> mockServiceDefinition =
- createMock((new BoundServiceDefinition<JSONRPCBindingDefinition>()).getClass());
+ BoundServiceDefinition mockServiceDefinition = createMock((new BoundServiceDefinition()).getClass());
JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
try {
- ServiceContract<?> contract = registry.introspect(JSONRPCService.class);
+ ServiceContract<?> contract = registry.introspect(JSONRPCServiceBinding.class);
expect(mockServiceDefinition.getServiceContract()).andStubReturn(contract);
expect(mockServiceDefinition.getName()).andReturn("test_service");
@@ -64,9 +63,10 @@
DeploymentContext mockDeploymentContext = createMock(DeploymentContext.class);
replay(mockDeploymentContext);
- JSONRPCService jsonService =
- (JSONRPCService) bindingBuilder.build(mockParent, mockServiceDefinition, mockDeploymentContext);
- assertEquals(JSONRPCService.class, jsonService.getClass());
+ JSONRPCServiceBinding jsonService =
+ (JSONRPCServiceBinding) bindingBuilder.build(mockParent, mockServiceDefinition, null,
+ mockDeploymentContext);
+ assertEquals(JSONRPCServiceBinding.class, jsonService.getClass());
} catch (InvalidServiceContractException e) {
// TODO Auto-generated catch block
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCServiceTestCase.java Sat Dec 30 13:42:22 2006
@@ -42,15 +42,15 @@
expect(mockWireService.createProxy(EasyMock.isA(Class.class), EasyMock.isA(InboundWire.class))).andReturn(this);
replay(mockWireService);
ServletHost mockServletHost = createMock(ServletHost.class);
- expect(mockServletHost.isMappingRegistered(JSONRPCService.SCRIPT_GETTER_SERVICE_MAPPING)).andReturn(false);
+ expect(mockServletHost.isMappingRegistered(JSONRPCServiceBinding.SCRIPT_GETTER_SERVICE_MAPPING)).andReturn(false);
mockServletHost.registerMapping(eq("/" + SERVICE_NAME), (Servlet) notNull());
- mockServletHost.registerMapping(eq(JSONRPCService.SCRIPT_GETTER_SERVICE_MAPPING), (Servlet) notNull());
+ mockServletHost.registerMapping(eq(JSONRPCServiceBinding.SCRIPT_GETTER_SERVICE_MAPPING), (Servlet) notNull());
replay(mockServletHost);
ServiceContract contract = new ServiceContract(Object.class){
};
- JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
+ JSONRPCServiceBinding jsonRpcService = new JSONRPCServiceBinding(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
InboundWire wire = EasyMock.createNiceMock(InboundWire.class);
EasyMock.expect(wire.getServiceContract()).andReturn(contract);
EasyMock.replay(wire);
@@ -66,17 +66,17 @@
expect(mockWireService.createProxy(EasyMock.isA(Class.class), EasyMock.isA(InboundWire.class))).andReturn(this);
replay(mockWireService);
ServletHost mockServletHost = createMock(ServletHost.class);
- expect(mockServletHost.isMappingRegistered(JSONRPCService.SCRIPT_GETTER_SERVICE_MAPPING)).andReturn(false);
+ expect(mockServletHost.isMappingRegistered(JSONRPCServiceBinding.SCRIPT_GETTER_SERVICE_MAPPING)).andReturn(false);
mockServletHost.registerMapping(eq("/" + SERVICE_NAME), (Servlet) notNull());
- mockServletHost.registerMapping(eq(JSONRPCService.SCRIPT_GETTER_SERVICE_MAPPING), (Servlet) notNull());
+ mockServletHost.registerMapping(eq(JSONRPCServiceBinding.SCRIPT_GETTER_SERVICE_MAPPING), (Servlet) notNull());
expect(mockServletHost.unregisterMapping(eq("/" + SERVICE_NAME))).andReturn(null);
- expect(mockServletHost.unregisterMapping(eq(JSONRPCService.SCRIPT_GETTER_SERVICE_MAPPING))).andReturn(null);
+ expect(mockServletHost.unregisterMapping(eq(JSONRPCServiceBinding.SCRIPT_GETTER_SERVICE_MAPPING))).andReturn(null);
replay(mockServletHost);
ServiceContract contract = new ServiceContract(Object.class){
};
- JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
+ JSONRPCServiceBinding jsonRpcService = new JSONRPCServiceBinding(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
InboundWire wire = EasyMock.createNiceMock(InboundWire.class);
EasyMock.expect(wire.getServiceContract()).andReturn(contract);
EasyMock.replay(wire);
@@ -93,7 +93,7 @@
ServletHost mockServletHost = createMock(ServletHost.class);
replay(mockServletHost);
- JSONRPCService jsonRpcService = new JSONRPCService(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
+ JSONRPCServiceBinding jsonRpcService = new JSONRPCServiceBinding(SERVICE_NAME, mockParent, mockWireService, mockServletHost );
assertNotNull(jsonRpcService);
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java Sat Dec 30 13:42:22 2006
@@ -18,16 +18,18 @@
import java.rmi.Remote;
-import org.apache.tuscany.host.rmi.RMIHost;
+import org.osoa.sca.annotations.Constructor;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ServiceBinding;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.BindingBuilderExtension;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
-import org.osoa.sca.annotations.Constructor;
+
+import org.apache.tuscany.host.rmi.RMIHost;
/**
* Builds a Service or Reference for an RMI binding.
@@ -49,21 +51,27 @@
}
@SuppressWarnings({"unchecked"})
- public Service build(CompositeComponent parent,
- BoundServiceDefinition<RMIBindingDefinition> boundServiceDefinition,
- DeploymentContext deploymentContext) {
+ public ServiceBinding build(CompositeComponent parent,
+ BoundServiceDefinition boundServiceDefinition,
+ RMIBindingDefinition bindingDefinition,
+ DeploymentContext deploymentContext) {
Class intf = boundServiceDefinition.getServiceContract().getInterfaceClass();
- return new RMIService<Remote>(boundServiceDefinition.getName(), parent, wireService, rmiHost,
- boundServiceDefinition.getBinding().getHost(), boundServiceDefinition.getBinding().getPort(),
- boundServiceDefinition.getBinding().getServiceName(), intf);
+ return new RMIServiceBinding<Remote>(boundServiceDefinition.getName(),
+ parent,
+ wireService,
+ rmiHost,
+ bindingDefinition.getHost(),
+ bindingDefinition.getPort(),
+ bindingDefinition.getServiceName(),
+ intf);
}
@SuppressWarnings({"unchecked"})
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition<RMIBindingDefinition> boundReferenceDefinition,
- DeploymentContext deploymentContext) {
+ BoundReferenceDefinition<RMIBindingDefinition> boundReferenceDefinition,
+ DeploymentContext deploymentContext) {
String name = boundReferenceDefinition.getName();
String host = boundReferenceDefinition.getBinding().getHost();
String port = boundReferenceDefinition.getBinding().getPort();
Copied: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIServiceBinding.java (from r490460, incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIServiceBinding.java?view=diff&rev=491325&p1=incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java&r1=490460&p2=incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIServiceBinding.java&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIServiceBinding.java Sat Dec 30 13:42:22 2006
@@ -21,7 +21,7 @@
import java.rmi.server.UnicastRemoteObject;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ServiceExtension;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
import org.apache.tuscany.spi.wire.WireService;
import net.sf.cglib.asm.ClassWriter;
@@ -34,7 +34,7 @@
/**
* @version $Rev$ $Date$
*/
-public class RMIService<T extends Remote> extends ServiceExtension {
+public class RMIServiceBinding<T extends Remote> extends ServiceBindingExtension {
public static final String URI_PREFIX = "//localhost";
public static final String SLASH = "/";
@@ -51,7 +51,7 @@
private Class serviceInterface;
private WireService wireService;
- public RMIService(String name,
+ public RMIServiceBinding(String name,
CompositeComponent parent,
WireService wireService,
RMIHost rHost,
@@ -119,7 +119,7 @@
return portNumber;
}
- // if the interface of the component whose services must be exposed as RMI Service, does not
+ // if the interface of the component whose serviceBindings must be exposed as RMI Service, does not
// implement java.rmi.Remote, then generate such an interface. This method will stop with
// just generating the bytecode. Defining the class from the byte code must tbe the responsibility
// of the caller of this method, since it requires a classloader to be created to define and load
Propchange: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIServiceBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIServiceBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java Sat Dec 30 13:42:22 2006
@@ -18,12 +18,6 @@
*/
package org.apache.tuscany.binding.rmi;
-import helloworld.HelloWorldRmiService;
-
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
import junit.framework.TestCase;
// TODO: renamed to XXX as it doesn't work for me
Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java Sat Dec 30 13:42:22 2006
@@ -22,21 +22,19 @@
import org.apache.tuscany.host.rmi.RMIHostRuntimeException;
import org.easymock.EasyMock;
-import org.apache.tuscany.spi.wire.WireInvocationHandler;
import org.apache.tuscany.spi.wire.WireService;
-import org.apache.tuscany.spi.wire.InboundWire;
public class RMIServiceTestCase extends TestCase {
@SuppressWarnings("unchecked")
public void testGetPort() {
- RMIService s = new RMIService(null, null, null, null, null, null, null, null);
+ RMIServiceBinding s = new RMIServiceBinding(null, null, null, null, null, null, null, null);
assertEquals(0, s.getPort("0"));
}
@SuppressWarnings("unchecked")
public void testGenerateRemoteInterface() {
- RMIService s = new RMIService("foo27", null, null, null, null, null, null, null);
+ RMIServiceBinding s = new RMIServiceBinding("foo27", null, null, null, null, null, null, null);
s.generateRemoteInterface(Runnable.class);
}
@@ -44,7 +42,7 @@
public void testCreateRmiService() {
WireService service = EasyMock.createNiceMock(WireService.class);
EasyMock.replay(service);
- RMIService s = new RMIService("bla023", null, service, new RMIHostImpl(), null, "9996", "bla", Runnable.class) {
+ RMIServiceBinding s = new RMIServiceBinding("bla023", null, service, new RMIHostImpl(), null, "9996", "bla", Runnable.class) {
};
s.start();
try {
Modified: incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java Sat Dec 30 13:42:22 2006
@@ -59,7 +59,7 @@
int initLevel = componentType.getInitLevel();
- // get list of services provided by this component
+ // get list of serviceBindings provided by this component
Collection<ServiceDefinition> collection = componentType.getServices().values();
List<Class<?>> services = new ArrayList<Class<?>>(collection.size());
for (ServiceDefinition serviceDefinition : collection) {
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java Sat Dec 30 13:42:22 2006
@@ -76,7 +76,7 @@
JavaScriptImplementation implementation = componentDefinition.getImplementation();
JavaScriptComponentType componentType = implementation.getComponentType();
- // get list of services provided by this component
+ // get list of serviceBindings provided by this component
Collection<ServiceDefinition> collection = componentType.getServices().values();
List<Class<?>> services = new ArrayList<Class<?>>(collection.size());
for (ServiceDefinition serviceDefinition : collection) {
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java Sat Dec 30 13:42:22 2006
@@ -37,12 +37,12 @@
public void testPropertyInjection() throws Exception {
/*CompositeScopeContainer scope = new CompositeScopeContainer(null);
scope.start();
- List<Class<?>> services = new ArrayList<Class<?>>();
- services.add(Greeting.class);
+ List<Class<?>> serviceBindings = new ArrayList<Class<?>>();
+ serviceBindings.add(Greeting.class);
Map<String, Object> properties = new HashMap<String, Object>();
properties.put("property", "bar");
WireService wireService = ArtifactFactory.createWireService();
- JavaScriptComponent<Greeting> context = new JavaScriptComponent<Greeting>("source", implClass, services, properties, null, scope, wireService, null);
+ JavaScriptComponent<Greeting> context = new JavaScriptComponent<Greeting>("source", implClass, serviceBindings, properties, null, scope, wireService, null);
scope.register(context);
Greeting greeting = context.getServiceInstance();
assertEquals("bar", greeting.greet("foo"));
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/RhinoScriptIntrospectorTestCase.java Sat Dec 30 13:42:22 2006
@@ -76,9 +76,9 @@
// JavaScriptIntrospector introspector = new JavaScriptIntrospector(null);
// ComponentType comonentType = introspector.introspectScript(scaConfig, rs.getClassLoader());
// assertNotNull(comonentType);
-// Map services = comonentType.getServices();
-// assertEquals(1, services.size());
-// ServiceDefinition serviceDefinition = (ServiceDefinition) services.values().iterator().next();
+// Map serviceBindings = comonentType.getServices();
+// assertEquals(1, serviceBindings.size());
+// ServiceDefinition serviceDefinition = (ServiceDefinition) serviceBindings.values().iterator().next();
// ServiceContract serviceContract = serviceDefinition.getServiceContract();
// assertTrue(serviceContract instanceof WSDLServiceContract);
// WSDLServiceContract wsdlServiceContract = (WSDLServiceContract) serviceContract;
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/ScriptInvokeTestCase.java Sat Dec 30 13:42:22 2006
@@ -37,9 +37,9 @@
public void testBasicScriptInvocation() throws Exception {
// CompositeScopeContainer scope = new CompositeScopeContainer(null);
// scope.start();
-// List<Class<?>> services = new ArrayList<Class<?>>();
-// services.add(Greeting.class);
-// JavaScriptComponent<Greeting> context = new JavaScriptComponent<Greeting>("source", rhinoScript, services, new HashMap<String, Object>(),
+// List<Class<?>> serviceBindings = new ArrayList<Class<?>>();
+// serviceBindings.add(Greeting.class);
+// JavaScriptComponent<Greeting> context = new JavaScriptComponent<Greeting>("source", rhinoScript, serviceBindings, new HashMap<String, Object>(),
// null, scope, ArtifactFactory.createWireService(), null);
// scope.register(context);
// Greeting object = (Greeting) context.getServiceInstance();
Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/WireTestCase.java Sat Dec 30 13:42:22 2006
@@ -69,9 +69,9 @@
// CompositeScopeContainer scope = new CompositeScopeContainer(null);
// scope.start();
//
-// List<Class<?>> services = new ArrayList<Class<?>>();
-// services.add(Greeting.class);
-// JavaScriptComponent<Greeting> context = new JavaScriptComponent<Greeting>("source", implClass1, services, properties, null, scope,
+// List<Class<?>> serviceBindings = new ArrayList<Class<?>>();
+// serviceBindings.add(Greeting.class);
+// JavaScriptComponent<Greeting> context = new JavaScriptComponent<Greeting>("source", implClass1, serviceBindings, properties, null, scope,
// ArtifactFactory.createWireService(), null);
// OutboundWire wire = ArtifactFactory.createOutboundWire("wire", Greeting.class);
// ArtifactFactory.terminateWire(wire);
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java Sat Dec 30 13:42:22 2006
@@ -55,7 +55,7 @@
RubyImplementation implementation = componentDefinition.getImplementation();
RubyComponentType componentType = implementation.getComponentType();
- // get list of services provided by this component
+ // get list of serviceBindings provided by this component
Collection<ServiceDefinition> collection = componentType.getServices().values();
List<Class<?>> services = new ArrayList<Class<?>>(collection.size());
for (ServiceDefinition serviceDefinition : collection) {
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/RubyScriptIntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/RubyScriptIntrospectorTestCase.java?view=diff&rev=491325&r1=491324&r2=491325
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/RubyScriptIntrospectorTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/RubyScriptIntrospectorTestCase.java Sat Dec 30 13:42:22 2006
@@ -84,9 +84,9 @@
// JavaScriptIntrospector introspector = new JavaScriptIntrospector(null);
// ComponentType comonentType = introspector.introspectScript(scaConfig, rs.getClassLoader());
// assertNotNull(comonentType);
- // Map services = comonentType.getServices();
- // assertEquals(1, services.size());
- // ServiceDefinition serviceDefinition = (ServiceDefinition) services.values().iterator().next();
+ // Map serviceBindings = comonentType.getServices();
+ // assertEquals(1, serviceBindings.size());
+ // ServiceDefinition serviceDefinition = (ServiceDefinition) serviceBindings.values().iterator().next();
// ServiceContract serviceContract = serviceDefinition.getServiceContract();
// assertTrue(serviceContract instanceof WSDLServiceContract);
// WSDLServiceContract wsdlServiceContract = (WSDLServiceContract) serviceContract;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org