You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/07/08 02:51:26 UTC
svn commit: r420025 - in /incubator/tuscany/sandbox/jboynes/sca:
commands/launcher/src/main/resources/META-INF/tuscany/
core2/src/main/java/org/apache/tuscany/core/deployer/
core2/src/main/java/org/apache/tuscany/core/implementation/
core2/src/main/jav...
Author: jboynes
Date: Fri Jul 7 17:51:25 2006
New Revision: 420025
URL: http://svn.apache.org/viewvc?rev=420025&view=rev
Log:
deploy application using system deployer rather than primordial one
Modified:
incubator/tuscany/sandbox/jboynes/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/ImplementationProcessorSupport.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
Modified: incubator/tuscany/sandbox/jboynes/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl?rev=420025&r1=420024&r2=420025&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/sandbox/jboynes/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl Fri Jul 7 17:51:25 2006
@@ -152,6 +152,9 @@
<component name="system.componentBuilder">
<system:implementation.system class="org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder"/>
</component>
+ <component name="system.compositeBuilder">
+ <system:implementation.system class="org.apache.tuscany.core.implementation.system.builder.SystemCompositeBuilder"/>
+ </component>
<!-- Java implementation type -->
<component name="java.implementationLoader">
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java?rev=420025&r1=420024&r2=420025&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java Fri Jul 7 17:51:25 2006
@@ -55,12 +55,15 @@
}
public DeployerImpl() {
+ xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
}
+/*
@Autowire
public void setXmlFactory(XMLInputFactory xmlFactory) {
this.xmlFactory = xmlFactory;
}
+*/
//FIXME allow autowire to register multiple service types
@Autowire
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/ImplementationProcessorSupport.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/ImplementationProcessorSupport.java?rev=420025&r1=420024&r2=420025&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/ImplementationProcessorSupport.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/ImplementationProcessorSupport.java Fri Jul 7 17:51:25 2006
@@ -17,6 +17,10 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+
+import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -26,6 +30,22 @@
* @version $Rev$ $Date$
*/
public abstract class ImplementationProcessorSupport implements ImplementationProcessor {
+ private IntrospectionRegistry registry;
+
+ @Autowire
+ public void setRegistry(IntrospectionRegistry registry) {
+ this.registry = registry;
+ }
+
+ @Init(eager = true)
+ public void init() {
+ registry.registerProcessor(this);
+ }
+
+ @Destroy
+ public void destroy() {
+ registry.unregisterProcessor(this);
+ }
public void visitClass(CompositeComponent<?> parent, Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java?rev=420025&r1=420024&r2=420025&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java Fri Jul 7 17:51:25 2006
@@ -23,8 +23,8 @@
import org.apache.tuscany.core.util.JavaIntrospectionHelper;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
import org.apache.tuscany.spi.builder.BuilderConfigException;
-import org.apache.tuscany.spi.builder.ComponentBuilder;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -39,7 +39,11 @@
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemComponentBuilder implements ComponentBuilder<SystemImplementation> {
+public class SystemComponentBuilder extends ComponentBuilderExtension<SystemImplementation> {
+
+ protected Class<SystemImplementation> getImplementationType() {
+ return SystemImplementation.class;
+ }
public AtomicComponent<?> build(CompositeComponent<?> parent,
ComponentDefinition<SystemImplementation> definition,
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java?rev=420025&r1=420024&r2=420025&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java Fri Jul 7 17:51:25 2006
@@ -20,7 +20,6 @@
import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponent;
import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponentImpl;
import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.builder.BuilderRegistry;
import org.apache.tuscany.spi.component.Component;
@@ -40,8 +39,6 @@
* @version $Rev$ $Date$
*/
public class SystemCompositeBuilder extends ComponentBuilderExtension<SystemCompositeImplementation> {
- private BuilderRegistry builderRegistry;
-
public SystemCompositeBuilder() {
}
@@ -51,11 +48,6 @@
protected Class<SystemCompositeImplementation> getImplementationType() {
return SystemCompositeImplementation.class;
- }
-
- @Autowire
- public void setBuilderRegistry(BuilderRegistry builderRegistry) {
- this.builderRegistry = builderRegistry;
}
public Component<?> build(CompositeComponent<?> parent,
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java?rev=420025&r1=420024&r2=420025&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java Fri Jul 7 17:51:25 2006
@@ -162,9 +162,7 @@
System.out.println("Starting system component");
composite.start();
- // todo get the deployer from the system component
- deployer = bootDeployer;
-// deployer = (Deployer) composite.getChild("deployer").getServiceInstance();
+ deployer = (Deployer) composite.getChild("deployer").getServiceInstance();
return composite;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?rev=420025&r1=420024&r2=420025&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Fri Jul 7 17:51:25 2006
@@ -90,7 +90,9 @@
return loader.load(parent, reader, deploymentContext);
}
- public <MO extends ModelObject> MO load(CompositeComponent parent, URL url, Class<MO> type,
+ public <MO extends ModelObject> MO load(CompositeComponent parent,
+ URL url,
+ Class<MO> type,
DeploymentContext ctx) throws LoaderException {
try {
XMLStreamReader reader;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org