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 2007/02/25 20:18:15 UTC
svn commit: r511576 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/loader/
core/src/test/java/org/apache/tuscany/core/loader/
core/src/test/resources/org/apache/tuscany/core/deployer/
spi/src/main/java/org/apache/tu...
Author: jmarino
Date: Sun Feb 25 11:18:14 2007
New Revision: 511576
URL: http://svn.apache.org/viewvc?view=rev&rev=511576
Log:
support for SCA 1.0 Service promotion syntax
Added:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderPromoteTestCase.java (contents, props changed)
- copied, changed from r511553, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingPromoteException.java (with props)
Removed:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1-include.scdl
incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl
incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=511576&r1=511575&r2=511576
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Sun Feb 25 11:18:14 2007
@@ -47,7 +47,6 @@
*/
public class ServiceLoader extends LoaderExtension<ServiceDefinition> {
private static final QName SERVICE = new QName(SCA_NS, "service");
- private static final QName REFERENCE = new QName(SCA_NS, "reference");
@Constructor
public ServiceLoader(@Autowire LoaderRegistry registry) {
@@ -58,37 +57,32 @@
return SERVICE;
}
- public ServiceDefinition load(
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public ServiceDefinition load(ModelObject object, XMLStreamReader reader, DeploymentContext context)
+ throws XMLStreamException, LoaderException {
assert SERVICE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
- URI targetUri = null;
- URI compositeId = deploymentContext.getComponentId();
+ URI compositeId = context.getComponentId();
URI componentBase = URI.create(compositeId + "/");
ServiceDefinition def = new ServiceDefinition();
def.setUri(compositeId.resolve('#' + name));
+ URI targetUri = null;
+ String promote = reader.getAttributeValue(null, "promote");
+ if (promote != null) {
+ QualifiedName qName = new QualifiedName(promote);
+ targetUri = componentBase.resolve(qName.getFragment());
+ }
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())) {
- String text = reader.getElementText();
- String target = text != null ? text.trim() : null;
- QualifiedName qName = new QualifiedName(target);
- targetUri = componentBase.resolve(qName.getFragment());
+ ModelObject o = registry.load(null, reader, context);
+ if (o instanceof ServiceContract) {
+ def.setServiceContract((ServiceContract) o);
+ } else if (o instanceof BindingDefinition) {
+ def.addBinding((BindingDefinition) o);
} else {
- ModelObject o = registry.load(null, reader, deploymentContext);
- if (o instanceof ServiceContract) {
- def.setServiceContract((ServiceContract) o);
- } else if (o instanceof BindingDefinition) {
- def.addBinding((BindingDefinition) o);
- } else {
- throw new UnrecognizedElementException(reader.getName());
- }
+ throw new UnrecognizedElementException(reader.getName());
}
break;
case END_ELEMENT:
Copied: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderPromoteTestCase.java (from r511553, incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderPromoteTestCase.java?view=diff&rev=511576&p1=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java&r1=511553&p2=incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderPromoteTestCase.java&r2=511576
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderPromoteTestCase.java Sun Feb 25 11:18:14 2007
@@ -26,7 +26,6 @@
import org.osoa.sca.Constants;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -38,23 +37,19 @@
/**
* @version $Rev$ $Date$
*/
-public class ServiceLoaderReferenceTestCase extends TestCase {
+public class ServiceLoaderPromoteTestCase extends TestCase {
private static final QName SERVICE = new QName(Constants.SCA_NS, "service");
- private static final QName REFERENCE = new QName(Constants.SCA_NS, "reference");
private static final String COMPONENT_NAME = "sca://domain/someComponent/";
private URI componentId;
private ServiceLoader loader;
private XMLStreamReader mockReader;
- private Component parent;
private DeploymentContext ctx;
public void testReferenceNoFragment() throws LoaderException, XMLStreamException {
String name = "serviceDefinition";
EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
EasyMock.expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
- EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.START_ELEMENT);
- EasyMock.expect(mockReader.getName()).andReturn(REFERENCE);
- EasyMock.expect(mockReader.getElementText()).andReturn("target");
+ EasyMock.expect(mockReader.getAttributeValue(null, "promote")).andReturn("target");
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
EasyMock.replay(mockReader);
@@ -67,9 +62,7 @@
String name = "serviceDefinition";
EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
EasyMock.expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
- EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.START_ELEMENT);
- EasyMock.expect(mockReader.getName()).andReturn(REFERENCE);
- EasyMock.expect(mockReader.getElementText()).andReturn("target/fragment");
+ EasyMock.expect(mockReader.getAttributeValue(null, "promote")).andReturn("target/fragment");
EasyMock.expect(mockReader.next()).andReturn(XMLStreamConstants.END_ELEMENT);
EasyMock.expect(mockReader.getName()).andReturn(SERVICE);
EasyMock.replay(mockReader);
@@ -86,9 +79,6 @@
loader = new ServiceLoader(mockRegistry);
componentId = URI.create(COMPONENT_NAME);
- parent = EasyMock.createMock(Component.class);
- EasyMock.expect(parent.getUri()).andReturn(componentId).atLeastOnce();
- EasyMock.replay(parent);
ctx = EasyMock.createMock(DeploymentContext.class);
EasyMock.expect(ctx.getComponentId()).andReturn(componentId);
EasyMock.replay(ctx);
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderPromoteTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderPromoteTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java?view=diff&rev=511576&r1=511575&r2=511576
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java Sun Feb 25 11:18:14 2007
@@ -27,7 +27,6 @@
import static org.osoa.sca.Constants.SCA_NS;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -50,21 +49,20 @@
*/
public class ServiceLoaderTestCase extends TestCase {
private static final QName SERVICE = new QName(SCA_NS, "service");
- private static final QName BINDING = new QName(SCA_NS, "binding.foo");
- private static final QName REFERENCE = new QName(SCA_NS, "reference");
+ //private static final QName REFERENCE = new QName(SCA_NS, "reference");
private static final QName INTERFACE_JAVA = new QName(SCA_NS, "interface.java");
private static final String PARENT_NAME = "sca://localhost/parent/";
private ServiceLoader loader;
private DeploymentContext deploymentContext;
private XMLStreamReader mockReader;
private LoaderRegistry mockRegistry;
- private Component parent;
private URI componentId;
public void testWithNoInterface() throws LoaderException, XMLStreamException {
String name = "serviceDefinition";
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ expect(mockReader.getAttributeValue(null, "promote")).andReturn(null);
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
replay(mockReader);
@@ -77,6 +75,7 @@
String name = "service";
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ expect(mockReader.getAttributeValue(null, "promote")).andReturn(null);
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
replay(mockReader);
@@ -90,10 +89,9 @@
String name = "serviceDefinition";
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ expect(mockReader.getAttributeValue(null, "promote")).andReturn("component/target");
expect(mockReader.next()).andReturn(START_ELEMENT);
- expect(mockReader.getName()).andReturn(BINDING);
expect(mockReader.next()).andReturn(START_ELEMENT);
- expect(mockReader.getName()).andReturn(BINDING);
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
replay(mockReader);
@@ -114,14 +112,9 @@
};
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ expect(mockReader.getAttributeValue(null, "promote")).andReturn(target);
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);
@@ -140,8 +133,8 @@
};
expect(mockReader.getName()).andReturn(SERVICE).anyTimes();
expect(mockReader.getAttributeValue(null, "name")).andReturn(name);
+ expect(mockReader.getAttributeValue(null, "promote")).andReturn(null);
expect(mockReader.next()).andReturn(START_ELEMENT);
- expect(mockReader.getName()).andReturn(INTERFACE_JAVA);
expect(mockRegistry.load(null, mockReader, deploymentContext)).andReturn(sc);
expect(mockReader.next()).andReturn(END_ELEMENT);
expect(mockReader.getName()).andReturn(SERVICE);
@@ -160,10 +153,7 @@
mockReader = EasyMock.createStrictMock(XMLStreamReader.class);
mockRegistry = EasyMock.createMock(LoaderRegistry.class);
loader = new ServiceLoader(mockRegistry);
- parent = EasyMock.createMock(Component.class);
componentId = URI.create(PARENT_NAME);
- EasyMock.expect(parent.getUri()).andReturn(componentId).atLeastOnce();
- EasyMock.replay(parent);
deploymentContext = EasyMock.createMock(DeploymentContext.class);
EasyMock.expect(deploymentContext.getComponentId()).andReturn(componentId);
EasyMock.replay(deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1-include.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1-include.scdl?view=diff&rev=511576&r1=511575&r2=511576
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1-include.scdl (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1-include.scdl Sun Feb 25 11:18:14 2007
@@ -25,9 +25,8 @@
<system:implementation.system class="org.apache.tuscany.core.mock.component.BasicInterfaceImpl"/>
</component>
- <service name="service2" >
+ <service name="service2" promote = "component2">
<interface.java interface="org.apache.tuscany.core.mock.component.BasicInterface"/>
- <reference>component2</reference>
</service>
</composite>
Modified: incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl?view=diff&rev=511576&r1=511575&r2=511576
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot1.scdl Sun Feb 25 11:18:14 2007
@@ -20,9 +20,8 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
name="boot1">
- <service name="service">
+ <service name="service" promote = "component">
<interface.java interface="org.apache.tuscany.core.mock.component.BasicInterface"/>
- <reference>component</reference>
</service>
<component name="component">
Modified: incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl?view=diff&rev=511576&r1=511575&r2=511576
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/resources/org/apache/tuscany/core/deployer/boot2.scdl Sun Feb 25 11:18:14 2007
@@ -26,9 +26,8 @@
name="boot2">
<!-- expose Deployer API as a service -->
- <service name="deployer">
+ <service name="deployer" promote="deployerImpl">
<interface.java interface="org.apache.tuscany.spi.deployer.Deployer"/>
- <reference>deployerImpl</reference>
</service>
<!-- Component that provides the Deployer service -->
Added: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingPromoteException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingPromoteException.java?view=auto&rev=511576
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingPromoteException.java (added)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingPromoteException.java Sun Feb 25 11:18:14 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.tuscany.spi.loader;
+
+/**
+ * Denotes a missing promote attribute in a SCDL configuration
+ *
+ * @version $Rev$ $Date$
+ */
+public class MissingPromoteException extends LoaderException {
+
+ public MissingPromoteException(String message, String identifier) {
+ super(message, identifier);
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingPromoteException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/MissingPromoteException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org