Author: isilval
Date: Mon Feb 26 05:37:19 2007
New Revision: 511802
URL: http://svn.apache.org/viewvc?view=rev&rev=511802
Log:
Remove CompositeComponent
Modified:
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationImplementationLoader.java
incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationComponentTestCase.java
incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/NotificationImplementationLoaderTestCase.java
Modified:
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java?view=diff&rev=511802&r1=511801&r2=511802
==============================================================================
---
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java
(original)
+++
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java
Mon Feb 26 05:37:19 2007
@@ -29,11 +29,8 @@
import org.apache.tuscany.spi.component.TargetResolutionException;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.extension.AtomicComponentExtension;
-import org.apache.tuscany.spi.extension.ExecutionMonitor;
import org.apache.tuscany.spi.extension.TargetInvokerExtension;
import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.services.work.WorkScheduler;
-import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.InvocationChain;
import org.apache.tuscany.spi.wire.InvocationRuntimeException;
import org.apache.tuscany.spi.wire.Message;
@@ -54,10 +51,8 @@
public LocalNotificationComponent(URI name,
ProxyService proxyService,
WorkContext workContext,
- WorkScheduler workScheduler,
- ExecutionMonitor monitor,
int initLevel) {
- super(name, proxyService, workContext, workScheduler, monitor,
initLevel, -1L, -1L);
+ super(name, proxyService, workContext, initLevel, -1L, -1L);
wires = null;
}
@@ -74,7 +69,7 @@
public TargetInvoker createTargetInvoker(String targetName, Operation
operation)
throws TargetInvokerCreationException {
- return new LocalNotificationTargetInvoker(operation, workContext,
monitor);
+ return new LocalNotificationTargetInvoker(operation, workContext);
}
public List<Wire> getWires(String name) {
@@ -105,8 +100,8 @@
private List<InvocationChain> subscriberInvocationChains;
private Operation operation;
- public LocalNotificationTargetInvoker(Operation operation, WorkContext
wc, ExecutionMonitor mon) {
- super(wc, mon);
+ public LocalNotificationTargetInvoker(Operation operation, WorkContext
wc) {
+ super(wc);
this.subscriberInvocationChains = null;
this.operation = operation;
}
Modified:
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java?view=diff&rev=511802&r1=511801&r2=511802
==============================================================================
---
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java
(original)
+++
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java
Mon Feb 26 05:37:19 2007
@@ -20,7 +20,6 @@
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -37,14 +36,11 @@
}
@SuppressWarnings("unchecked")
- public Component build(CompositeComponent parent,
- ComponentDefinition<NotificationImplementation>
componentDefinition,
+ public Component build(ComponentDefinition<NotificationImplementation>
componentDefinition,
DeploymentContext deploymentContext) throws
BuilderConfigException {
return new LocalNotificationComponent(componentDefinition.getUri(),
proxyService,
workContext,
- workScheduler,
- monitor,
0);
}
}
Modified:
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java?view=diff&rev=511802&r1=511801&r2=511802
==============================================================================
---
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java
(original)
+++
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java
Mon Feb 26 05:37:19 2007
@@ -21,7 +21,6 @@
import java.net.URL;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -46,8 +45,7 @@
return NotificationImplementation.class;
}
- public void load(CompositeComponent parent,
- NotificationImplementation implementation,
+ public void load(NotificationImplementation implementation,
DeploymentContext deploymentContext) throws
LoaderException {
Class<?> implClass = this.getClass(); // FIXME Hack, for Java, this is
the implClass, Ruby uses the script class loader
URL resource =
implClass.getClassLoader().getResource(implementation.getComponentTypeName() +
".componentType");
@@ -55,15 +53,13 @@
if (resource == null) {
throw new LoaderException("Can't locate component type side file
for [" + implementation.getComponentTypeName() + "]");
} else {
- componentType = loadFromSidefile(parent, resource,
deploymentContext);
+ componentType = loadFromSidefile(resource, deploymentContext);
}
implementation.setComponentType(componentType);
}
- protected NotificationComponentType loadFromSidefile(CompositeComponent
parent,
- URL url,
- DeploymentContext
deploymentContext) throws LoaderException {
+ protected NotificationComponentType loadFromSidefile(URL url,
DeploymentContext deploymentContext) throws LoaderException {
NotificationComponentType componentType = new
NotificationComponentType();
- return (NotificationComponentType)loaderRegistry.load(parent,
componentType, url, ComponentType.class, deploymentContext);
+ return (NotificationComponentType)loaderRegistry.load(componentType,
url, ComponentType.class, deploymentContext);
}
}
Modified:
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationImplementationLoader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationImplementationLoader.java?view=diff&rev=511802&r1=511801&r2=511802
==============================================================================
---
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationImplementationLoader.java
(original)
+++
incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationImplementationLoader.java
Mon Feb 26 05:37:19 2007
@@ -23,7 +23,6 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -51,8 +50,7 @@
return IMPLEMENTATION_NOTIFICATION;
}
- public NotificationImplementation load(CompositeComponent parent,
- ModelObject object,
+ public NotificationImplementation load(ModelObject object,
XMLStreamReader reader,
DeploymentContext
deploymentContext) throws XMLStreamException,
LoaderException {
@@ -61,7 +59,7 @@
NotificationImplementation implementation = new
NotificationImplementation();
implementation.setComponentTypeName(componentTypeName);
- registry.loadComponentType(parent, implementation, deploymentContext);
+ registry.loadComponentType(implementation, deploymentContext);
LoaderUtil.skipToEndElement(reader);
return implementation;
}
Modified:
incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationComponentTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationComponentTestCase.java?view=diff&rev=511802&r1=511801&r2=511802
==============================================================================
---
incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationComponentTestCase.java
(original)
+++
incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationComponentTestCase.java
Mon Feb 26 05:37:19 2007
@@ -44,7 +44,7 @@
public void testLocalNotificationComponent() throws Exception {
URI name = URI.create("LocalNotificationComponentTest");
- LocalNotificationComponent nc = new LocalNotificationComponent(name,
null, null, null, null, 0);
+ LocalNotificationComponent nc = new LocalNotificationComponent(name,
null, null, 0);
Operation<Type> operation = new Operation<Type>("test", null, null,
null);
@@ -78,7 +78,7 @@
nc.attachWires(wires);
Message msg = EasyMock.createNiceMock(Message.class);
- EasyMock.expect(msg.getBody()).andReturn("msg").times(3);
+ EasyMock.expect(msg.getBody()).andReturn("msg").times(3); // once per
sub int + once in notif target invoker
EasyMock.replay(msg);
localNotificationInvoker.invoke(msg);
EasyMock.verify(msg);
Modified:
incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/NotificationImplementationLoaderTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/NotificationImplementationLoaderTestCase.java?view=diff&rev=511802&r1=511801&r2=511802
==============================================================================
---
incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/NotificationImplementationLoaderTestCase.java
(original)
+++
incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/NotificationImplementationLoaderTestCase.java
Mon Feb 26 05:37:19 2007
@@ -30,7 +30,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.loader.ComponentTypeLoader;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -49,8 +48,6 @@
public class NotificationImplementationLoaderTestCase extends TestCase {
public void testLoad() throws Exception {
- CompositeComponent parent =
EasyMock.createMock(CompositeComponent.class);
- EasyMock.replay(parent);
DeploymentContext deploymentContext =
EasyMock.createMock(DeploymentContext.class);
EasyMock.replay(deploymentContext);
@@ -67,7 +64,7 @@
EasyMock.replay(reader);
ModelObject modelObject = null;
- Implementation impl = implementationLoader.load(parent, modelObject,
reader, deploymentContext);
+ Implementation impl = implementationLoader.load(modelObject, reader,
deploymentContext);
Assert.assertNotNull(impl);
componentTypeLoader.stop();
@@ -89,15 +86,13 @@
public <T extends ModelObject> void unregisterLoader(QName element,
StAXElementLoader<T> loader) {
}
- public ModelObject load(CompositeComponent parent,
- ModelObject object,
+ public ModelObject load(ModelObject object,
XMLStreamReader reader,
DeploymentContext deploymentContext) throws
XMLStreamException, LoaderException {
return null;
}
- public <MO extends ModelObject> MO load(CompositeComponent parent,
- ModelObject object,
+ public <MO extends ModelObject> MO load(ModelObject object,
URL url,
Class<MO> type,
DeploymentContext ctx) throws
LoaderException {
@@ -113,8 +108,7 @@
}
@SuppressWarnings("unchecked")
- public <I extends Implementation<?>> void
loadComponentType(CompositeComponent parent,
- I
implementation,
+ public <I extends Implementation<?>> void loadComponentType(I
implementation,
DeploymentContext deploymentContext)
throws LoaderException {
Class<I> key = (Class<I>) implementation.getClass();
@@ -122,7 +116,7 @@
if (loader == null) {
throw new UnrecognizedComponentTypeException(key);
}
- loader.load(parent, implementation, deploymentContext);
+ loader.load(implementation, deploymentContext);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
