You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/08/12 02:23:46 UTC
svn commit: r430929 - in /incubator/tuscany/java:
samples/sca/bigbank/src/main/resources/META-INF/sca/
samples/sca/calculator/src/main/resources/META-INF/sca/
samples/sca/echo.binding/src/test/resources/META-INF/sca/
samples/sca/helloworld.rmiReference...
Author: rineholt
Date: Fri Aug 11 17:23:45 2006
New Revision: 430929
URL: http://svn.apache.org/viewvc?rev=430929&view=rev
Log:
TUSCANY-615
http://issues.apache.org/jira/browse/TUSCANY-615
Modified:
incubator/tuscany/java/samples/sca/bigbank/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/samples/sca/echo.binding/src/test/resources/META-INF/sca/default.scdl
incubator/tuscany/java/samples/sca/helloworld.rmiReference/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/samples/sca/helloworld.rmiService/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/samples/sca/local.wire.cdi/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/samples/sca/local.wire/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl
Modified: incubator/tuscany/java/samples/sca/bigbank/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/bigbank/src/main/resources/META-INF/sca/default.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/bigbank/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/bigbank/src/main/resources/META-INF/sca/default.scdl Fri Aug 11 17:23:45 2006
@@ -32,8 +32,8 @@
<component name="AccountServiceComponent">
<implementation.java class="bigbank.account.AccountServiceImpl"/>
<references>
- <reference name="accountDataService" target="AccountDataServiceComponent" />
- <!-- <reference name="stockQuoteService" target="StockQuoteService" /> -->
+ <reference name="accountDataService">AccountDataServiceComponent</reference>
+ <!-- <reference name="stockQuoteService">StockQuoteService</reference> -->
</references>
</component>
Modified: incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/sca/default.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/sca/default.scdl Fri Aug 11 17:23:45 2006
@@ -20,10 +20,10 @@
<component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
<references>
- <reference name="addService" target="AddServiceComponent"/>
- <reference name="subtractService" target="SubtractServiceComponent"/>
- <reference name="multiplyService" target="MultiplyServiceComponent"/>
- <reference name="divideService" target="DivideServiceComponent"/>
+ <reference name="addService">AddServiceComponent</reference>
+ <reference name="subtractService">SubtractServiceComponent</reference>
+ <reference name="multiplyService">MultiplyServiceComponent</reference>
+ <reference name="divideService">DivideServiceComponent</reference>
</references>
</component>
Modified: incubator/tuscany/java/samples/sca/echo.binding/src/test/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.binding/src/test/resources/META-INF/sca/default.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.binding/src/test/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/echo.binding/src/test/resources/META-INF/sca/default.scdl Fri Aug 11 17:23:45 2006
@@ -16,16 +16,15 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="echo.sample">
- <service name="ClientService" target="Client">
+ <service name="ClientService">
<interface.java class="echo.Client"/>
<binding.echo/>
+ <reference>Client</reference>
</service>
<component name="Client">
<implementation.java class="echo.ClientImpl"/>
- <references>
- <reference name="echoReference" target="EchoReference"/>
- </references>
+ <reference name="echoReference">EchoReference</reference>
</component>
<reference name="EchoReference">
Modified: incubator/tuscany/java/samples/sca/helloworld.rmiReference/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworld.rmiReference/src/main/resources/META-INF/sca/default.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworld.rmiReference/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/helloworld.rmiReference/src/main/resources/META-INF/sca/default.scdl Fri Aug 11 17:23:45 2006
@@ -18,7 +18,7 @@
xmlns:rmi="http://tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT"
name="HelloWorldRmiComposite">
- <reference name="HelloWorldExtRmiService" target="Nothing">
+ <reference name="HelloWorldExtRmiService">
<interface.java interface="helloworld.HelloWorldService"/>
<rmi:binding.rmi uri="HelloWorldRmiService" />
</reference>
@@ -26,7 +26,7 @@
<component name="HelloWorldServiceComponent">
<implementation.java class="helloworld.HelloWorldImpl"/>
- <reference name="extService" target="HelloWorldExtRmiService">HelloWorldExtRmiService</reference>
+ <reference name="extService">HelloWorldExtRmiService</reference>
</component>
</composite>
Modified: incubator/tuscany/java/samples/sca/helloworld.rmiService/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworld.rmiService/src/main/resources/META-INF/sca/default.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworld.rmiService/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/helloworld.rmiService/src/main/resources/META-INF/sca/default.scdl Fri Aug 11 17:23:45 2006
@@ -18,7 +18,7 @@
xmlns:rmi="http://tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT"
name="HelloWorldRmiComposite">
- <service name="HelloWorldRmiService" target="HelloWorldServiceComponent">
+ <service name="HelloWorldRmiService">
<interface.java interface="helloworld.HelloWorldService"/>
<rmi:binding.rmi uri="HelloWorldRmiService" />
<reference>HelloWorldServiceComponent</reference>
Modified: incubator/tuscany/java/samples/sca/local.wire.cdi/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/local.wire.cdi/src/main/resources/META-INF/sca/default.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/local.wire.cdi/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/local.wire.cdi/src/main/resources/META-INF/sca/default.scdl Fri Aug 11 17:23:45 2006
@@ -22,7 +22,7 @@
<implementation.java class="localwire.cdi.SourceImpl"/>
<references>
<!-- specify which component will be the target of the "target" reference -->
- <reference name="target" target="TargetComponent"/>
+ <reference name="target">TargetComponent</reference>
</references>
</component>
Modified: incubator/tuscany/java/samples/sca/local.wire/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/local.wire/src/main/resources/META-INF/sca/default.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/local.wire/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/local.wire/src/main/resources/META-INF/sca/default.scdl Fri Aug 11 17:23:45 2006
@@ -22,7 +22,7 @@
<implementation.java class="localwire.SourceImpl"/>
<references>
<!-- specify which component will be the target of the "target" reference -->
- <reference name="target" target="TargetComponent"/>
+ <reference name="target">TargetComponent</reference>
</references>
</component>
Modified: incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/sca/default.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/sca/default.scdl Fri Aug 11 17:23:45 2006
@@ -1,47 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="supplychain">
<component name="CustomerComponent">
- <implementation.java class="supplychain.CustomerComponentImpl"/>
- <references>
- <reference name="retailer" target="RetailerComponent"/>
- </references>
+ <implementation.java class="supplychain.CustomerComponentImpl" />
+ <reference name="retailer">RetailerComponent</reference>
</component>
-
+
<component name="RetailerComponent">
- <implementation.java class="supplychain.RetailerComponentImpl"/>
- <references>
- <reference name="warehouse" target="WarehouseComponent"/>
- </references>
+ <implementation.java class="supplychain.RetailerComponentImpl" />
+ <reference name="warehouse">WarehouseComponent</reference>
</component>
-
+
<component name="WarehouseComponent">
- <implementation.java class="supplychain.WarehouseComponentImpl"/>
- <references>
- <reference name="shipper" target="ShipperComponent"/>
- </references>
+ <implementation.java class="supplychain.WarehouseComponentImpl" />
+ <reference name="shipper">ShipperComponent</reference>
</component>
-
+
<component name="ShipperComponent">
- <implementation.java class="supplychain.ShipperComponentImpl"/>
- <references>
- <reference name="customer" target="CustomerComponent"/>
- </references>
+ <implementation.java class="supplychain.ShipperComponentImpl" />
+ <reference name="customer">CustomerComponent</reference>
</component>
-
+
</composite>
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Fri Aug 11 17:23:45 2006
@@ -166,7 +166,8 @@
ComponentDefinition<?> componentDefinition)
throws XMLStreamException, LoaderException {
String name = reader.getAttributeValue(null, "name");
- String target = reader.getAttributeValue(null, "target");
+ String text = reader.getElementText();
+ String target = text != null ? text.trim() : null;
if (name == null || target == null) {
InvalidReferenceException le = new InvalidReferenceException();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Fri Aug 11 17:23:45 2006
@@ -60,35 +60,34 @@
return SERVICE;
}
- public ServiceDefinition load(CompositeComponent parent,
- XMLStreamReader reader,
- DeploymentContext deploymentContext
- )
- throws XMLStreamException, LoaderException {
+ public ServiceDefinition load(CompositeComponent parent, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException,
+ LoaderException {
assert SERVICE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
- String target = null ;
+ String target = null;
Binding binding = null;
ServiceContract serviceContract = null;
while (true) {
int i = reader.next();
switch (i) {
- case START_ELEMENT:
-
- //there is a reference already using this qname which doesn't seem appropriate.
- if(REFERENCE.equals(reader.getName())){
- target= reader.getElementText();
- }else{
+ case START_ELEMENT:
- ModelObject o = registry.load(parent, reader, deploymentContext);
- if (o instanceof ServiceContract) {
- serviceContract = (ServiceContract) o;
- } else if (o instanceof Binding) {
- binding = (Binding) o;
- }
+ // there is a reference already using this qname which doesn't seem appropriate.
+ if (REFERENCE.equals(reader.getName())) {
+ String text = reader.getElementText();
+ target = text != null ? text.trim() : null;
+ } else {
+
+ ModelObject o = registry.load(parent, reader, deploymentContext);
+ if (o instanceof ServiceContract) {
+ serviceContract = (ServiceContract) o;
+ } else if (o instanceof Binding) {
+ binding = (Binding) o;
}
- break;
- case END_ELEMENT:
+ }
+ break;
+ case END_ELEMENT:
+ if (SERVICE.equals(reader.getName())) {
if (binding != null) {
if (target == null) {
InvalidReferenceException e = new InvalidReferenceException("No target for service ");
@@ -104,12 +103,13 @@
throw ire;
}
- //FIXME need a way to specify "remotable" on a service
+ // FIXME need a way to specify "remotable" on a service
return new BoundServiceDefinition<Binding>(name, serviceContract, false, binding, targetURI);
} else {
- //FIXME need a way to specify "remotable" on a service
+ // FIXME need a way to specify "remotable" on a service
return new ServiceDefinition(name, serviceContract, false);
}
+ }
}
}
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java Fri Aug 11 17:23:45 2006
@@ -16,15 +16,17 @@
*/
package org.apache.tuscany.core.loader;
-import javax.xml.namespace.QName;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
+import junit.framework.TestCase;
import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -32,31 +34,32 @@
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.model.ServiceDefinition;
+import org.easymock.EasyMock;
/**
* Verifies loading of a service definition from an XML-based assembly
*
* @version $Rev$ $Date$
*/
-public class ServiceLoaderTestCase extends MockObjectTestCase {
+public class ServiceLoaderTestCase extends TestCase {
private static final QName SERVICE = new QName(XML_NAMESPACE_1_0, "service");
private static final QName REFERENCE = new QName(XML_NAMESPACE_1_0, "reference");
-
+ private static final QName INTERFACE_JAVA = new QName(XML_NAMESPACE_1_0, "interface.java");
+
private ServiceLoader loader;
private DeploymentContext deploymentContext;
- private Mock mockReader;
- private Mock mockRegistry;
+ private XMLStreamReader mockReader;
+ private LoaderRegistry mockRegistry;
public void testWithNoInterface() throws LoaderException, XMLStreamException {
String name = "serviceDefinition";
// String target = "target";
- mockReader.expects(once()).method("getName").will(returnValue(SERVICE));
- // todo figure out how to check ordering
- mockReader.expects(once()).method("getAttributeValue")
- .with(ANYTHING, ANYTHING)
- .will(returnValue(name));
- mockReader.expects(once()).method("next").will(returnValue(END_ELEMENT));
- ServiceDefinition serviceDefinition = loader.load(null, (XMLStreamReader) mockReader.proxy(), null);
+ expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
+ expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ expect(mockReader.next()).andReturn(END_ELEMENT);
+ expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
+ replay(mockReader);
+ ServiceDefinition serviceDefinition = loader.load(null, (XMLStreamReader) mockReader, null);
assertNotNull(serviceDefinition);
assertEquals(name, serviceDefinition.getName());
}
@@ -66,23 +69,24 @@
String target = "target";
ServiceContract sc = new ServiceContract() {
};
- mockReader.expects(atLeastOnce()).method("getName")
- .will(onConsecutiveCalls(returnValue(SERVICE),returnValue(SERVICE)
- ,returnValue(REFERENCE)));
- // todo figure out how to check ordering
- mockReader.expects(once()).method("getAttributeValue")
- .with(ANYTHING, ANYTHING)
- .will((returnValue(name)));
- mockReader.expects(atLeastOnce()).method("next")
- .will(onConsecutiveCalls(returnValue(START_ELEMENT), returnValue(START_ELEMENT), returnValue(END_ELEMENT)));
- mockRegistry.expects(once()).method("load").with(eq(null), eq(mockReader.proxy()), eq(deploymentContext))
- .will(returnValue(sc));
- mockReader.expects(once()).method("getElementText").withNoArguments()
+ expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
+ expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ expect(mockReader.next()).andReturn(START_ELEMENT);
+ expect(mockReader.getName()).andReturn(INTERFACE_JAVA);
+ expect(mockRegistry.load(null, mockReader, deploymentContext)).andReturn(sc);
+ expect(mockReader.next()).andReturn(START_ELEMENT);
+ expect(mockReader.getName()).andReturn(REFERENCE);
+ expect(mockReader.getElementText()).andReturn(target);
+ expect(mockReader.next()).andReturn(END_ELEMENT);
+ expect(mockReader.getName()).andReturn(REFERENCE);
+ expect(mockReader.next()).andReturn(END_ELEMENT);
+ expect(mockReader.getName()).andReturn(SERVICE);
- .will((returnValue(target)));
+ replay(mockReader);
+ replay(mockRegistry);
ServiceDefinition serviceDefinition =
- loader.load(null, (XMLStreamReader) mockReader.proxy(), deploymentContext);
+ loader.load(null, (XMLStreamReader) mockReader, deploymentContext);
assertNotNull(serviceDefinition);
assertEquals(name, serviceDefinition.getName());
assertSame(sc, serviceDefinition.getServiceContract());
@@ -90,9 +94,9 @@
protected void setUp() throws Exception {
super.setUp();
- mockReader = mock(XMLStreamReader.class);
- mockRegistry = mock(LoaderRegistry.class);
- loader = new ServiceLoader((LoaderRegistry) mockRegistry.proxy());
+ mockReader = EasyMock.createStrictMock(XMLStreamReader.class);
+ mockRegistry = EasyMock.createMock(LoaderRegistry.class);
+ loader = new ServiceLoader(mockRegistry);
deploymentContext = new RootDeploymentContext(null, null, null, null);
}
}
Modified: incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl?rev=430929&r1=430928&r2=430929&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl (original)
+++ incubator/tuscany/java/sca/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl Fri Aug 11 17:23:45 2006
@@ -26,7 +26,7 @@
<component name="component">
<system:implementation.system class="org.apache.tuscany.core.mock.component.BasicInterfaceImpl"/>
<property name="publicProperty">propval</property>
- <reference name="publicReference" target="component2"/>
+ <reference name="publicReference">component2</reference>
</component>
<include name="boot1-include" scdlLocation="boot1-include.scdl"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org