You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/05/07 08:21:05 UTC
svn commit: r404728 [1/2] - in /incubator/tuscany/java/sca:
containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/
containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/
containers/container.java/s...
Author: jsdelfino
Date: Sat May 6 23:20:58 2006
New Revision: 404728
URL: http://svn.apache.org/viewcvs?rev=404728&view=rev
Log:
Fix for TUSCANY-198 - renamed ComponentInfo back to ComponentType
Added:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentType.java (with props)
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ComponentTypeImpl.java (with props)
Removed:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/ComponentInfo.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ComponentInfoImpl.java
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicSessionScopeTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/SessionScopeLifecycleTestCase.java
incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/builder/JavaScriptContextFactoryBuilder.java
incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/loader/JavaScriptImplementationLoader.java
incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockAssemblyFactory.java
incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockModuleFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/config/ImplementationProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/system/SystemImplementationLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemAssemblyFactoryImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/assembly/impl/SystemModuleImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/AutowireProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/MonitorProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/processor/ParentContextProcessor.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/config/impl/CoreAnnotationsProcessingTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/ComponentTypeLoaderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/runtime/RuntimeContextImplTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/MonitorInjectionTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/impl/AssemblyVisitorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/AutowireTestCase.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/Implementation.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ComponentImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/CompositeImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ImplementationImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/SubsystemImpl.java
Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java Sat May 6 23:20:58 2006
@@ -58,7 +58,7 @@
.getDefaultConstructor(implClass), scope);
List<Injector> injectors = new ArrayList<Injector>();
- List<Object> elements = javaImpl.getComponentInfo().getExtensibilityElements();
+ List<Object> elements = javaImpl.getComponentType().getExtensibilityElements();
for (Object element : elements) {
if (element instanceof InitInvokerExtensibilityElement) {
InitInvokerExtensibilityElement invokerElement = (InitInvokerExtensibilityElement) element;
Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java Sat May 6 23:20:58 2006
@@ -38,7 +38,7 @@
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
import org.apache.tuscany.core.loader.assembly.AssemblyConstants;
import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
@@ -88,7 +88,7 @@
String typeName = reader.getAttributeValue(null, "class");
Class<?> implementationClass = getImplementationClass(loaderContext.getResourceLoader(), typeName);
javaImpl.setImplementationClass(implementationClass);
- javaImpl.setComponentInfo(loadComponentType(loaderContext, implementationClass));
+ javaImpl.setComponentType(loadComponentType(loaderContext, implementationClass));
return javaImpl;
}
@@ -105,7 +105,7 @@
}
}
- protected ComponentInfo loadComponentType(LoaderContext loaderContext, Class<?> implClass) throws ConfigurationLoadException, XMLStreamException {
+ protected ComponentType loadComponentType(LoaderContext loaderContext, Class<?> implClass) throws ConfigurationLoadException, XMLStreamException {
String baseName = JavaIntrospectionHelper.getBaseName(implClass);
URL sidefile = implClass.getResource(baseName + ".componentType");
if (sidefile == null) {
@@ -115,11 +115,11 @@
}
}
- protected ComponentInfo loadComponentTypeByIntrospection(Class<?> implClass) throws ConfigurationLoadException {
+ protected ComponentType loadComponentTypeByIntrospection(Class<?> implClass) throws ConfigurationLoadException {
return introspector.introspect(implClass);
}
- protected ComponentInfo loadComponentTypeFromSidefile(URL sidefile, LoaderContext loaderContext) throws SidefileLoadException {
+ protected ComponentType loadComponentTypeFromSidefile(URL sidefile, LoaderContext loaderContext) throws SidefileLoadException {
try {
XMLStreamReader reader;
InputStream is;
@@ -133,7 +133,7 @@
e.setResourceURI(sidefile.toString());
throw e;
}
- return (ComponentInfo) registry.load(reader, loaderContext);
+ return (ComponentType) registry.load(reader, loaderContext);
} finally {
try {
reader.close();
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/loader/JavaImplementationLoaderTestCase.java Sat May 6 23:20:58 2006
@@ -37,7 +37,7 @@
import org.apache.tuscany.core.loader.assembly.AssemblyConstants;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.AssemblyObject;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Property;
import org.apache.tuscany.model.assembly.Service;
@@ -46,10 +46,10 @@
*/
public class JavaImplementationLoaderTestCase extends TestCase {
private JavaImplementationLoader loader;
- private ComponentInfo mockType;
+ private ComponentType mockType;
public void testNakedHelloWorld() throws ConfigurationLoadException {
- ComponentInfo type = loader.loadComponentTypeByIntrospection(NakedHelloWorld.class);
+ ComponentType type = loader.loadComponentTypeByIntrospection(NakedHelloWorld.class);
Assert.assertNotNull(type);
Assert.assertEquals(1,type.getProperties().size());
Assert.assertTrue(type.getReferences().isEmpty());
@@ -62,12 +62,12 @@
StAXLoaderRegistry mockRegistry = new MockRegistry(mockType);
loader.setRegistry(mockRegistry);
URL sidefile = HelloWorldImpl.class.getResource("HelloWorldImpl.componentType");
- ComponentInfo type = loader.loadComponentTypeFromSidefile(sidefile, null);
+ ComponentType type = loader.loadComponentTypeFromSidefile(sidefile, null);
assertSame(mockType, type);
}
public void testHelloWorldWithFieldProperties() throws ConfigurationLoadException {
- ComponentInfo type = loader.loadComponentTypeByIntrospection(HelloWorldWithFieldProperties.class);
+ ComponentType type = loader.loadComponentTypeByIntrospection(HelloWorldWithFieldProperties.class);
type.initialize(null);
Assert.assertNotNull(type);
List<Property> props = type.getProperties();
@@ -95,16 +95,16 @@
protected void setUp() throws Exception {
super.setUp();
JavaAssemblyFactory factory = new JavaAssemblyFactoryImpl();
- mockType = factory.createComponentInfo();
+ mockType = factory.createComponentType();
loader = new JavaImplementationLoader();
loader.setFactory(factory);
}
private static class MockRegistry implements StAXLoaderRegistry {
- private final ComponentInfo mockType;
+ private final ComponentType mockType;
- public MockRegistry(ComponentInfo mockType) {
+ public MockRegistry(ComponentType mockType) {
this.mockType = mockType;
}
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/mock/MockFactory.java Sat May 6 23:20:58 2006
@@ -91,7 +91,7 @@
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.AtomicComponent;
import org.apache.tuscany.model.assembly.Component;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.ConfiguredReference;
import org.apache.tuscany.model.assembly.ConfiguredService;
import org.apache.tuscany.model.assembly.EntryPoint;
@@ -128,17 +128,17 @@
private static SystemAssemblyFactory systemFactory = new SystemAssemblyFactoryImpl();
private static AssemblyContext assemblyContext = new AssemblyContextImpl(null, null);
private static ComponentTypeIntrospector introspector;
- private static ComponentInfo systemComponentType;
- private static ComponentInfo compositeComponentType;
+ private static ComponentType systemComponentType;
+ private static ComponentType compositeComponentType;
- public static ComponentInfo getComponentType() throws ConfigurationLoadException {
+ public static ComponentType getComponentType() throws ConfigurationLoadException {
if (systemComponentType == null) {
systemComponentType = getIntrospector().introspect(SystemCompositeContextImpl.class);
}
return systemComponentType;
}
- public static ComponentInfo getCompositeComponentType() throws ConfigurationLoadException {
+ public static ComponentType getCompositeComponentType() throws ConfigurationLoadException {
if (compositeComponentType == null) {
compositeComponentType = getIntrospector().introspect(CompositeContextImpl.class);
}
@@ -162,7 +162,7 @@
public static AtomicComponent createComponent(String name, Class type, Scope scope) throws ConfigurationLoadException {
AtomicComponent sc = factory.createSimpleComponent();
JavaImplementation impl = factory.createJavaImplementation();
- impl.setComponentInfo(getIntrospector().introspect(type));
+ impl.setComponentType(getIntrospector().introspect(type));
impl.setImplementationClass(type);
sc.setImplementation(impl);
Service s = factory.createService();
@@ -170,7 +170,7 @@
ji.setInterface(type);
s.setServiceContract(ji);
ji.setScope(scope);
- impl.getComponentInfo().getServices().add(s);
+ impl.getComponentType().getServices().add(s);
sc.setName(name);
sc.setImplementation(impl);
return sc;
@@ -179,7 +179,7 @@
public static AtomicComponent createNonIntrospectedComponent(String name, Class service, Class type, Scope scope) throws ConfigurationLoadException {
AtomicComponent sc = factory.createSimpleComponent();
JavaImplementation impl = factory.createJavaImplementation();
- impl.setComponentInfo(factory.createComponentInfo());
+ impl.setComponentType(factory.createComponentType());
impl.setImplementationClass(type);
sc.setImplementation(impl);
Service s = factory.createService();
@@ -187,7 +187,7 @@
ji.setInterface(service);
s.setServiceContract(ji);
ji.setScope(scope);
- impl.getComponentInfo().getServices().add(s);
+ impl.getComponentType().getServices().add(s);
sc.setName(name);
sc.setImplementation(impl);
return sc;
@@ -207,10 +207,9 @@
JavaServiceContract ji = systemFactory.createJavaServiceContract();
s.setServiceContract(ji);
ji.setScope(Scope.AGGREGATE);
- //impl.setComponentInfo(systemFactory.createComponentInfo());
impl.setImplementationClass(CompositeContextImpl.class);
- impl.setComponentInfo(getCompositeComponentType());
- impl.getComponentInfo().getServices().add(s);
+ impl.setComponentType(getCompositeComponentType());
+ impl.getComponentType().getServices().add(s);
sc.setName(name);
sc.setImplementation(impl);
@@ -230,9 +229,8 @@
JavaServiceContract ji = systemFactory.createJavaServiceContract();
s.setServiceContract(ji);
ji.setScope(Scope.AGGREGATE);
- impl.setComponentInfo(getComponentType());
- //impl.setComponentInfo(systemFactory.createComponentInfo());
- impl.getComponentInfo().getServices().add(s);
+ impl.setComponentType(getComponentType());
+ impl.getComponentType().getServices().add(s);
sc.setName(name);
sc.setImplementation(impl);
return sc;
@@ -323,7 +321,7 @@
JavaServiceContract inter = factory.createJavaServiceContract();
inter.setInterface(GenericComponent.class);
ref.setServiceContract(inter);
- sourceComponent.getImplementation().getComponentInfo().getReferences().add(ref);
+ sourceComponent.getImplementation().getComponentType().getReferences().add(ref);
ConfiguredReference cref = factory.createConfiguredReference("setGenericComponent", "target");
cref.initialize(assemblyContext);
@@ -361,7 +359,7 @@
JavaServiceContract inter = factory.createJavaServiceContract();
inter.setInterface(HelloWorldService.class);
ref.setServiceContract(inter);
- sourceComponent.getImplementation().getComponentInfo().getReferences().add(ref);
+ sourceComponent.getImplementation().getComponentType().getReferences().add(ref);
ConfiguredReference cref = factory.createConfiguredReference(ref.getName(), "target");
cref.initialize(assemblyContext);
@@ -415,7 +413,7 @@
module.getEntryPoints().add(sourceEP);
module.getComponents().add(targetComponent);
module.setImplementationClass(CompositeContextImpl.class);
- module.setComponentInfo(getCompositeComponentType());
+ module.setComponentType(getCompositeComponentType());
module.initialize(assemblyContext);
return module;
}
@@ -479,7 +477,7 @@
AtomicComponent target = factory.createSimpleComponent();
target.setName("target");
JavaImplementation targetImpl = factory.createJavaImplementation();
- targetImpl.setComponentInfo(factory.createComponentInfo());
+ targetImpl.setComponentType(factory.createComponentType());
targetImpl.setImplementationClass(TargetImpl.class);
target.setImplementation(targetImpl);
Service targetService = factory.createService();
@@ -487,7 +485,7 @@
targetContract.setInterface(Target.class);
targetService.setServiceContract(targetContract);
targetService.setName("Target");
- targetImpl.getComponentInfo().getServices().add(targetService);
+ targetImpl.getComponentType().getServices().add(targetService);
targetContract.setScope(targetScope);
ConfiguredService cTargetService = factory.createConfiguredService();
cTargetService.setPort(targetService);
@@ -497,10 +495,10 @@
// create the source component
AtomicComponent source = factory.createSimpleComponent();
- ComponentInfo componentType = factory.createComponentInfo();
+ ComponentType componentType = factory.createComponentType();
source.setName("source");
JavaImplementation impl = factory.createJavaImplementation();
- impl.setComponentInfo(componentType);
+ impl.setComponentType(componentType);
impl.setImplementationClass(SourceImpl.class);
source.setImplementation(impl);
Service s = systemFactory.createService();
@@ -508,7 +506,7 @@
contract.setInterface(Source.class);
s.setServiceContract(contract);
contract.setScope(sourceScope);
- impl.getComponentInfo().getServices().add(s);
+ impl.getComponentType().getServices().add(s);
source.setImplementation(impl);
// wire source to target
@@ -583,7 +581,7 @@
AtomicComponent target = factory.createSimpleComponent();
target.setName("target");
JavaImplementation targetImpl = factory.createJavaImplementation();
- targetImpl.setComponentInfo(factory.createComponentInfo());
+ targetImpl.setComponentType(factory.createComponentType());
targetImpl.setImplementationClass(OtherTargetImpl.class);
target.setImplementation(targetImpl);
Service targetService = factory.createService();
@@ -591,7 +589,7 @@
targetContract.setInterface(OtherTarget.class);
targetService.setServiceContract(targetContract);
targetService.setName("Target");
- targetImpl.getComponentInfo().getServices().add(targetService);
+ targetImpl.getComponentType().getServices().add(targetService);
targetContract.setScope(targetScope);
ConfiguredService cTargetService = factory.createConfiguredService();
cTargetService.setPort(targetService);
@@ -601,10 +599,10 @@
// create the source component
AtomicComponent source = factory.createSimpleComponent();
- ComponentInfo componentType = factory.createComponentInfo();
+ ComponentType componentType = factory.createComponentType();
source.setName("source");
JavaImplementation impl = factory.createJavaImplementation();
- impl.setComponentInfo(componentType);
+ impl.setComponentType(componentType);
impl.setImplementationClass(SourceImpl.class);
source.setImplementation(impl);
Service s = systemFactory.createService();
@@ -612,7 +610,7 @@
contract.setInterface(Source.class);
s.setServiceContract(contract);
contract.setScope(sourceScope);
- impl.getComponentInfo().getServices().add(s);
+ impl.getComponentType().getServices().add(s);
source.setImplementation(impl);
// wire source to target
@@ -776,22 +774,22 @@
runtime.getSystemContext().registerModelObject(createSystemCompositeComponent(SYSTEM_CHILD));
SystemCompositeContext ctx = (SystemCompositeContext) runtime.getSystemContext().getContext(SYSTEM_CHILD);
Component comp = systemFactory.createSystemComponent(POLICY_BUILDER_REGISTRY, PolicyBuilderRegistry.class, DefaultPolicyBuilderRegistry.class, Scope.MODULE);
- comp.getImplementation().setComponentInfo(getIntrospector().introspect(DefaultPolicyBuilderRegistry.class));
+ comp.getImplementation().setComponentType(getIntrospector().introspect(DefaultPolicyBuilderRegistry.class));
ctx.registerModelObject(comp);
comp = systemFactory.createSystemComponent(MESSAGE_FACTORY, MessageFactory.class, MessageFactoryImpl.class, Scope.MODULE);
- comp.getImplementation().setComponentInfo(getIntrospector().introspect(MessageFactoryImpl.class));
+ comp.getImplementation().setComponentType(getIntrospector().introspect(MessageFactoryImpl.class));
ctx.registerModelObject(comp);
comp = systemFactory.createSystemComponent(PROXY_FACTORY_FACTORY, WireFactoryFactory.class, JDKWireFactoryFactory.class, Scope.MODULE);
- comp.getImplementation().setComponentInfo(getIntrospector().introspect(JDKWireFactoryFactory.class));
+ comp.getImplementation().setComponentType(getIntrospector().introspect(JDKWireFactoryFactory.class));
ctx.registerModelObject(comp);
comp = systemFactory.createSystemComponent(WIRE_FACTORY_SERVICE, org.apache.tuscany.core.wire.service.WireFactoryService.class, DefaultWireFactoryService.class, Scope.MODULE);
- comp.getImplementation().setComponentInfo(getIntrospector().introspect(DefaultWireFactoryService.class));
+ comp.getImplementation().setComponentType(getIntrospector().introspect(DefaultWireFactoryService.class));
ctx.registerModelObject(comp);
comp = systemFactory.createSystemComponent(JAVA_BUILDER, ContextFactoryBuilder.class, JavaContextFactoryBuilder.class, Scope.MODULE);
- comp.getImplementation().setComponentInfo(getIntrospector().introspect(JavaContextFactoryBuilder.class));
+ comp.getImplementation().setComponentType(getIntrospector().introspect(JavaContextFactoryBuilder.class));
ctx.registerModelObject(comp);
comp = systemFactory.createSystemComponent(JAVA_WIRE_BUILDER, WireBuilder.class, JavaTargetWireBuilder.class, Scope.MODULE);
- comp.getImplementation().setComponentInfo(getIntrospector().introspect(JavaTargetWireBuilder.class));
+ comp.getImplementation().setComponentType(getIntrospector().introspect(JavaTargetWireBuilder.class));
ctx.registerModelObject(comp);
ctx.publish(new ModuleStart(new Object()));
return runtime;
@@ -806,10 +804,10 @@
CompositeContext child = (CompositeContext) runtime.getSystemContext().getContext(MockFactory.SYSTEM_CHILD);
child.getContext(MockFactory.JAVA_BUILDER).getInstance(null);
Component comp = systemFactory.createSystemComponent(FOO_BUILDER, ContextFactoryBuilder.class, FooBindingBuilder.class, Scope.MODULE);
- comp.getImplementation().setComponentInfo(getIntrospector().introspect(FooBindingBuilder.class));
+ comp.getImplementation().setComponentType(getIntrospector().introspect(FooBindingBuilder.class));
child.registerModelObject(comp);
comp = systemFactory.createSystemComponent(FOO_WIRE_BUILDER, WireBuilder.class, FooBindingWireBuilder.class, Scope.MODULE);
- comp.getImplementation().setComponentInfo(getIntrospector().introspect(FooBindingWireBuilder.class));
+ comp.getImplementation().setComponentType(getIntrospector().introspect(FooBindingWireBuilder.class));
child.registerModelObject(comp);
// since the child context is already started, we need to manually retrieve the components to init them
Assert.assertNotNull(child.getContext(FOO_BUILDER).getInstance(null));
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicModuleScopeTestCase.java Sat May 6 23:20:58 2006
@@ -42,7 +42,7 @@
import org.apache.tuscany.core.wire.service.DefaultWireFactoryService;
import org.apache.tuscany.core.wire.service.WireFactoryService;
import org.apache.tuscany.model.assembly.AtomicComponent;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Scope;
/**
@@ -131,8 +131,8 @@
AtomicComponent component = MockFactory.createComponent(name, ModuleScopeInitDestroyComponent.class,
Scope.MODULE);
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ComponentInfo type = introspector.introspect(ModuleScopeInitDestroyComponent.class);
- component.getImplementation().setComponentInfo(type);
+ ComponentType type = introspector.introspect(ModuleScopeInitDestroyComponent.class);
+ component.getImplementation().setComponentType(type);
builder.build(component);
return (ContextFactory<Context>) component.getContextFactory();
}
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicSessionScopeTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicSessionScopeTestCase.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicSessionScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/BasicSessionScopeTestCase.java Sat May 6 23:20:58 2006
@@ -43,7 +43,7 @@
import org.apache.tuscany.core.wire.service.DefaultWireFactoryService;
import org.apache.tuscany.core.wire.service.WireFactoryService;
import org.apache.tuscany.model.assembly.AtomicComponent;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Scope;
/**
@@ -217,8 +217,8 @@
JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder(wireService);
AtomicComponent component = MockFactory.createComponent("TestService1", SessionScopeComponentImpl.class, Scope.SESSION);
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ComponentInfo type = introspector.introspect(SessionScopeComponentImpl.class);
- component.getImplementation().setComponentInfo(type);
+ ComponentType type = introspector.introspect(SessionScopeComponentImpl.class);
+ component.getImplementation().setComponentType(type);
builder.build(component);
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
configs.add((ContextFactory<Context>) component.getContextFactory());
@@ -230,8 +230,8 @@
JavaContextFactoryBuilder builder = new JavaContextFactoryBuilder(wireService);
AtomicComponent component = MockFactory.createComponent(name, SessionScopeInitDestroyComponent.class, Scope.SESSION);
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ComponentInfo type = introspector.introspect(SessionScopeInitDestroyComponent.class);
- component.getImplementation().setComponentInfo(type);
+ ComponentType type = introspector.introspect(SessionScopeInitDestroyComponent.class);
+ component.getImplementation().setComponentType(type);
builder.build(component);
return (ContextFactory<Context>) component.getContextFactory();
}
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/ModuleScopeLifecycleTestCase.java Sat May 6 23:20:58 2006
@@ -44,7 +44,7 @@
import org.apache.tuscany.core.wire.service.DefaultWireFactoryService;
import org.apache.tuscany.core.wire.service.WireFactoryService;
import org.apache.tuscany.model.assembly.AtomicComponent;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Scope;
/**
@@ -171,9 +171,9 @@
Scope.MODULE);
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ca[0].getImplementation().setComponentInfo(introspector.introspect(ModuleScopeInitDestroyComponent.class));
- ca[1].getImplementation().setComponentInfo(introspector.introspect(ModuleScopeInitOnlyComponent.class));
- ca[2].getImplementation().setComponentInfo(introspector.introspect(ModuleScopeDestroyOnlyComponent.class));
+ ca[0].getImplementation().setComponentType(introspector.introspect(ModuleScopeInitDestroyComponent.class));
+ ca[1].getImplementation().setComponentType(introspector.introspect(ModuleScopeInitOnlyComponent.class));
+ ca[2].getImplementation().setComponentType(introspector.introspect(ModuleScopeDestroyOnlyComponent.class));
for (AtomicComponent aCa : ca) {
builder.build(aCa);
configs.add((ContextFactory<Context>) aCa.getContextFactory());
@@ -191,9 +191,9 @@
Scope.MODULE);
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ComponentInfo type = introspector.introspect(OrderedInitPojo.class);
- ca[0].getImplementation().setComponentInfo(introspector.introspect(ModuleScopeEagerInitDestroyComponent.class));
- ca[1].getImplementation().setComponentInfo(introspector.introspect(ModuleScopeEagerInitComponent.class));
+ ComponentType type = introspector.introspect(OrderedInitPojo.class);
+ ca[0].getImplementation().setComponentType(introspector.introspect(ModuleScopeEagerInitDestroyComponent.class));
+ ca[1].getImplementation().setComponentType(introspector.introspect(ModuleScopeEagerInitComponent.class));
for (AtomicComponent aCa : ca) {
builder.build(aCa);
configs.add((ContextFactory<Context>) aCa.getContextFactory());
@@ -209,10 +209,10 @@
ca[2] = MockFactory.createComponent("three", OrderedInitPojo.class, Scope.MODULE);
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ComponentInfo type = introspector.introspect(OrderedInitPojo.class);
- ca[0].getImplementation().setComponentInfo(type);
- ca[1].getImplementation().setComponentInfo(type);
- ca[2].getImplementation().setComponentInfo(type);
+ ComponentType type = introspector.introspect(OrderedInitPojo.class);
+ ca[0].getImplementation().setComponentType(type);
+ ca[1].getImplementation().setComponentType(type);
+ ca[2].getImplementation().setComponentType(type);
for (AtomicComponent aCa : ca) {
builder.build(aCa);
configs.add((ContextFactory<Context>) aCa.getContextFactory());
@@ -227,10 +227,10 @@
ca[1] = MockFactory.createComponent("two", OrderedEagerInitPojo.class, Scope.MODULE);
ca[2] = MockFactory.createComponent("three", OrderedEagerInitPojo.class, Scope.MODULE);
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ComponentInfo type = introspector.introspect(OrderedEagerInitPojo.class);
- ca[0].getImplementation().setComponentInfo(type);
- ca[1].getImplementation().setComponentInfo(type);
- ca[2].getImplementation().setComponentInfo(type);
+ ComponentType type = introspector.introspect(OrderedEagerInitPojo.class);
+ ca[0].getImplementation().setComponentType(type);
+ ca[1].getImplementation().setComponentType(type);
+ ca[2].getImplementation().setComponentType(type);
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
for (AtomicComponent aCa : ca) {
builder.build(aCa);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/RequestScopeLifecycleTestCase.java Sat May 6 23:20:58 2006
@@ -41,7 +41,7 @@
import org.apache.tuscany.core.wire.service.DefaultWireFactoryService;
import org.apache.tuscany.core.wire.service.WireFactoryService;
import org.apache.tuscany.model.assembly.AtomicComponent;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Scope;
/**
@@ -125,9 +125,9 @@
ca[2] = MockFactory.createComponent("TestServiceDestroyOnly", RequestScopeDestroyOnlyComponent.class,
Scope.REQUEST);
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ca[0].getImplementation().setComponentInfo(introspector.introspect(RequestScopeInitDestroyComponent.class));
- ca[1].getImplementation().setComponentInfo(introspector.introspect(RequestScopeInitOnlyComponent.class));
- ca[2].getImplementation().setComponentInfo(introspector.introspect(RequestScopeDestroyOnlyComponent.class));
+ ca[0].getImplementation().setComponentType(introspector.introspect(RequestScopeInitDestroyComponent.class));
+ ca[1].getImplementation().setComponentType(introspector.introspect(RequestScopeInitOnlyComponent.class));
+ ca[2].getImplementation().setComponentType(introspector.introspect(RequestScopeDestroyOnlyComponent.class));
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
for (AtomicComponent aCa : ca) {
builder.build(aCa);
@@ -144,10 +144,10 @@
ca[1] = MockFactory.createComponent("two", RequestScopedOrderedInitPojo.class, Scope.REQUEST);
ca[2] = MockFactory.createComponent("three", RequestScopedOrderedInitPojo.class, Scope.REQUEST);
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ComponentInfo type = introspector.introspect(RequestScopedOrderedInitPojo.class);
- ca[0].getImplementation().setComponentInfo(type);
- ca[1].getImplementation().setComponentInfo(type);
- ca[2].getImplementation().setComponentInfo(type);
+ ComponentType type = introspector.introspect(RequestScopedOrderedInitPojo.class);
+ ca[0].getImplementation().setComponentType(type);
+ ca[1].getImplementation().setComponentType(type);
+ ca[2].getImplementation().setComponentType(type);
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
for (AtomicComponent aCa : ca) {
builder.build(aCa);
Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/SessionScopeLifecycleTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/SessionScopeLifecycleTestCase.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/SessionScopeLifecycleTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/scopes/SessionScopeLifecycleTestCase.java Sat May 6 23:20:58 2006
@@ -44,7 +44,7 @@
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.AtomicComponent;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
/**
* Lifecycle unit tests for the Http session scope container
@@ -135,9 +135,9 @@
ca[2] = MockFactory.createComponent("TestServiceDestroyOnly", SessionScopeDestroyOnlyComponent.class,
Scope.SESSION);
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ca[0].getImplementation().setComponentInfo(introspector.introspect(SessionScopeInitDestroyComponent.class));
- ca[1].getImplementation().setComponentInfo(introspector.introspect(SessionScopeInitOnlyComponent.class));
- ca[2].getImplementation().setComponentInfo(introspector.introspect(SessionScopeDestroyOnlyComponent.class));
+ ca[0].getImplementation().setComponentType(introspector.introspect(SessionScopeInitDestroyComponent.class));
+ ca[1].getImplementation().setComponentType(introspector.introspect(SessionScopeInitOnlyComponent.class));
+ ca[2].getImplementation().setComponentType(introspector.introspect(SessionScopeDestroyOnlyComponent.class));
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
for (AtomicComponent aCa : ca) {
builder.build(aCa);
@@ -154,10 +154,10 @@
ca[1] = MockFactory.createComponent("two", SessionScopedOrderedInitPojo.class, Scope.SESSION);
ca[2] = MockFactory.createComponent("three", SessionScopedOrderedInitPojo.class, Scope.SESSION);
ComponentTypeIntrospector introspector = MockFactory.getIntrospector();
- ComponentInfo type = introspector.introspect(SessionScopedOrderedInitPojo.class);
- ca[0].getImplementation().setComponentInfo(type);
- ca[1].getImplementation().setComponentInfo(type);
- ca[2].getImplementation().setComponentInfo(type);
+ ComponentType type = introspector.introspect(SessionScopedOrderedInitPojo.class);
+ ca[0].getImplementation().setComponentType(type);
+ ca[1].getImplementation().setComponentType(type);
+ ca[2].getImplementation().setComponentType(type);
List<ContextFactory<Context>> configs = new ArrayList<ContextFactory<Context>>();
for (AtomicComponent aCa : ca) {
builder.build(aCa);
Modified: incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/builder/JavaScriptContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/builder/JavaScriptContextFactoryBuilder.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/builder/JavaScriptContextFactoryBuilder.java (original)
+++ incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/builder/JavaScriptContextFactoryBuilder.java Sat May 6 23:20:58 2006
@@ -47,7 +47,7 @@
Map<String, Class> services = new HashMap<String, Class>();
Boolean isWSDLService = null;
- for (Service service : jsImplementation.getComponentInfo().getServices()) {
+ for (Service service : jsImplementation.getComponentType().getServices()) {
ServiceContract sc = service.getServiceContract();
if (sc instanceof WSDLServiceContract) {
if (isWSDLService != null && !isWSDLService.booleanValue()) {
@@ -64,7 +64,7 @@
}
Map<String, Object> defaultProperties = new HashMap<String, Object>();
- for (org.apache.tuscany.model.assembly.Property property : jsImplementation.getComponentInfo().getProperties()) {
+ for (org.apache.tuscany.model.assembly.Property property : jsImplementation.getComponentType().getProperties()) {
defaultProperties.put(property.getName(), property.getDefaultValue());
}
Modified: incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/loader/JavaScriptImplementationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/loader/JavaScriptImplementationLoader.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/loader/JavaScriptImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/containers/container.rhino/src/main/java/org/apache/tuscany/container/rhino/loader/JavaScriptImplementationLoader.java Sat May 6 23:20:58 2006
@@ -36,7 +36,7 @@
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
import org.apache.tuscany.core.loader.assembly.AssemblyConstants;
import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
@@ -76,10 +76,10 @@
public JavaScriptImplementation load(XMLStreamReader reader, LoaderContext loaderContext) throws XMLStreamException, ConfigurationLoadException {
String scriptFile = reader.getAttributeValue(null, "scriptFile");
String script = loadScript(scriptFile, loaderContext.getResourceLoader());
- ComponentInfo componentType = loadComponentType(scriptFile, loaderContext);
+ ComponentType componentType = loadComponentType(scriptFile, loaderContext);
JavaScriptImplementation jsImpl = new JavaScriptImplementation();
- jsImpl.setComponentInfo(componentType);
+ jsImpl.setComponentType(componentType);
jsImpl.setScriptFile(scriptFile);
jsImpl.setScript(script);
jsImpl.setResourceLoader(loaderContext.getResourceLoader());
@@ -116,7 +116,7 @@
}
}
- protected ComponentInfo loadComponentType(String scriptFile, LoaderContext loaderContext) throws SidefileLoadException, MissingResourceException{
+ protected ComponentType loadComponentType(String scriptFile, LoaderContext loaderContext) throws SidefileLoadException, MissingResourceException{
String sidefile = scriptFile.substring(0, scriptFile.lastIndexOf('.')) + ".componentType";
URL componentTypeFile = loaderContext.getResourceLoader().getResource(sidefile);
if (componentTypeFile == null) {
@@ -136,7 +136,7 @@
e.setResourceURI(componentTypeFile.toString());
throw e;
}
- return (ComponentInfo) registry.load(reader, loaderContext);
+ return (ComponentType) registry.load(reader, loaderContext);
} finally {
try {
reader.close();
Modified: incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockAssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockAssemblyFactory.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockAssemblyFactory.java Sat May 6 23:20:58 2006
@@ -59,7 +59,7 @@
public static AtomicComponent createComponent(String name, String scriptFile, Class type, Scope scope) {
AtomicComponent sc = factory.createSimpleComponent();
JavaScriptImplementation impl = new JavaScriptImplementation();
- impl.setComponentInfo(factory.createComponentInfo());
+ impl.setComponentType(factory.createComponentType());
impl.setScriptFile(scriptFile);
impl.setScript(readScript(type.getClassLoader().getResourceAsStream(scriptFile)));
impl.setResourceLoader(new ResourceLoaderImpl(type.getClassLoader()));
@@ -71,7 +71,7 @@
s.setServiceContract(contract);
contract.setScope(scope);
contract.setInterface(type);
- impl.getComponentInfo().getServices().add(s);
+ impl.getComponentType().getServices().add(s);
ConfiguredService cService = factory.createConfiguredService();
cService.setPort(s);
cService.initialize(new AssemblyContextImpl(null, null));
@@ -91,13 +91,12 @@
Module impl = systemFactory.createModule();
impl.setName(name);
sc.setImplementation(impl);
- impl.setComponentInfo(getIntrospector().introspect(claz));
+ impl.setComponentType(getIntrospector().introspect(claz));
Service s = systemFactory.createService();
JavaServiceContract ji = systemFactory.createJavaServiceContract();
s.setServiceContract(ji);
ji.setScope(scope);
- //impl.setComponentInfo(systemFactory.createComponentInfo());
- impl.getComponentInfo().getServices().add(s);
+ impl.getComponentType().getServices().add(s);
sc.setName(name);
sc.setImplementation(impl);
return sc;
Modified: incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockModuleFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockModuleFactory.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockModuleFactory.java (original)
+++ incubator/tuscany/java/sca/containers/container.rhino/src/test/java/org/apache/tuscany/container/rhino/mock/MockModuleFactory.java Sat May 6 23:20:58 2006
@@ -66,7 +66,7 @@
JavaServiceContract inter = factory.createJavaServiceContract();
inter.setInterface(HelloWorldService.class);
ref.setServiceContract(inter);
- sourceComponent.getImplementation().getComponentInfo().getReferences().add(ref);
+ sourceComponent.getImplementation().getComponentType().getReferences().add(ref);
ConfiguredReference cref = factory.createConfiguredReference(ref.getName(), "target");
cref.initialize(assemblyContext);
sourceComponent.getConfiguredReferences().add(cref);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/ComponentTypeIntrospector.java Sat May 6 23:20:58 2006
@@ -16,7 +16,7 @@
*/
package org.apache.tuscany.core.config;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.core.extension.config.ImplementationProcessor;
/**
@@ -33,7 +33,7 @@
* @return a componentType definition
* @throws ConfigurationLoadException if the Class does not define a valid component type
*/
- ComponentInfo introspect(Class<?> implClass) throws ConfigurationLoadException;
+ ComponentType introspect(Class<?> implClass) throws ConfigurationLoadException;
/**
* Completes the given componentType definition by introspecting a Java Class.
@@ -42,7 +42,7 @@
* @return a componentType definition
* @throws ConfigurationLoadException if the Class does not define a valid component type
*/
- ComponentInfo introspect(Class<?> implClass, ComponentInfo compType) throws ConfigurationLoadException;
+ ComponentType introspect(Class<?> implClass, ComponentType compType) throws ConfigurationLoadException;
/**
* Registers an annotation processor
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/AbstractModuleComponentConfigurationLoader.java Sat May 6 23:20:58 2006
@@ -28,7 +28,7 @@
import org.apache.tuscany.model.assembly.Module;
import org.apache.tuscany.model.assembly.ModuleComponent;
import org.apache.tuscany.model.assembly.ModuleFragment;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import java.io.IOException;
import java.net.URL;
@@ -55,9 +55,9 @@
// JFM HACK
private ComponentTypeIntrospector introspector;
- private ComponentInfo systemType;
+ private ComponentType systemType;
- private ComponentInfo compositeType;
+ private ComponentType compositeType;
protected ComponentTypeIntrospector getIntrospector(){
if (introspector == null){
@@ -66,14 +66,14 @@
return introspector;
}
- protected ComponentInfo getSystemCompositeComponentType() throws ConfigurationLoadException {
+ protected ComponentType getSystemCompositeComponentType() throws ConfigurationLoadException {
if (systemType == null){
systemType = getIntrospector().introspect(SystemCompositeContextImpl.class);
}
return systemType;
}
- protected ComponentInfo getCompositeComponentType() throws ConfigurationLoadException {
+ protected ComponentType getCompositeComponentType() throws ConfigurationLoadException {
if (compositeType == null){
compositeType = getIntrospector().introspect(CompositeContextImpl.class);
}
@@ -91,7 +91,7 @@
ModuleComponent mc = loadModuleComponent(SYSTEM_MODULE_FILE_NAME, SYSTEM_FRAGMENT_FILE_NAME, name, uri);
//JFM HACK - this is completely gross since it overwrites existing component type
mc.getImplementation().setImplementationClass(SystemCompositeContextImpl.class);
- mc.getImplementation().setComponentInfo(getSystemCompositeComponentType());
+ mc.getImplementation().setComponentType(getSystemCompositeComponentType());
//END HACK
return mc;
}
@@ -100,7 +100,7 @@
ModuleComponent mc = loadModuleComponent(SCA_MODULE_FILE_NAME, SCA_FRAGMENT_FILE_NAME, name, uri);
//JFM HACK
mc.getImplementation().setImplementationClass(CompositeContextImpl.class);
- mc.getImplementation().setComponentInfo(getCompositeComponentType());
+ mc.getImplementation().setComponentType(getCompositeComponentType());
//END HACK
return mc;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/impl/Java5ComponentTypeIntrospector.java Sat May 6 23:20:58 2006
@@ -31,7 +31,7 @@
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.core.system.assembly.SystemAssemblyFactory;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.ComponentName;
@@ -82,17 +82,17 @@
/**
* Visits the given implementation type and calls back to {@link org.apache.tuscany.core.extension.config.ImplementationProcessor}s
- * registered with this introspector to build up a {@link ComponentInfo}
+ * registered with this introspector to build up a {@link ComponentType}
*
- * @return ComponentInfo representing the implementation type metadata
+ * @return ComponentType representing the implementation type metadata
* @throws ConfigurationLoadException if there is an error introspecting the implementation type
*/
- public ComponentInfo introspect(Class<?> implClass) throws ConfigurationLoadException {
- ComponentInfo compType = factory.createComponentInfo();
+ public ComponentType introspect(Class<?> implClass) throws ConfigurationLoadException {
+ ComponentType compType = factory.createComponentType();
return introspect(implClass, compType);
}
- public ComponentInfo introspect(Class<?> implClass, ComponentInfo compType) throws ConfigurationLoadException {
+ public ComponentType introspect(Class<?> implClass, ComponentType compType) throws ConfigurationLoadException {
for (ImplementationProcessor processor : processors) {
processor.visitClass(implClass, compType);
}
@@ -124,7 +124,7 @@
return compType;
}
- private void visitSuperClass(Class<?> superClass, ComponentInfo compType) throws ConfigurationLoadException {
+ private void visitSuperClass(Class<?> superClass, ComponentType compType) throws ConfigurationLoadException {
if (!Object.class.equals(superClass)) {
for (ImplementationProcessor processor : processors) {
processor.visitSuperClass(superClass, compType);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ComponentNameProcessor.java Sat May 6 23:20:58 2006
@@ -19,7 +19,7 @@
import org.apache.tuscany.core.extension.config.extensibility.ComponentNameExtensibilityElement;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.ComponentName;
/**
@@ -33,7 +33,7 @@
super(factory);
}
- public void visitMethod(Method method, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitMethod(Method method, ComponentType type) throws ConfigurationLoadException {
ComponentName name = method.getAnnotation(ComponentName.class);
if (name == null) {
return;
@@ -41,7 +41,7 @@
type.getExtensibilityElements().add(new ComponentNameExtensibilityElement(method));
}
- public void visitField(Field field, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitField(Field field, ComponentType type) throws ConfigurationLoadException {
ComponentName name = field.getAnnotation(ComponentName.class);
if (name == null) {
return;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ContextProcessor.java Sat May 6 23:20:58 2006
@@ -18,7 +18,7 @@
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.extension.config.extensibility.ContextExtensibilityElement;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.Context;
/**
@@ -31,7 +31,7 @@
public ContextProcessor() {
}
- public void visitMethod(Method method, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitMethod(Method method, ComponentType type) throws ConfigurationLoadException {
Context context = method.getAnnotation(Context.class);
if (context == null) {
return;
@@ -39,7 +39,7 @@
type.getExtensibilityElements().add(new ContextExtensibilityElement(method));
}
- public void visitField(Field field, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitField(Field field, ComponentType type) throws ConfigurationLoadException {
Context context = field.getAnnotation(Context.class);
if (context == null) {
return;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DefaultProcessor.java Sat May 6 23:20:58 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Property;
import org.apache.tuscany.model.assembly.Reference;
@@ -40,7 +40,7 @@
public DefaultProcessor() {
}
- public void visitEnd(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitEnd(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
// add any public/protected fields and public setter methods as properties
Set<Field> fields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(clazz);
List<Property> properties = type.getProperties();
@@ -102,7 +102,7 @@
return false;
}
- private void addProperty(String name, Class<?> propType, ComponentInfo type) {
+ private void addProperty(String name, Class<?> propType, ComponentType type) {
Property property = factory.createProperty();
property.setName(name);
property.setRequired(false);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/DestroyProcessor.java Sat May 6 23:20:58 2006
@@ -5,7 +5,7 @@
import org.apache.tuscany.core.extension.config.extensibility.DestroyInvokerExtensibilityElement;
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.Destroy;
/**
@@ -18,7 +18,7 @@
public DestroyProcessor() {
}
- public void visitMethod(Method method, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitMethod(Method method, ComponentType type) throws ConfigurationLoadException {
Destroy destroy = method.getAnnotation(Destroy.class);
if (destroy == null) {
return;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ImplementationProcessorSupport.java Sat May 6 23:20:58 2006
@@ -23,7 +23,7 @@
import org.apache.tuscany.core.extension.config.ImplementationProcessor;
import org.apache.tuscany.core.system.annotation.Autowire;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
@@ -61,42 +61,42 @@
}
- public void visitClass(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitClass(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
}
- public void visitSuperClass(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitSuperClass(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
}
- public void visitMethod(Method method, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitMethod(Method method, ComponentType type) throws ConfigurationLoadException {
}
- public void visitConstructor(Constructor<?> constructor, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitConstructor(Constructor<?> constructor, ComponentType type) throws ConfigurationLoadException {
}
- public void visitField(Field field, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitField(Field field, ComponentType type) throws ConfigurationLoadException {
}
- public void visitInterface(Class clazz, Annotation[] annotations, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitInterface(Class clazz, Annotation[] annotations, ComponentType type) throws ConfigurationLoadException {
}
- public void visitInterfaceMethod(Method method, Annotation[] annotations, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitInterfaceMethod(Method method, Annotation[] annotations, ComponentType type) throws ConfigurationLoadException {
}
- public void visitEnd(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitEnd(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
}
// /**
// * Creates a {@link JavaExtensibilityElement} subclasses may update while processing annotations
// */
-// protected JavaExtensibilityElement getExtensibilityElement(ComponentInfo type) {
+// protected JavaExtensibilityElement getExtensibilityElement(ComponentType type) {
// JavaExtensibilityElement element = (JavaExtensibilityElement) type.getExtensibilityElements().get(JAVA_ELEMENT);
// if (element == null) {
// element = new JavaExtensibilityElementImpl();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/InitProcessor.java Sat May 6 23:20:58 2006
@@ -17,7 +17,7 @@
import org.apache.tuscany.core.config.ConfigurationLoadException;
import org.apache.tuscany.core.extension.config.extensibility.InitInvokerExtensibilityElement;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.Init;
/**
@@ -30,7 +30,7 @@
public InitProcessor() {
}
- public void visitMethod(Method method, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitMethod(Method method, ComponentType type) throws ConfigurationLoadException {
Init init = method.getAnnotation(Init.class);
if (init == null) {
return;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyProcessor.java Sat May 6 23:20:58 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.core.config.InvalidSetterException;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Property;
import org.osoa.sca.annotations.Scope;
@@ -41,7 +41,7 @@
}
@Override
- public void visitMethod(Method method, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitMethod(Method method, ComponentType type) throws ConfigurationLoadException {
if (method.getDeclaringClass().equals(Object.class)) {
return;
}
@@ -73,7 +73,7 @@
}
@Override
- public void visitField(Field field, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitField(Field field, ComponentType type) throws ConfigurationLoadException {
if (field.getDeclaringClass().equals(Object.class)) {
return;
}
@@ -93,7 +93,7 @@
}
}
- private void addProperty(String name, Class<?> propType, boolean required, ComponentInfo type) {
+ private void addProperty(String name, Class<?> propType, boolean required, ComponentType type) {
Property property = factory.createProperty();
property.setName(name);
property.setRequired(required);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/PropertyReferenceValidator.java Sat May 6 23:20:58 2006
@@ -22,7 +22,7 @@
import org.apache.tuscany.core.config.MetaDataException;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
@@ -38,7 +38,7 @@
super(factory);
}
- public void visitEnd(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitEnd(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
// validate methods do not contain both @Reference and @Property annotations
Method[] methods = clazz.getMethods();
boolean found;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ReferenceProcessor.java Sat May 6 23:20:58 2006
@@ -22,7 +22,7 @@
import org.apache.tuscany.core.config.InvalidSetterException;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Multiplicity;
import org.apache.tuscany.model.assembly.Reference;
import org.apache.tuscany.model.assembly.ServiceContract;
@@ -44,7 +44,7 @@
}
@Override
- public void visitMethod(Method method, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitMethod(Method method, ComponentType type) throws ConfigurationLoadException {
if(method.getDeclaringClass().equals(Object.class)){
return;
}
@@ -80,7 +80,7 @@
}
@Override
- public void visitField(Field field, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitField(Field field, ComponentType type) throws ConfigurationLoadException {
if(field.getDeclaringClass().equals(Object.class)){
return;
}
@@ -100,7 +100,7 @@
}
}
- private void addReference(String name, Class<?> paramType, boolean required, ComponentInfo type) {
+ private void addReference(String name, Class<?> paramType, boolean required, ComponentType type) {
Reference reference = factory.createReference();
reference.setName(name);
ServiceContract contract = factory.createJavaServiceContract();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ScopeProcessor.java Sat May 6 23:20:58 2006
@@ -14,7 +14,7 @@
package org.apache.tuscany.core.config.processor;
import org.apache.tuscany.core.config.ConfigurationLoadException;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.Service;
@@ -29,7 +29,7 @@
}
@Override
- public void visitEnd(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitEnd(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
Scope scope = null;
org.osoa.sca.annotations.Scope annotation = clazz.getAnnotation(org.osoa.sca.annotations.Scope.class);
if (annotation != null) {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/config/processor/ServiceProcessor.java Sat May 6 23:20:58 2006
@@ -19,7 +19,7 @@
import org.apache.tuscany.core.config.InvalidMetaDataException;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.ComponentInfo;
+import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.Scope;
import org.apache.tuscany.model.assembly.Service;
import org.apache.tuscany.model.types.java.JavaServiceContract;
@@ -40,7 +40,7 @@
}
@Override
- public void visitClass(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitClass(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
if (!clazz.isInterface()) {
processImplementation(clazz,type);
} else {
@@ -48,7 +48,7 @@
}
}
- private void processImplementation(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ private void processImplementation(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
// visiting the base implementation class
List<org.apache.tuscany.model.assembly.Service> services = type.getServices();
Class[] interfaces = clazz.getInterfaces();
@@ -83,7 +83,7 @@
@Override
- public void visitEnd(Class<?> clazz, ComponentInfo type) throws ConfigurationLoadException {
+ public void visitEnd(Class<?> clazz, ComponentType type) throws ConfigurationLoadException {
List<Service> services = type.getServices();
if (services.size() == 0) {
// no services processed so the class is the service
@@ -91,7 +91,7 @@
}
}
- private void processInterface(Class<?> clazz, ComponentInfo type) {
+ private void processInterface(Class<?> clazz, ComponentType type) {
List<org.apache.tuscany.model.assembly.Service> services = type.getServices();
// the interface is a remotable service, add it
org.osoa.sca.annotations.Remotable remotableAnnotation = clazz.getAnnotation(org.osoa.sca.annotations.Remotable.class);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java Sat May 6 23:20:58 2006
@@ -723,7 +723,7 @@
}
private void registerAutowire(Component component) {
- for (Service service : component.getImplementation().getComponentInfo().getServices()) {
+ for (Service service : component.getImplementation().getComponentType().getServices()) {
Class interfaze = service.getServiceContract().getInterface();
ScopeContext scopeCtx = scopeContexts.get(service.getServiceContract().getScope());
registerAutowireInternal(interfaze, component.getName(), scopeCtx);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java?rev=404728&r1=404727&r2=404728&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java Sat May 6 23:20:58 2006
@@ -90,7 +90,7 @@
return;
}
Component<T> component = (Component<T>) modelObject;
- List<Service> services = component.getImplementation().getComponentInfo().getServices();
+ List<Service> services = component.getImplementation().getComponentType().getServices();
Scope previous = null;
Scope scope = Scope.INSTANCE;
for (Service service : services) {