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 2006/05/23 00:25:57 UTC

svn commit: r408774 - in /incubator/tuscany/sandbox/jboynes/sca: containers/container.groovy/ containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ core2/src/main/java/org/apache/tuscany/core/services/wsdl/ spi/src/main/java/or...

Author: jmarino
Date: Mon May 22 15:25:56 2006
New Revision: 408774

URL: http://svn.apache.org/viewvc?rev=408774&view=rev
Log:
removal of resource loader; groovy container refactors

Added:
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentType.java
Removed:
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/common/
Modified:
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/pom.xml
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyImplementation.java
    incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/pom.xml?rev=408774&r1=408773&r2=408774&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/pom.xml Mon May 22 15:25:56 2006
@@ -31,11 +31,16 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany</groupId>
+            <artifactId>tuscany-spi</artifactId>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>groovy</groupId>
             <artifactId>groovy</artifactId>

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java?rev=408774&r1=408773&r2=408774&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicContext.java Mon May 22 15:25:56 2006
@@ -17,33 +17,36 @@
 package org.apache.tuscany.container.groovy;
 
 import java.lang.reflect.Method;
-import java.net.URI;
 import java.util.Collections;
 import java.util.List;
 
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyObject;
+import org.apache.tuscany.model.Scope;
 import org.apache.tuscany.spi.ObjectCreationException;
+import org.apache.tuscany.spi.context.CompositeContext;
 import org.apache.tuscany.spi.context.InstanceWrapper;
 import org.apache.tuscany.spi.context.TargetException;
 import org.apache.tuscany.spi.extension.AtomicContextExtension;
-import org.apache.tuscany.spi.wire.SourceWire;
 import org.apache.tuscany.spi.wire.TargetInvoker;
-import groovy.lang.GroovyObject;
+import org.codehaus.groovy.control.CompilationFailedException;
 
 /**
  * Groovy atomic component context.
  */
 public class GroovyAtomicContext extends AtomicContextExtension {
 
-    private URI script;
+    private String script;
     private List<Class<?>> services;
 
-    public GroovyAtomicContext(String name, URI script, List<Class<?>>services) {
-        this.name = name;
+    public GroovyAtomicContext(String name, String script, List<Class<?>>services, Scope scope, CompositeContext parent) {
+        super(name,parent);
         this.script = script;
         this.services = services;
+        this.scope = scope;
     }
 
-    public URI getScript() {
+    public String getScript() {
         return script;
     }
 
@@ -52,30 +55,45 @@
     }
 
     public TargetInvoker createTargetInvoker(String serviceName, Method method) {
-        return new GroovyInvoker(method.getName(),this);
+        return new GroovyInvoker(method.getName(), this);
     }
 
     public InstanceWrapper createInstance() throws ObjectCreationException {
-        return new GroovyInstanceWrapper(name, script);
+        ClassLoader parent = getClass().getClassLoader();
+        GroovyClassLoader loader = new GroovyClassLoader(parent);
+        try {
+            Class groovyClass = loader.parseClass(script);
+            return new GroovyInstanceWrapper(this, (GroovyObject) groovyClass.newInstance());
+        } catch (CompilationFailedException e) {
+            throw new ObjectCreationException(e);
+        } catch (IllegalAccessException e) {
+            throw new ObjectCreationException(e);
+        } catch (InstantiationException e) {
+            throw new ObjectCreationException(e);
+        }
     }
 
     @SuppressWarnings("unchecked")
-    public GroovyObject getTargetInstance() throws TargetException {
-        return (GroovyObject)scopeContext.getInstance(this);
+    public GroovyObject getTargetInstance
+            () throws TargetException {
+        return (GroovyObject) scopeContext.getInstance(this);
     }
 
-    public Object getService() throws TargetException {
+    public Object getService
+            () throws TargetException {
         return getTargetInstance();
     }
 
-    public Object getService(String s) throws TargetException {
+    public Object getService
+            (String
+                    s) throws TargetException {
         return getTargetInstance();
     }
 
     public void init(Object instance) throws TargetException {
-        GroovyObject object = (GroovyObject)instance;
+        //GroovyObject object = (GroovyObject) instance;
         //for (SourceWire wire : sourceWires) {
-            // wire from the groovy script to targets
+        // wire from the groovy script to targets
         //    object.setProperty(wire.getReferenceName(), wire.getTargetService());
         //}
     }

Added: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java?rev=408774&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java Mon May 22 15:25:56 2006
@@ -0,0 +1,35 @@
+package org.apache.tuscany.container.groovy;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.tuscany.model.Component;
+import org.apache.tuscany.model.Scope;
+import org.apache.tuscany.model.Service;
+import org.apache.tuscany.spi.builder.BuilderConfigException;
+import org.apache.tuscany.spi.context.ComponentContext;
+import org.apache.tuscany.spi.context.CompositeContext;
+import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
+
+/**
+ * @version $$Rev$$ $$Date$$
+ */
+public class GroovyComponentBuilder extends ComponentBuilderExtension<GroovyImplementation> {
+
+    protected Class<GroovyImplementation> getImplementationType() {
+        return GroovyImplementation.class;
+    }
+
+    public ComponentContext build(CompositeContext parent, Component<GroovyImplementation> component) throws BuilderConfigException {
+        List<Class<?>> services = new ArrayList<Class<?>>();
+        Collection<Service> collection = component.getImplementation().getComponentType().getServices().values();
+        for (Service service : collection) {
+            services.add(service.getServiceContract().getInterface());
+        }
+        String script = component.getImplementation().getScript();
+        String name = component.getName();
+        Scope scope = component.getImplementation().getComponentType().getLifecycleScope();
+        return new GroovyAtomicContext(name, script, services, scope, parent);
+    }
+}

Added: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentType.java?rev=408774&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentType.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentType.java Mon May 22 15:25:56 2006
@@ -0,0 +1,20 @@
+package org.apache.tuscany.container.groovy;
+
+import org.apache.tuscany.model.ComponentType;
+import org.apache.tuscany.model.Scope;
+
+/**
+ * @version $$Rev$$ $$Date$$
+ */
+public class GroovyComponentType extends ComponentType {
+    private Scope lifecycleScope;
+    
+    public Scope getLifecycleScope() {
+        return lifecycleScope;
+    }
+
+    public void setLifecycleScope(Scope lifecycleScope) {
+        this.lifecycleScope = lifecycleScope;
+    }
+
+}

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyImplementation.java?rev=408774&r1=408773&r2=408774&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyImplementation.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyImplementation.java Mon May 22 15:25:56 2006
@@ -19,27 +19,26 @@
 import java.net.URI;
 
 import org.apache.tuscany.model.AtomicImplementation;
-import org.apache.tuscany.model.ComponentType;
 
 /**
  * Meta-information for the Groovy implementation.
  */
-public class GroovyImplementation extends AtomicImplementation<ComponentType> {
+public class GroovyImplementation extends AtomicImplementation<GroovyComponentType> {
 
-    // Full path of the script file to be executed
-    private URI script;
+   //the script source to be executed
+    private String script;
 
     /**
-     * Returns the path of the script file to be executed.
+     * Returns the script source to be executed.
      */
-    public URI getScript() {
+    public String getScript() {
         return script;
     }
 
     /**
      * Sets the path of the script file to be executed.
      */
-    public void setScript(URI script) {
+    public void setScript(String script) {
         this.script = script;
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java?rev=408774&r1=408773&r2=408774&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInstanceWrapper.java Mon May 22 15:25:56 2006
@@ -1,16 +1,10 @@
 package org.apache.tuscany.container.groovy;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-
-import groovy.lang.GroovyClassLoader;
 import groovy.lang.GroovyObject;
 import org.apache.tuscany.spi.AbstractLifecycle;
 import org.apache.tuscany.spi.CoreRuntimeException;
-import org.apache.tuscany.spi.context.ContextRuntimeException;
+import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.context.InstanceWrapper;
-import org.codehaus.groovy.control.CompilationFailedException;
 
 /**
  * @version $$Rev$$ $$Date$$
@@ -18,12 +12,13 @@
 public class GroovyInstanceWrapper extends AbstractLifecycle implements InstanceWrapper {
 
     private int lifecycleState = UNINITIALIZED;
-    private URI script; // pointer to the script
+    private GroovyAtomicContext context;
     private GroovyObject groovyObject;
 
-    public GroovyInstanceWrapper(String name, URI script) {
-        super(name);
-        this.script = script;
+
+    public GroovyInstanceWrapper(GroovyAtomicContext context, GroovyObject groovyObject) {
+        this.context = context;
+        this.groovyObject = groovyObject;
     }
 
     public Object getInstance() {
@@ -35,26 +30,13 @@
     }
 
     public void start() throws CoreRuntimeException {
-        ClassLoader parent = getClass().getClassLoader();
-        GroovyClassLoader loader = new GroovyClassLoader(parent);
         try {
-            Class groovyClass = loader.parseClass(new File(script));
-            groovyObject = (GroovyObject) groovyClass.newInstance();
+            context.init(groovyObject);
             lifecycleState = STARTED;
-        } catch (CompilationFailedException e) {
-            lifecycleState = ERROR;
-            throw new ContextRuntimeException(e);
-        } catch (IOException e) {
+        } catch (ObjectCreationException e) {
             lifecycleState = ERROR;
-            throw new ContextRuntimeException(e);
-        } catch (IllegalAccessException e) {
-            lifecycleState = ERROR;
-            throw new ContextRuntimeException(e);
-        } catch (InstantiationException e) {
-            lifecycleState = ERROR;
-            throw new ContextRuntimeException(e);
+            throw e;
         }
-
     }
 
     public void stop() throws CoreRuntimeException {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java?rev=408774&r1=408773&r2=408774&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java Mon May 22 15:25:56 2006
@@ -25,8 +25,6 @@
 import javax.wsdl.extensions.ExtensionRegistry;
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.common.resource.ResourceLoader;
-
 /**
  * @version $Rev$ $Date$
  */



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org