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/27 11:23:45 UTC
svn commit: r490475 [2/2] - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/
kernel/core/src/main/java/org/apache/tuscany/core/builder/
kernel/core/src/main/java/org/apache/tuscany/core/implementation/composi...
Copied: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingDefinition.java (from r490460, incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBinding.java&r1=490460&p2=incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -23,24 +23,24 @@
import javax.wsdl.Service;
import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
/**
* Represents a Celtix binding configuration in an assembly
*
* @version $Rev$ $Date$
*/
-public class WebServiceBinding extends Binding {
+public class WebServiceBindingDefinition extends BindingDefinition {
private Definition definition;
private Port port;
private Service service;
//private String portURI;
private String uri;
- //We have to use WebServiceBinding to pass WSDLDefinitionRegistry to BindingBuilder
+ //We have to use WebServiceBindingDefinition to pass WSDLDefinitionRegistry to BindingBuilder
private WSDLDefinitionRegistry wsdlDefinitionRegistry;
- public WebServiceBinding(Definition definition, Port port, String uri, String portURI, Service service) {
+ public WebServiceBindingDefinition(Definition definition, Port port, String uri, String portURI, Service service) {
this.definition = definition;
this.port = port;
this.uri = uri;
Propchange: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/WebServiceBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -52,12 +52,12 @@
import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl.Monitor;
/**
- * Parses a <code>WebServiceBinding</code> entry in an assembly XML file
+ * Parses a <code>WebServiceBindingDefinition</code> entry in an assembly XML file
*
* @version $Rev$ $Date$
*/
@Scope("COMPOSITE")
-public class WebServiceBindingLoader extends LoaderExtension<WebServiceBinding> {
+public class WebServiceBindingLoader extends LoaderExtension<WebServiceBindingDefinition> {
public static final QName BINDING_WS = new QName(XML_NAMESPACE_1_0, "binding.ws");
protected WSDLDefinitionRegistry wsdlRegistry;
@@ -89,7 +89,7 @@
return BINDING_WS;
}
- public WebServiceBinding load(CompositeComponent parent,
+ public WebServiceBindingDefinition load(CompositeComponent parent,
ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext)
@@ -107,7 +107,7 @@
}
}
- private WebServiceBinding createBinding(String port, String portURI, String wsdlLocation,
+ private WebServiceBindingDefinition createBinding(String port, String portURI, String wsdlLocation,
DeploymentContext deploymentContext)
throws WSDLException, IOException {
List<Definition> definitions = null;
@@ -186,12 +186,12 @@
throw new IllegalArgumentException("Cannot find WSDL port " + portURI);
}
- WebServiceBinding wsBinding = new WebServiceBinding(definition, thePort, port, portURI, service);
+ WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(definition, thePort, port, portURI, service);
wsBinding.setWSDLDefinitionRegistry(wsdlRegistry);
return wsBinding;
}
// FIXME - return a broken binding for now
- return new WebServiceBinding(null, null, null, portURI, null);
+ return new WebServiceBindingDefinition(null, null, null, portURI, null);
}
}
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=490475&r1=490474&r2=490475
==============================================================================
--- 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 Wed Dec 27 02:23:42 2006
@@ -127,7 +127,7 @@
"SOAPService"));
Port port = wsdlService.getPort("SoapPort");
- WebServiceBinding wsBinding = new WebServiceBinding(wsdlDef, port, "uri", "portURI", wsdlService);
+ WebServiceBindingDefinition wsBinding = new WebServiceBindingDefinition(wsdlDef, port, "uri", "portURI", wsdlService);
//Create mocked InboundWire, for ServiceExtension.getInterface()
InboundWire inboundWire = EasyMock.createNiceMock(InboundWire.class);
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationAndDataBinding.java Wed Dec 27 02:23:42 2006
@@ -39,7 +39,7 @@
private boolean xmlFormat;
- public DefaultOperationAndDataBinding(JMSBinding jmsBinding) {
+ public DefaultOperationAndDataBinding(JMSBindingDefinition jmsBinding) {
this.operationPropertyName = jmsBinding.getOperationSelectorPropertyName();
this.xmlFormat = jmsBinding.isXMLFormat();
}
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=490475&r1=490474&r2=490475
==============================================================================
--- 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 Wed Dec 27 02:23:42 2006
@@ -38,22 +38,22 @@
* @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
*/
-public class JMSBindingBuilder extends BindingBuilderExtension<JMSBinding> {
+public class JMSBindingBuilder extends BindingBuilderExtension<JMSBindingDefinition> {
private static final String DEFAULT_JMS_RESOURCE_FACTORY =
"org.apache.tuscany.binding.jms.SimpleJMSResourceFactory";
private static final String OM_DATA_BINDING = OMElement.class.getName();
- protected Class<JMSBinding> getBindingType() {
- return JMSBinding.class;
+ protected Class<JMSBindingDefinition> getBindingType() {
+ return JMSBindingDefinition.class;
}
public Service build(CompositeComponent parent,
- BoundServiceDefinition<JMSBinding> serviceDefinition,
+ BoundServiceDefinition<JMSBindingDefinition> serviceDefinition,
DeploymentContext deploymentContext) {
- JMSBinding jmsBinding = serviceDefinition.getBinding();
+ JMSBindingDefinition jmsBinding = serviceDefinition.getBinding();
Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
ServiceContract serviceContract = serviceDefinition.getServiceContract();
@@ -79,7 +79,7 @@
}
public JMSReference build(CompositeComponent parent,
- BoundReferenceDefinition<JMSBinding> referenceDefinition,
+ BoundReferenceDefinition<JMSBindingDefinition> referenceDefinition,
DeploymentContext deploymentContext) {
String name = referenceDefinition.getName();
@@ -92,7 +92,7 @@
}
serviceContract.setDataBinding(OM_DATA_BINDING);
- JMSBinding jmsBinding = referenceDefinition.getBinding();
+ JMSBindingDefinition jmsBinding = referenceDefinition.getBinding();
JMSResourceFactory jmsResourceFactory = getJMSResourceFactory(jmsBinding);
Destination requestDest;
@@ -119,12 +119,12 @@
}
- private JMSResourceFactory getJMSResourceFactory(JMSBinding jmsBinding) {
+ private JMSResourceFactory getJMSResourceFactory(JMSBindingDefinition jmsBinding) {
String className = jmsBinding.getJmsResourceFactoryName();
if (className != null && !className.equals("")) {
try {
Class factoryClass = Class.forName(className != null ? className : DEFAULT_JMS_RESOURCE_FACTORY);
- Constructor constructor = factoryClass.getDeclaredConstructor(new Class[] {JMSBinding.class});
+ Constructor constructor = factoryClass.getDeclaredConstructor(new Class[] {JMSBindingDefinition.class});
return (JMSResourceFactory)constructor.newInstance(jmsBinding);
} catch (ClassNotFoundException e) {
throw new JMSBindingException("Error loading the JMSResourceFactory", e);
@@ -147,19 +147,19 @@
}
- protected OperationAndDataBinding getRequestOperationAndDatabinding(JMSBinding 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(JMSBinding 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(JMSBinding jmsBinding, ClassLoader cl, String className) {
+ protected OperationAndDataBinding instantiateClass(JMSBindingDefinition jmsBinding, ClassLoader cl, String className) {
OperationAndDataBinding operationAndDataBinding;
if (cl == null) {
cl = this.getClass().getClassLoader();
@@ -171,7 +171,7 @@
} catch (ClassNotFoundException e) {
clazz = this.getClass().getClassLoader().loadClass(className);
}
- Constructor constructor = clazz.getDeclaredConstructor(new Class[] {JMSBinding.class});
+ Constructor constructor = clazz.getDeclaredConstructor(new Class[] {JMSBindingDefinition.class});
operationAndDataBinding = (OperationAndDataBinding)constructor.newInstance(jmsBinding);
} catch (Throwable e) {
Copied: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingDefinition.java (from r490460, incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java&r1=490460&p2=incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -20,13 +20,13 @@
import javax.jms.DeliveryMode;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
/**
* Represents a binding to a JMS resource.
*/
-public class JMSBinding extends Binding {
+public class JMSBindingDefinition extends BindingDefinition {
public final static int DESTINATION_TYPE_QUEUE = 0;
public final static int DESTINATION_TYPE_TOPIC = 1;
@@ -70,7 +70,7 @@
public static final String DEFAULT_ODB_CLASSNAME = DefaultOperationAndDataBinding.class.getName();
public static final String DEFAULT_OPERATION_PROP_NAME = "scaOperationName";
- public JMSBinding(int destinationType,
+ public JMSBindingDefinition(int destinationType,
String destinationName,
String connectionFactoryName,
String activationSpecName,
@@ -93,7 +93,7 @@
this.replyTo = replyTo;
}
- public JMSBinding() {
+ public JMSBindingDefinition() {
super();
}
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingDefinition.java
------------------------------------------------------------------------------
--- svn:ignores (added)
+++ svn:ignores Wed Dec 27 02:23:42 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.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -40,7 +40,7 @@
* @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
*/
@Scope("COMPOSITE")
-public class JMSBindingLoader extends LoaderExtension<JMSBinding> {
+public class JMSBindingLoader extends LoaderExtension<JMSBindingDefinition> {
public static final QName BINDING_JMS =
new QName("http://tuscany.apache.org/xmlns/binding/jms/1.0-SNAPSHOT", "binding.jms");
@@ -58,7 +58,7 @@
* the implementation, especially during the last 2 weeks. I will wait till
* a draft version is published before I make any changes
*/
- public JMSBinding load(CompositeComponent parent,
+ public JMSBindingDefinition load(CompositeComponent parent,
ModelObject modelObject,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
@@ -93,7 +93,7 @@
// OMElement opSecPropertyOM = opSecOM.getFirstChildWithName(new
// QName("property"));
- JMSBinding binding = new JMSBinding();
+ JMSBindingDefinition binding = new JMSBindingDefinition();
binding.setActivationSpecName(activationSpecName);
binding.setConnectionFactoryName(connectionFactoryName);
binding.setDestinationName(destinationName);
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java Wed Dec 27 02:23:42 2006
@@ -39,7 +39,7 @@
* Loader for handling <binding.jms> elements based on the 0.96 draft 1 spec.
*/
@Scope("COMPOSITE")
-public class JMSBindingLoader0961 extends LoaderExtension<JMSBinding> {
+public class JMSBindingLoader0961 extends LoaderExtension<JMSBindingDefinition> {
public static final QName BINDING_JMS =
new QName("http://tuscany.apache.org/xmlns/binding/jms/1.0-SNAPSHOT", "binding.jms");
@@ -55,12 +55,12 @@
return BINDING_JMS;
}
- public JMSBinding load(CompositeComponent parent,
+ public JMSBindingDefinition load(CompositeComponent parent,
ModelObject modelObject,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
- JMSBinding jmsBinding = new JMSBinding();
+ JMSBindingDefinition jmsBinding = new JMSBindingDefinition();
String uri = reader.getAttributeValue(null, "uri");
if (uri != null && uri.length() > 0) {
@@ -126,20 +126,20 @@
}
}
- protected void parseResponse(XMLStreamReader reader, JMSBinding jmsBinding) {
+ protected void parseResponse(XMLStreamReader reader, JMSBindingDefinition jmsBinding) {
// TODO Auto-generated method stub
}
- protected void parseResourceAdapter(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+ protected void parseResourceAdapter(XMLStreamReader reader, JMSBindingDefinition jmsBinding) throws XMLStreamException {
// TODO Auto-generated method stub
}
- protected void parseOperation(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+ protected void parseOperation(XMLStreamReader reader, JMSBindingDefinition jmsBinding) throws XMLStreamException {
// TODO Auto-generated method stub
}
- protected void parseOperationAndDataBinding(XMLStreamReader reader, JMSBinding jmsBinding)
+ protected void parseOperationAndDataBinding(XMLStreamReader reader, JMSBindingDefinition jmsBinding)
throws XMLStreamException {
String name = reader.getAttributeValue(null, "name");
String use = reader.getAttributeValue(null, "use");
@@ -155,11 +155,11 @@
}
}
- protected void parseHeaders(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+ protected void parseHeaders(XMLStreamReader reader, JMSBindingDefinition jmsBinding) throws XMLStreamException {
// TODO Auto-generated method stub
}
- protected void parseDestination(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+ protected void parseDestination(XMLStreamReader reader, JMSBindingDefinition jmsBinding) throws XMLStreamException {
String name = reader.getAttributeValue(null, "name");
if (name != null && name.length() > 0) {
jmsBinding.setDestinationName(name);
@@ -167,9 +167,9 @@
String type = reader.getAttributeValue(null, "type");
if (type != null && type.length() > 0) {
if ("queue".equalsIgnoreCase(type)) {
- jmsBinding.setDestinationType(JMSBinding.DESTINATION_TYPE_QUEUE);
+ jmsBinding.setDestinationType(JMSBindingDefinition.DESTINATION_TYPE_QUEUE);
} else if ("topic".equalsIgnoreCase("type")) {
- jmsBinding.setDestinationType(JMSBinding.DESTINATION_TYPE_TOPIC);
+ jmsBinding.setDestinationType(JMSBindingDefinition.DESTINATION_TYPE_TOPIC);
} else {
throw new RuntimeException("invalid destination type: " + type);
}
@@ -180,7 +180,7 @@
}
}
- protected void parseURI(JMSBinding jmsBinding, String uri) {
+ protected void parseURI(JMSBindingDefinition jmsBinding, String uri) {
// TODO Auto-generated method stub
}
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java Wed Dec 27 02:23:42 2006
@@ -31,7 +31,7 @@
*/
public class JMSReference extends ReferenceExtension {
- protected JMSBinding jmsBinding;
+ protected JMSBindingDefinition jmsBinding;
protected JMSResourceFactory jmsResourceFactory;
protected OperationAndDataBinding requestOperationAndDataBinding;
protected OperationAndDataBinding responseOperationAndDataBinding;
@@ -40,7 +40,7 @@
public JMSReference(String name,
CompositeComponent parent,
- JMSBinding jmsBinding,
+ JMSBindingDefinition jmsBinding,
JMSResourceFactory jmsResourceFactory,
OperationAndDataBinding requestOperationAndDataBinding,
OperationAndDataBinding responseOperationAndDataBinding,
Modified: 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/JMSService.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- 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/JMSService.java Wed Dec 27 02:23:42 2006
@@ -32,7 +32,7 @@
*/
public class JMSService extends ServiceExtension {
- private JMSBinding jmsBinding;
+ private JMSBindingDefinition jmsBinding;
private JMSResourceFactory jmsResourceFactory;
private MessageConsumer consumer;
protected OperationAndDataBinding requestOperationAndDataBinding;
@@ -40,7 +40,7 @@
public JMSService(String name,
CompositeComponent parent,
- JMSBinding jmsBinding,
+ JMSBindingDefinition jmsBinding,
JMSResourceFactory jmsResourceFactory,
OperationAndDataBinding requestOperationAndDataBinding,
OperationAndDataBinding responseOperationAndDataBinding,
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java Wed Dec 27 02:23:42 2006
@@ -35,7 +35,7 @@
*/
public class JMSTargetInvoker extends TargetInvokerExtension {
- protected JMSBinding jmsBinding;
+ protected JMSBindingDefinition jmsBinding;
protected JMSResourceFactory jmsResourceFactory;
protected String operationName;
@@ -46,7 +46,7 @@
protected Destination replyDest;
public JMSTargetInvoker(JMSResourceFactory jmsResourceFactory,
- JMSBinding jmsBinding,
+ JMSBindingDefinition jmsBinding,
String operationName,
OperationAndDataBinding requestOperationAndDataBinding,
OperationAndDataBinding responseOperationAndDataBinding,
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java Wed Dec 27 02:23:42 2006
@@ -31,12 +31,12 @@
public class SimpleJMSResourceFactory implements JMSResourceFactory {
- private JMSBinding jmsBinding;
+ private JMSBindingDefinition jmsBinding;
private Connection con;
private Context context;
private boolean isConnectionStarted;
- public SimpleJMSResourceFactory(JMSBinding jmsBinding) {
+ public SimpleJMSResourceFactory(JMSBindingDefinition jmsBinding) {
this.jmsBinding = jmsBinding;
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java Wed Dec 27 02:23:42 2006
@@ -17,14 +17,14 @@
public void testMinimal() throws LoaderException, XMLStreamException {
String xml = "<binding.jms></binding.jms>";
XMLStreamReader reader = createReader(xml);
- JMSBinding jmsBinding = loader.load(null, null, reader, null);
+ JMSBindingDefinition jmsBinding = loader.load(null, null, reader, null);
assertNotNull(jmsBinding);
}
public void testCorrelationScheme() throws LoaderException, XMLStreamException {
XMLStreamReader reader =
createReader("<binding.jms correlationScheme=\"RequestMsgIDToCorrelID\"></binding.jms>");
- JMSBinding jmsBinding = loader.load(null, null, reader, null);
+ JMSBindingDefinition jmsBinding = loader.load(null, null, reader, null);
assertEquals("RequestMsgIDToCorrelID", jmsBinding.getCorrelationScheme());
reader = createReader("<binding.jms correlationScheme=\"RequestCorrelIDToCorrelID\"></binding.jms>");
@@ -46,31 +46,31 @@
public void testDestination() throws LoaderException, XMLStreamException {
XMLStreamReader reader = createReader("<binding.jms><destination name=\"foo\"/></binding.jms>");
- JMSBinding jmsBinding = loader.load(null, null, reader, null);
+ JMSBindingDefinition jmsBinding = loader.load(null, null, reader, null);
assertEquals("foo", jmsBinding.getDestinationName());
}
public void testInitialContextFactory() throws LoaderException, XMLStreamException {
XMLStreamReader reader = createReader("<binding.jms initialContextFactory=\"myicf\"></binding.jms>");
- JMSBinding jmsBinding = loader.load(null, null, reader, null);
+ JMSBindingDefinition jmsBinding = loader.load(null, null, reader, null);
assertEquals("myicf", jmsBinding.getInitialContextFactoryName());
}
public void testJNDIProviderURL() throws LoaderException, XMLStreamException {
XMLStreamReader reader = createReader("<binding.jms JNDIProviderURL=\"myURL\"></binding.jms>");
- JMSBinding jmsBinding = loader.load(null, null, reader, null);
+ JMSBindingDefinition jmsBinding = loader.load(null, null, reader, null);
assertEquals("myURL", jmsBinding.getJNDIProviderURL());
}
public void testConnectionFactory() throws LoaderException, XMLStreamException {
XMLStreamReader reader = createReader("<binding.jms connectionFactory=\"myfactory\"></binding.jms>");
- JMSBinding jmsBinding = loader.load(null, null, reader, null);
+ JMSBindingDefinition jmsBinding = loader.load(null, null, reader, null);
assertEquals("myfactory", jmsBinding.getConnectionFactoryName());
}
public void testActivationSpec() throws LoaderException, XMLStreamException {
XMLStreamReader reader = createReader("<binding.jms activationSpec=\"myas\"></binding.jms>");
- JMSBinding jmsBinding = loader.load(null, null, reader, null);
+ JMSBindingDefinition jmsBinding = loader.load(null, null, reader, null);
assertEquals("myas", jmsBinding.getActivationSpecName());
}
Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java Wed Dec 27 02:23:42 2006
@@ -62,7 +62,7 @@
}
private JMSTargetInvoker createJMSInvoker() throws NamingException, JMSException {
- JMSBinding binding = new JMSBinding();
+ JMSBindingDefinition binding = new JMSBindingDefinition();
binding.setInitialContextFactoryName("org.activemq.jndi.ActiveMQInitialContextFactory");
binding.setConnectionFactoryName("ConnectionFactory");
binding.setJNDIProviderURL("tcp://localhost:61616");
@@ -103,7 +103,7 @@
}
private void startBroker() throws Exception {
- broker = new BrokerContainerImpl("JMS Binding Test");
+ broker = new BrokerContainerImpl("JMS BindingDefinition Test");
// configure the broker
broker.addConnector("tcp://localhost:61616");
broker.setPersistenceAdapter(new VMPersistenceAdapter());
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=490475&r1=490474&r2=490475
==============================================================================
--- 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 Wed Dec 27 02:23:42 2006
@@ -32,7 +32,7 @@
*
* @version $Rev$ $Date$
*/
-public class JSONRPCBindingBuilder extends BindingBuilderExtension<JSONRPCBinding> {
+public class JSONRPCBindingBuilder extends BindingBuilderExtension<JSONRPCBindingDefinition> {
private ServletHost servletHost;
private WireService wireService;
@@ -52,13 +52,13 @@
return servletHost;
}
- protected Class<JSONRPCBinding> getBindingType() {
- return JSONRPCBinding.class;
+ protected Class<JSONRPCBindingDefinition> getBindingType() {
+ return JSONRPCBindingDefinition.class;
}
@SuppressWarnings("unchecked")
public Service build(CompositeComponent parent,
- BoundServiceDefinition<JSONRPCBinding> serviceDefinition,
+ BoundServiceDefinition<JSONRPCBindingDefinition> serviceDefinition,
DeploymentContext deploymentContext) {
Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
Copied: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingDefinition.java (from r490460, incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java&r1=490460&p2=incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -18,14 +18,14 @@
*/
package org.apache.tuscany.binding.jsonrpc;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
/**
* Represents a binding to an RMI service.
*
* @version $Rev$ $Date$
*/
-public class JSONRPCBinding extends Binding {
+public class JSONRPCBindingDefinition extends BindingDefinition {
String uri;
public String getURI() {
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -38,7 +38,7 @@
* @version $Rev$ $Date$
*/
@Scope("COMPOSITE")
-public class JSONRPCBindingLoader extends LoaderExtension<JSONRPCBinding> {
+public class JSONRPCBindingLoader extends LoaderExtension<JSONRPCBindingDefinition> {
public static final QName BINDING_JSON = new QName(XML_NAMESPACE_1_0, "binding.jsonrpc");
public JSONRPCBindingLoader(@Autowire LoaderRegistry registry) {
@@ -49,9 +49,9 @@
return BINDING_JSON;
}
- public JSONRPCBinding load(CompositeComponent parent, ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException,
+ public JSONRPCBindingDefinition load(CompositeComponent parent, ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException,
LoaderException {
- return new JSONRPCBinding();
+ return new JSONRPCBindingDefinition();
}
}
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=490475&r1=490474&r2=490475
==============================================================================
--- 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 Wed Dec 27 02:23:42 2006
@@ -44,7 +44,7 @@
public void testGetBindingType() {
JSONRPCBindingBuilder bindingBuilder = new JSONRPCBindingBuilder();
- assertEquals(JSONRPCBinding.class, bindingBuilder.getBindingType());
+ assertEquals(JSONRPCBindingDefinition.class, bindingBuilder.getBindingType());
}
@SuppressWarnings("unchecked")
@@ -52,8 +52,8 @@
JSONRPCBindingBuilder bindingBuilder = new JSONRPCBindingBuilder();
CompositeComponent mockParent = createMock(CompositeComponent.class);
replay(mockParent);
- BoundServiceDefinition<JSONRPCBinding> mockServiceDefinition =
- createMock((new BoundServiceDefinition<JSONRPCBinding>()).getClass());
+ BoundServiceDefinition<JSONRPCBindingDefinition> mockServiceDefinition =
+ createMock((new BoundServiceDefinition<JSONRPCBindingDefinition>()).getClass());
JavaInterfaceProcessorRegistry registry = new JavaInterfaceProcessorRegistryImpl();
try {
ServiceContract<?> contract = registry.introspect(JSONRPCService.class);
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoaderTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingLoaderTestCase.java Wed Dec 27 02:23:42 2006
@@ -65,7 +65,7 @@
replay(mockDeploymentContext);
try {
- JSONRPCBinding jsonBinding = loader.load(mockParent, mockModelObject, mockReader, mockDeploymentContext);
+ JSONRPCBindingDefinition jsonBinding = loader.load(mockParent, mockModelObject, mockReader, mockDeploymentContext);
assertNotNull(jsonBinding);
} catch (LoaderException e) {
// TODO Auto-generated catch block
Modified: incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/JSONRPCBindingTestCase.java Wed Dec 27 02:23:42 2006
@@ -23,13 +23,13 @@
public class JSONRPCBindingTestCase extends TestCase {
public void testGetURI() {
- JSONRPCBinding jsonBinding = new JSONRPCBinding();
+ JSONRPCBindingDefinition jsonBinding = new JSONRPCBindingDefinition();
jsonBinding.uri = "test_uri";
assertEquals("test_uri", jsonBinding.getURI());
}
public void testSetURI() {
- JSONRPCBinding jsonBinding = new JSONRPCBinding();
+ JSONRPCBindingDefinition jsonBinding = new JSONRPCBindingDefinition();
jsonBinding.setURI("test_uri");
assertEquals("test_uri", jsonBinding.uri);
}
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=490475&r1=490474&r2=490475
==============================================================================
--- 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 Wed Dec 27 02:23:42 2006
@@ -35,7 +35,7 @@
* @version $Rev$ $Date$
*/
-public class RMIBindingBuilder extends BindingBuilderExtension<RMIBinding> {
+public class RMIBindingBuilder extends BindingBuilderExtension<RMIBindingDefinition> {
private RMIHost rmiHost;
@@ -44,13 +44,13 @@
this.rmiHost = rHost;
}
- protected Class<RMIBinding> getBindingType() {
- return RMIBinding.class;
+ protected Class<RMIBindingDefinition> getBindingType() {
+ return RMIBindingDefinition.class;
}
@SuppressWarnings({"unchecked"})
public Service build(CompositeComponent parent,
- BoundServiceDefinition<RMIBinding> boundServiceDefinition,
+ BoundServiceDefinition<RMIBindingDefinition> boundServiceDefinition,
DeploymentContext deploymentContext) {
Class intf = boundServiceDefinition.getServiceContract().getInterfaceClass();
@@ -62,7 +62,7 @@
@SuppressWarnings({"unchecked"})
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition<RMIBinding> boundReferenceDefinition,
+ BoundReferenceDefinition<RMIBindingDefinition> boundReferenceDefinition,
DeploymentContext deploymentContext) {
String name = boundReferenceDefinition.getName();
String host = boundReferenceDefinition.getBinding().getHost();
Copied: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingDefinition.java (from r490460, incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java&r1=490460&p2=incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -16,14 +16,14 @@
*/
package org.apache.tuscany.binding.rmi;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
/**
* Represents a binding to an RMI service.
*
* @version $Rev$ $Date$
*/
-public class RMIBinding extends Binding {
+public class RMIBindingDefinition extends BindingDefinition {
private String host;
private String port;
Propchange: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -37,7 +37,7 @@
* @version $Rev$ $Date$
*/
@Scope("COMPOSITE")
-public class RMIBindingLoader extends LoaderExtension<RMIBinding> {
+public class RMIBindingLoader extends LoaderExtension<RMIBindingDefinition> {
public static final QName BINDING_RMI = new QName(
"http://tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT", "binding.rmi");
@@ -49,7 +49,7 @@
return BINDING_RMI;
}
- public RMIBinding load(CompositeComponent parent,
+ public RMIBindingDefinition load(CompositeComponent parent,
ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
@@ -57,7 +57,7 @@
String port = reader.getAttributeValue(null, "port");
String svcName = reader.getAttributeValue(null, "serviceName");
LoaderUtil.skipToEndElement(reader);
- RMIBinding binding = new RMIBinding();
+ RMIBindingDefinition binding = new RMIBindingDefinition();
binding.setHost(host);
binding.setPort(port);
binding.setServiceName(svcName);
Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingBuilderTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingBuilderTestCase.java Wed Dec 27 02:23:42 2006
@@ -27,15 +27,15 @@
public class RMIBindingBuilderTestCase extends TestCase {
public void testGetBindingType() {
- assertEquals(RMIBinding.class, new RMIBindingBuilder(null).getBindingType());
+ assertEquals(RMIBindingDefinition.class, new RMIBindingBuilder(null).getBindingType());
}
@SuppressWarnings("unchecked")
public void testBuildService() {
RMIBindingBuilder builder = new RMIBindingBuilder(null);
- BoundReferenceDefinition<RMIBinding> def = createMock(BoundReferenceDefinition.class);
+ BoundReferenceDefinition<RMIBindingDefinition> def = createMock(BoundReferenceDefinition.class);
expect(def.getName()).andReturn("petra");
- RMIBinding binding = new RMIBinding();
+ RMIBindingDefinition binding = new RMIBindingDefinition();
expect(def.getBinding()).andReturn(binding );
expect(def.getBinding()).andReturn(binding );
expect(def.getBinding()).andReturn(binding );
Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIBindingTestCase.java Wed Dec 27 02:23:42 2006
@@ -21,19 +21,19 @@
public class RMIBindingTestCase extends TestCase {
public void testHost() {
- RMIBinding binding = new RMIBinding();
+ RMIBindingDefinition binding = new RMIBindingDefinition();
binding.setHost("foo");
assertEquals("foo", binding.getHost());
}
public void testPort() {
- RMIBinding binding = new RMIBinding();
+ RMIBindingDefinition binding = new RMIBindingDefinition();
binding.setPort("foo");
assertEquals("foo", binding.getPort());
}
public void testServiceName() {
- RMIBinding binding = new RMIBinding();
+ RMIBindingDefinition binding = new RMIBindingDefinition();
binding.setServiceName("foo");
assertEquals("foo", binding.getServiceName());
}
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilder.java Wed Dec 27 02:23:42 2006
@@ -28,7 +28,7 @@
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -61,7 +61,7 @@
// We need to set the target invoker as opposed to having the connector do it since the
// Spring context is "opaque" to the wiring fabric. In other words, the Spring context does not expose
// its beans as SCA components to the connector to wire the services to
- for (BoundServiceDefinition<? extends Binding> serviceDefinition : componentType.getServices().values()) {
+ for (BoundServiceDefinition<? extends BindingDefinition> serviceDefinition : componentType.getServices().values()) {
// call back into builder registry to handle building of services
Service service = (Service) builderRegistry.build(parent, serviceDefinition, deploymentContext);
// wire serviceDefinition to bean invokers
Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/services/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/impl/SpringCompositeBuilderTestCase.java Wed Dec 27 02:23:42 2006
@@ -40,7 +40,7 @@
import org.apache.tuscany.container.spring.model.SpringComponentType;
import org.apache.tuscany.container.spring.model.SpringImplementation;
import org.apache.tuscany.test.ArtifactFactory;
-import org.apache.tuscany.test.binding.TestBinding;
+import org.apache.tuscany.test.binding.TestBindingDefinition;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
@@ -108,9 +108,9 @@
private SpringComponentType<Property<?>> createComponentType() {
SpringComponentType<Property<?>> componentType = new SpringComponentType<Property<?>>();
- BoundServiceDefinition<TestBinding> serviceDefinition = new BoundServiceDefinition<TestBinding>();
+ BoundServiceDefinition<TestBindingDefinition> serviceDefinition = new BoundServiceDefinition<TestBindingDefinition>();
serviceDefinition.setName("fooService");
- serviceDefinition.setBinding(new TestBinding());
+ serviceDefinition.setBinding(new TestBindingDefinition());
try {
serviceDefinition.setTarget(new URI("testBean"));
} catch (URISyntaxException e) {
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java Wed Dec 27 02:23:42 2006
@@ -29,23 +29,23 @@
/**
* @version $Rev$ $Date$
*/
-public class TestBindingBuilder extends BindingBuilderExtension<TestBinding> {
+public class TestBindingBuilder extends BindingBuilderExtension<TestBindingDefinition> {
@SuppressWarnings("unchecked")
public Service build(CompositeComponent parent,
- BoundServiceDefinition<TestBinding> definition,
+ BoundServiceDefinition<TestBindingDefinition> definition,
DeploymentContext context) {
return new TestBindingService(definition.getName(), parent);
}
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition<TestBinding> definition,
+ BoundReferenceDefinition<TestBindingDefinition> definition,
DeploymentContext context) {
String name = definition.getName();
return new TestBindingReference(name, parent);
}
- protected Class<TestBinding> getBindingType() {
- return TestBinding.class;
+ protected Class<TestBindingDefinition> getBindingType() {
+ return TestBindingDefinition.class;
}
}
Copied: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingDefinition.java (from r490460, incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBinding.java&r1=490460&p2=incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBinding.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.test.binding;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
/**
@@ -26,7 +26,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class TestBinding extends Binding {
+public class TestBindingDefinition extends BindingDefinition {
}
Propchange: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -36,7 +36,7 @@
/**
* @version $Rev$ $Date$
*/
-public class TestBindingLoader extends LoaderExtension<TestBinding> {
+public class TestBindingLoader extends LoaderExtension<TestBindingDefinition> {
public static final QName BINDING_TEST = new QName(Version.XML_NAMESPACE_1_0, "binding.test");
@@ -49,9 +49,9 @@
return BINDING_TEST;
}
- public TestBinding load(CompositeComponent parent,
+ public TestBindingDefinition load(CompositeComponent parent,
ModelObject object, XMLStreamReader reader,
DeploymentContext context) throws XMLStreamException, LoaderException {
- return new TestBinding();
+ return new TestBindingDefinition();
}
}
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingBuilder.java Wed Dec 27 02:23:42 2006
@@ -11,17 +11,17 @@
/**
* @version $Rev$ $Date$
*/
-public class TestSocketBindingBuilder extends BindingBuilderExtension<TestSocketBinding> {
+public class TestSocketBindingBuilder extends BindingBuilderExtension<TestSocketBindingDefinition> {
public Service build(CompositeComponent parent,
- BoundServiceDefinition<TestSocketBinding> definition,
+ BoundServiceDefinition<TestSocketBindingDefinition> definition,
DeploymentContext context) {
int port = definition.getBinding().getPort();
return new TestSocketBindingService(definition.getName(), port, parent);
}
public Reference build(CompositeComponent parent,
- BoundReferenceDefinition<TestSocketBinding> definition,
+ BoundReferenceDefinition<TestSocketBindingDefinition> definition,
DeploymentContext context) {
String name = definition.getName();
int port = definition.getBinding().getPort();
@@ -29,7 +29,7 @@
return new TestSocketBindingReference(name, host, port, parent);
}
- protected Class<TestSocketBinding> getBindingType() {
- return TestSocketBinding.class;
+ protected Class<TestSocketBindingDefinition> getBindingType() {
+ return TestSocketBindingDefinition.class;
}
}
Copied: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingDefinition.java (from r490460, incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBinding.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingDefinition.java?view=diff&rev=490475&p1=incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBinding.java&r1=490460&p2=incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingDefinition.java&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBinding.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingDefinition.java Wed Dec 27 02:23:42 2006
@@ -1,17 +1,17 @@
package org.apache.tuscany.test.binding;
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
/**
* A simple socket-based binding. Service operations may onyl take one parameter that is <code>Serializable</code>
*
* @version $$Rev$$ $$Date$$
*/
-public class TestSocketBinding extends Binding {
+public class TestSocketBindingDefinition extends BindingDefinition {
private String host;
private int port;
- public TestSocketBinding(String host, int port) {
+ public TestSocketBindingDefinition(String host, int port) {
this.host = host;
this.port = port;
}
Propchange: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java?view=diff&rev=490475&r1=490474&r2=490475
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java Wed Dec 27 02:23:42 2006
@@ -18,7 +18,7 @@
/**
* @version $Rev$ $Date$
*/
-public class TestSocketBindingLoader extends LoaderExtension<TestSocketBinding> {
+public class TestSocketBindingLoader extends LoaderExtension<TestSocketBindingDefinition> {
public static final QName BINDING_TEST = new QName(Version.XML_NAMESPACE_1_0, "binding.socket");
@@ -31,7 +31,7 @@
return TestSocketBindingLoader.BINDING_TEST;
}
- public TestSocketBinding load(CompositeComponent parent,
+ public TestSocketBindingDefinition load(CompositeComponent parent,
ModelObject object, XMLStreamReader reader,
DeploymentContext context) throws XMLStreamException, LoaderException {
String host = reader.getAttributeValue(null, "host");
@@ -41,6 +41,6 @@
} catch (NumberFormatException e) {
throw new LoaderException("Invalid port specified", e);
}
- return new TestSocketBinding(host, port);
+ return new TestSocketBindingDefinition(host, port);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org