9 files changed, 347 insertions, 0 deletions
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
new file mode 100644
index 0000000000..77dab193b9
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.groovy;
+
+import java.net.URL;
+
+/**
+ * GroovyArtifact holds the URL to the Groovy script.
+ *
+ * @version $Rev$ $Date$
+ */
+public class GroovyArtifact {
+
+    private URL artifactURL;
+
+    public GroovyArtifact(URL artifactURL) {
+        this.artifactURL = artifactURL;
+    }
+
+    public URL getArtifactURL() {
+        return artifactURL;
+    }
+
+}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
new file mode 100644
index 0000000000..4b7df4d9f8
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.groovy;
+
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.monitor.Monitor;
+
+/**
+ * A URLArtifactProcessor for Groovy scripts
+ *
+ * @version $Rev$ $Date$
+ */
+public class GroovyArtifactProcessor implements URLArtifactProcessor<GroovyArtifact> {
+
+    public GroovyArtifactProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
+    }
+
+    public GroovyArtifact read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException {
+        return new GroovyArtifact(artifactURL);
+    }
+
+    public String getArtifactType() {
+        return ".groovy";
+    }
+
+    public Class<GroovyArtifact> getModelType() {
+        return GroovyArtifact.class;
+    }
+
+    public void resolve(GroovyArtifact groovyModel, ModelResolver arg1) throws ContributionResolveException {
+    }
+
+}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
new file mode 100644
index 0000000000..82fe0326df
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.groovy;
+
+import groovy.lang.GroovyClassLoader;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * A ModelResolver that compiles Groovy scripts into the contribution 
+ * class loader so they can be used just like a regular java class.
+ *
+ * @version $Rev$ $Date$
+ */
+public class GroovyModelResolver implements ModelResolver {
+
+    protected ModelResolver modelresolver;
+    protected Contribution contribution;
+
+    public GroovyModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
+        modelresolver = contribution.getModelResolver();
+        this.contribution = contribution;
+    }
+
+    public void addModel(Object model) {
+        ClassLoader cl = contribution.getClassLoader();
+        if (!(cl instanceof GroovyClassLoader)) {
+            // replace the contribution class loader with a Groovy one
+        	// If the contribution does not have a ClassLoader, use this ClassLoader as parent
+        	if (cl == null) cl = this.getClass().getClassLoader();            
+            cl = new GroovyClassLoader(cl);
+            contribution.setClassLoader(cl);
+        }
+        try {
+
+            ((GroovyClassLoader)cl).parseClass(((GroovyArtifact)model).getArtifactURL().openStream());
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Object removeModel(Object arg0) {
+        return null;
+    }
+
+    public <T> T resolveModel(Class<T> arg0, T arg1) {
+        return null;
+    }
+}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
new file mode 100644
index 0000000000..f9dbee53bb
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License. 
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.contribution.groovy.GroovyArtifactProcessor;type=.groovy,model=org.apache.tuscany.sca.contribution.groovy.GroovyArtifact
+
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
new file mode 100644
index 0000000000..86434ac4bf
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License. 
+
+org.apache.tuscany.sca.contribution.groovy.GroovyModelResolver;model=org.apache.tuscany.sca.contribution.groovy.GroovyArtifact
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
new file mode 100644
index 0000000000..788c42f07d
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.contribution.groovy;
+
+/**
+ * HelloWorld Service interface used for testing.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface HelloWorld {
+
+    String sayHello(String s);
+
+}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
new file mode 100644
index 0000000000..02be3acd23
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.contribution.groovy;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Runs a distributed domain in a single VM by using and in memory implementation of the distributed domain
+ *
+ * @version $Rev$ $Date$
+ */
+public class HelloWorldTestCase {
+
+    private static HelloWorld helloWorld;
+    private static SCADomain scaDomain;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/contribution/groovy/helloworld.composite");
+        helloWorld = scaDomain.getService(HelloWorld.class, "HelloWolrdComponent");
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        if (scaDomain != null) {
+            scaDomain.close();
+        }
+    }
+
+    @Test
+    public void testCalculator() throws Exception {
+        Assert.assertEquals("Hello Petra", helloWorld.sayHello("Petra"));
+    }
+}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
new file mode 100644
index 0000000000..c172528538
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.contribution.groovy
+
+class HelloWorldImpl implements org.apache.tuscany.sca.contribution.groovy.HelloWorld {
+ 
+   String sayHello(String you) {
+      return "Hello $you"
+   }
+
+}
+\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
new file mode 100644
index 0000000000..0d4c17a15b
--- /dev/null
+++ b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://sample"
+           xmlns:sample="http://sample"
+           name="HelloWorld">
+
+    <component name="HelloWolrdComponent">
+		<implementation.java class="org.apache.tuscany.sca.contribution.groovy.HelloWorldImpl"/>
+    </component>
+
+</composite>