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 04:07:01 UTC
svn commit: r511418 - in /incubator/tuscany/java/sca/runtime:
itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/
standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launch...
Author: jmarino
Date: Sat Feb 24 19:07:00 2007
New Revision: 511418
URL: http://svn.apache.org/viewvc?view=rev&rev=511418
Log:
changes to support removal of parent during introspection and deployment
Modified:
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/ImplementationJUnitLoader.java
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java
incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentTypeLoader.java
incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java
incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentTypeLoader.java
incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedLoader.java
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/ImplementationJUnitLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/ImplementationJUnitLoader.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/ImplementationJUnitLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/ImplementationJUnitLoader.java Sat Feb 24 19:07:00 2007
@@ -22,7 +22,6 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -44,10 +43,10 @@
return JUNIT;
}
- public ImplementationJUnit load(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public ImplementationJUnit load(
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
String className = reader.getAttributeValue(null, "class");
return new ImplementationJUnit(className);
}
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentBuilder.java Sat Feb 24 19:07:00 2007
@@ -26,7 +26,6 @@
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
import org.apache.tuscany.spi.host.ResourceHost;
@@ -60,15 +59,13 @@
}
@SuppressWarnings("unchecked")
- public AtomicComponent build(Component parent,
- ComponentDefinition<ImplementationJUnit> definition,
- DeploymentContext deployment) throws BuilderConfigException {
+ public AtomicComponent build(ComponentDefinition<ImplementationJUnit> definition, DeploymentContext deployment)
+ throws BuilderConfigException {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType =
definition.getImplementation().getComponentType();
Class<?> implClass = componentType.getImplClass();
PojoConfiguration configuration = new PojoConfiguration();
- configuration.setParent(parent);
if (definition.getInitLevel() != null) {
configuration.setInitLevel(definition.getInitLevel());
} else {
@@ -132,7 +129,7 @@
handleProperties(definition, component);
// handle resources
- handleResources(componentType, component, parent);
+ handleResources(componentType, component);
handleCallbackSites(componentType, configuration);
@@ -161,8 +158,8 @@
@SuppressWarnings({"unchecked"})
private void handleResources(
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType,
- JavaAtomicComponent component,
- Component parent) {
+ JavaAtomicComponent component) {
+
for (Resource resource : componentType.getResources().values()) {
ObjectFactory<?> objectFactory = resource.getObjectFactory();
if (objectFactory != null) {
Modified: incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentTypeLoader.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/itest/plugin/src/main/java/org/apache/tuscany/sca/plugin/itest/implementation/junit/JUnitComponentTypeLoader.java Sat Feb 24 19:07:00 2007
@@ -21,16 +21,15 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
-import java.util.Map;
+import java.net.URI;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.Collections;
-import java.net.URI;
+import java.util.Map;
import org.osoa.sca.annotations.Constructor;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.implementation.java.IntrospectionRegistry;
@@ -43,9 +42,9 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.MissingResourceException;
+import org.apache.tuscany.spi.model.DataType;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.model.DataType;
/**
* @version $Rev$ $Date$
@@ -54,7 +53,7 @@
private static final URI TEST_SERVICE_NAME = URI.create("#testService");
private Introspector introspector;
- @Constructor({"registry", "introspector"})
+ @Constructor
public JUnitComponentTypeLoader(@Autowire LoaderRegistry loaderRegistry,
@Autowire IntrospectionRegistry introspector) {
super(loaderRegistry);
@@ -66,27 +65,24 @@
return ImplementationJUnit.class;
}
- public void load(Component parent,
- ImplementationJUnit implementation,
- DeploymentContext deploymentContext) throws LoaderException {
+ public void load(ImplementationJUnit implementation, DeploymentContext context) throws LoaderException {
String className = implementation.getClassName();
Class<?> implClass;
try {
- implClass = deploymentContext.getClassLoader().loadClass(className);
+ implClass = context.getClassLoader().loadClass(className);
} catch (ClassNotFoundException e) {
throw new MissingResourceException(className, e);
}
- PojoComponentType componentType = loadByIntrospection(parent, implementation, deploymentContext, implClass);
+ PojoComponentType componentType = loadByIntrospection(implementation, context, implClass);
implementation.setComponentType(componentType);
}
- protected PojoComponentType loadByIntrospection(Component parent,
- ImplementationJUnit implementation,
+ protected PojoComponentType loadByIntrospection(ImplementationJUnit implementation,
DeploymentContext deploymentContext,
Class<?> implClass) throws ProcessingException {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>(implClass);
- introspector.introspect(parent, implClass, componentType, deploymentContext);
+ introspector.introspect(implClass, componentType, deploymentContext);
if (componentType.getInitMethod() == null) {
componentType.setInitMethod(getCallback(implClass, "setUp"));
@@ -117,6 +113,7 @@
private static final DataType<List<DataType<Type>>> INPUT_TYPE;
private static final DataType<Type> OUTPUT_TYPE;
private static final List<DataType<Type>> FAULT_TYPE;
+
static {
List<DataType<Type>> paramDataTypes = Collections.emptyList();
INPUT_TYPE = new DataType<List<DataType<Type>>>("idl:input", Object[].class, paramDataTypes);
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentBuilder.java Sat Feb 24 19:07:00 2007
@@ -22,11 +22,6 @@
import java.lang.reflect.Member;
import java.lang.reflect.Method;
-import org.apache.tuscany.core.implementation.PojoConfiguration;
-import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
-import org.apache.tuscany.core.injection.MethodEventInvoker;
-import org.apache.tuscany.core.injection.PojoObjectFactory;
-import org.apache.tuscany.core.injection.ResourceObjectFactory;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BuilderConfigException;
@@ -43,13 +38,18 @@
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.PropertyValue;
+import org.apache.tuscany.core.implementation.PojoConfiguration;
+import org.apache.tuscany.core.implementation.java.JavaAtomicComponent;
+import org.apache.tuscany.core.injection.MethodEventInvoker;
+import org.apache.tuscany.core.injection.PojoObjectFactory;
+import org.apache.tuscany.core.injection.ResourceObjectFactory;
+
/**
* @version $Revsion$ $Date$
- *
- * TODO This is a straight copy from the JUnit component builder
- *
+ * <p/>
+ * TODO This is a straight copy from the JUnit component builder
*/
-public class LaunchedComponentBuilder extends ComponentBuilderExtension<Launched>{
+public class LaunchedComponentBuilder extends ComponentBuilderExtension<Launched> {
private ResourceHost host;
@@ -63,15 +63,14 @@
return Launched.class;
}
- public Component build(Component parent,
- ComponentDefinition<Launched> definition,
- DeploymentContext deployment) throws BuilderConfigException {
+ @SuppressWarnings({"unchecked"})
+ public Component build(ComponentDefinition<Launched> definition, DeploymentContext deployment)
+ throws BuilderConfigException {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType =
definition.getImplementation().getComponentType();
Class<?> implClass = componentType.getImplClass();
PojoConfiguration configuration = new PojoConfiguration();
- configuration.setParent(parent);
if (definition.getInitLevel() != null) {
configuration.setInitLevel(definition.getInitLevel());
} else {
@@ -135,7 +134,7 @@
handleProperties(definition, component);
// handle resources
- handleResources(componentType, component, parent);
+ handleResources(componentType, component);
handleCallbackSites(componentType, configuration);
@@ -164,8 +163,8 @@
@SuppressWarnings({"unchecked"})
private void handleResources(
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType,
- JavaAtomicComponent component,
- Component parent) {
+ JavaAtomicComponent component) {
+
for (Resource resource : componentType.getResources().values()) {
ObjectFactory<?> objectFactory = resource.getObjectFactory();
if (objectFactory != null) {
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentTypeLoader.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedComponentTypeLoader.java Sat Feb 24 19:07:00 2007
@@ -27,7 +27,6 @@
import java.util.Map;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.implementation.java.IntrospectionRegistry;
@@ -46,12 +45,11 @@
/**
* @version $Revision$ $Date$
- *
*/
-public class LaunchedComponentTypeLoader extends ComponentTypeLoaderExtension<Launched>{
- private static final URI SERVICE_NAME = URI.create("#main");
+public class LaunchedComponentTypeLoader extends ComponentTypeLoaderExtension<Launched> {
+ private static final URI SERVICE_NAME = URI.create("#main");
private Introspector introspector;
-
+
public LaunchedComponentTypeLoader(@Autowire LoaderRegistry loaderRegistry,
@Autowire IntrospectionRegistry introspector) {
super(loaderRegistry);
@@ -63,9 +61,9 @@
return Launched.class;
}
- public void load(Component parent,
- Launched implementation,
- DeploymentContext deploymentContext) throws LoaderException {
+ public void load(
+ Launched implementation,
+ DeploymentContext deploymentContext) throws LoaderException {
String className = implementation.getClassName();
Class<?> implClass;
try {
@@ -73,17 +71,17 @@
} catch (ClassNotFoundException e) {
throw new MissingResourceException(className, e);
}
- PojoComponentType componentType = loadByIntrospection(parent, implementation, deploymentContext, implClass);
+ PojoComponentType componentType = loadByIntrospection(implementation, deploymentContext, implClass);
implementation.setComponentType(componentType);
}
- protected PojoComponentType loadByIntrospection(Component parent,
- Launched implementation,
- DeploymentContext deploymentContext,
- Class<?> implClass) throws ProcessingException {
+ protected PojoComponentType loadByIntrospection(
+ Launched implementation,
+ DeploymentContext deploymentContext,
+ Class<?> implClass) throws ProcessingException {
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType =
new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>(implClass);
- introspector.introspect(parent, implClass, componentType, deploymentContext);
+ introspector.introspect(implClass, componentType, deploymentContext);
ServiceContract launchedContract = generateContract(implClass);
JavaMappedService testService = new JavaMappedService(SERVICE_NAME, launchedContract, false);
@@ -94,14 +92,16 @@
private static final DataType<List<DataType<Type>>> INPUT_TYPE;
private static final DataType<Type> OUTPUT_TYPE;
private static final List<DataType<Type>> FAULT_TYPE;
+
static {
List<DataType<Type>> paramDataTypes = new ArrayList<DataType<Type>>();
+ //noinspection unchecked
paramDataTypes.add(new DataType(null, String[].class, String[].class));
INPUT_TYPE = new DataType<List<DataType<Type>>>("idl:input", Object[].class, paramDataTypes);
OUTPUT_TYPE = new DataType<Type>(null, Object.class, Object.class);
FAULT_TYPE = Collections.emptyList();
}
-
+
protected ServiceContract generateContract(Class<?> implClass) {
Map<String, Operation<Type>> operations = new HashMap<String, Operation<Type>>();
Operation<Type> operation = new Operation<Type>("main", INPUT_TYPE, OUTPUT_TYPE, FAULT_TYPE);
Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedLoader.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/implementation/launched/LaunchedLoader.java Sat Feb 24 19:07:00 2007
@@ -23,7 +23,6 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -44,10 +43,10 @@
return LAUNCHED;
}
- public Launched load(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public Launched load(
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
String className = reader.getAttributeValue(null, "class");
String factoryName = reader.getAttributeValue(null, "factory");
return new Launched(className, factoryName);
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java Sat Feb 24 19:07:00 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.runtime.webapp;
-import java.net.URI;
import javax.servlet.ServletContext;
import org.apache.tuscany.host.RuntimeInfo;
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappBuilder.java Sat Feb 24 19:07:00 2007
@@ -39,9 +39,9 @@
return WebappImplementation.class;
}
- public Component build(Component parent,
- ComponentDefinition<WebappImplementation> definition,
- DeploymentContext deploymentContext) throws BuilderException {
+ public Component build(ComponentDefinition<WebappImplementation> definition, DeploymentContext context)
+ throws BuilderException {
+
URI uri = definition.getUri();
WebappComponentType componentType = definition.getImplementation().getComponentType();
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java Sat Feb 24 19:07:00 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.runtime.webapp.implementation.webapp;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -38,9 +37,9 @@
return WebappImplementation.class;
}
- public void load(Component parent,
- WebappImplementation implementation,
- DeploymentContext deploymentContext)
+ public void load(
+ WebappImplementation implementation,
+ DeploymentContext deploymentContext)
throws LoaderException {
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java?view=diff&rev=511418&r1=511417&r2=511418
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java Sat Feb 24 19:07:00 2007
@@ -27,7 +27,6 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.idl.java.InterfaceJavaIntrospector;
@@ -60,10 +59,10 @@
return WEBAPP;
}
- public WebappImplementation load(Component parent,
- ModelObject object,
- XMLStreamReader reader,
- DeploymentContext deploymentContext)
+ public WebappImplementation load(
+ ModelObject object,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext)
throws XMLStreamException, LoaderException {
WebappComponentType componentType = new WebappComponentType();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org