Create branch for 2.0 beta2 release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1040693 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 681 insertions, 0 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
new file mode 100644
index 0000000000..f1c1c36934
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
@@ -0,0 +1,38 @@
+/*
+ * 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.implementation.widget;
+
+import java.io.InputStream;
+
+import org.apache.tuscany.sca.data.collection.Collection;
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The service interface of widget implementations. This is not an API for application
+ * developers. Application developers should use the data collection API to invoke
+ * widget components.
+ * 
+ * @version $Rev$ $Date$
+ */
+
+@Remotable
+public interface Widget extends Collection<String, InputStream> {
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
new file mode 100644
index 0000000000..d032d3ca8d
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
@@ -0,0 +1,59 @@
+/*
+ * 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.implementation.widget;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Implementation;
+
+
+/**
+ * The model representing a widget implementation in an SCA assembly model.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface WidgetImplementation extends Implementation {
+    QName TYPE = new QName(SCA11_TUSCANY_NS, "implementation.widget");
+    
+    /**
+     * Returns the location of the HTML file representing the Widget
+     * @return the location
+     */
+    String getLocation();
+
+    /**
+     * Set the location of the HTML file representing the Widget
+     * @param location
+     */
+    void setLocation(String location);
+
+    /**
+     * Returns the Location URL for the HTML file representing the Widget
+     * @return the location
+     */
+    URL getLocationURL();
+    
+    /**
+     * Set the Location URL for the HTML file representing the Widget 
+     * @param url the location
+     */
+    void setLocationURL(URL url);
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
new file mode 100644
index 0000000000..74addf1e39
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
@@ -0,0 +1,35 @@
+/*
+ * 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.implementation.widget;
+
+/**
+ * Factory for the widget implementation model.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface WidgetImplementationFactory {
+    
+    /**
+     * Create a Widget Implementation model object
+     * @return
+     */
+    WidgetImplementation createWidgetImplementation();
+    
+}
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
new file mode 100644
index 0000000000..9bf8c05d73
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
@@ -0,0 +1,150 @@
+/*
+ * 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.implementation.widget;
+
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Scanner;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.assembly.Reference;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+
+/**
+ * A HTML Widget Introspector used to introspect references and property
+ * annotations in JavaScript code
+ * 
+ * @version $Rev$ $Date$
+ */
+class WidgetImplementationIntrospector {
+    private static final String WEB_REFERENCE_ANNOTATION = "//@Reference";
+    private static final String WEB_PROPERTY_ANNOTATION = "//@Property";
+    
+    private AssemblyFactory assemblyFactory;
+    private WidgetImplementation widgetImplementation;
+    
+    WidgetImplementationIntrospector(ExtensionPointRegistry registry, WidgetImplementation widgetImplementation ) {
+        FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
+        this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        this.widgetImplementation = widgetImplementation;
+    }
+    
+    
+    /**
+     * Introspect and populate a given widget implementation
+     */
+    public void introspectImplementation() {
+        URL htmlWidget = widgetImplementation.getLocationURL();
+        
+        try {
+            URLConnection connection = htmlWidget.openConnection();
+            connection.setUseCaches(false);
+            Scanner scanner = new Scanner(connection.getInputStream());
+            while(scanner.hasNextLine()) {
+                String line = scanner.nextLine();
+                if(line.contains(WEB_PROPERTY_ANNOTATION)) {
+                	//process the next line, as it has the property info
+                	if (scanner.hasNextLine()) {
+                		Property property = processPropertyScript(scanner.nextLine());
+                		if (property != null) {
+                			widgetImplementation.getProperties().add(property);
+                		}
+                	}
+                	
+                } else if(line.contains(WEB_REFERENCE_ANNOTATION)) {
+                    //process the next line, as it has the reference info
+                    if (scanner.hasNextLine()) {
+                        Reference reference = processReferenceScript(scanner.nextLine());
+                        if(reference != null){
+                        	widgetImplementation.getReferences().add(reference);
+                        }
+                        
+                    }
+                }
+            }
+            
+        } catch(Exception e) {
+            
+        }
+        
+    	
+    }
+    
+    
+    /**
+     * Process Property declaration in JavaScript code
+     * Supported ways:
+     *    //@Property
+     *    var locale = Property("locale");
+     *    
+     *    //@Property
+     *    locale = Property("locale");
+     *    
+     * @param scriptContent
+     * @return
+     */
+    private Property processPropertyScript(String scriptContent) {
+    	Property property = null;
+        String propertyName = null;
+        
+        String tokens[] = scriptContent.split("=");
+        tokens = tokens[0].split(" ");
+        propertyName = tokens[tokens.length -1];
+        
+        if(propertyName != null) {
+            property = assemblyFactory.createProperty();
+            property.setName(propertyName);     
+        }
+        
+        return property;
+    }
+    
+    /**
+     * Process Reference declaration in JavaScript code
+     * Supported ways :
+     *    //@Reference
+     *    var catalog = new Reference("catalog");
+     *    
+     *    //@Reference
+     *    catalog = new Reference("catalog");
+     *    
+     * @param scriptContent
+     * @return
+     */
+    private Reference processReferenceScript(String scriptContent) {
+        Reference reference = null;
+        String referenceName = null;
+        
+        String tokens[] = scriptContent.split("=");
+        
+        // find the string between the quotes
+        tokens = tokens[1].split("\"");
+        referenceName = tokens[1];
+        
+        if(referenceName != null) {
+            reference = assemblyFactory.createReference();
+            reference.setName(referenceName);            
+        }
+        
+        return reference;
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
new file mode 100644
index 0000000000..bf84a15aa6
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
@@ -0,0 +1,188 @@
+/*
+ * 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.implementation.widget;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+
+import java.io.IOException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.ContributionFactory;
+import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+
+/**
+ *
+ * Implements a StAX artifact processor for Widget implementations.
+ *
+ * @version $Rev$ $Date$
+ */
+public class WidgetImplementationProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WidgetImplementation> {
+    private ExtensionPointRegistry registry;
+    private ContributionFactory contributionFactory;
+    private WidgetImplementationFactory implementationFactory;
+
+    public WidgetImplementationProcessor(ExtensionPointRegistry registry) {
+        this.registry = registry;
+        FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
+        contributionFactory = modelFactories.getFactory(ContributionFactory.class);
+        implementationFactory = modelFactories.getFactory(WidgetImplementationFactory.class);
+    }
+ 
+
+    public QName getArtifactType() {
+        // Returns the QName of the XML element processed by this processor
+        return WidgetImplementation.TYPE;
+    }
+
+    public Class<WidgetImplementation> getModelType() {
+        // Returns the type of model processed by this processor
+        return WidgetImplementation.class;
+    }
+
+    public WidgetImplementation read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
+
+        // Read an <implementation.widget> element
+
+        // Create and initialize the resource implementation model
+        WidgetImplementation implementation = null;
+
+        // Read the location attribute specifying the location of the resources
+        String location = getURIString(reader, "location");
+        if (location != null) {
+            implementation = implementationFactory.createWidgetImplementation();
+            implementation.setLocation(location);
+            implementation.setUnresolved(true);
+        } else {
+            error(context.getMonitor(), "LocationAttributeMissing", reader);
+            //throw new ContributionReadException(MSG_LOCATION_MISSING);
+        }
+
+        // Skip to end element
+        while (reader.hasNext()) {
+            if (reader.next() == END_ELEMENT && WidgetImplementation.TYPE.equals(reader.getName())) {
+                break;
+            }
+        }
+
+        return implementation;
+    }
+
+    public void resolve(WidgetImplementation implementation, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
+
+    	if (implementation != null) {
+    		// Resolve the resource directory location
+            Artifact artifact = contributionFactory.createArtifact();
+            artifact.setURI(implementation.getLocation());
+            Artifact resolved = resolver.resolveModel(Artifact.class, artifact, context);
+            if (resolved.getLocation() != null) {
+                try {
+                    implementation.setLocationURL(new URL(resolved.getLocation()));
+
+                    //introspect implementation
+                    WidgetImplementationIntrospector widgetIntrospector =
+                    	new WidgetImplementationIntrospector(registry, implementation);
+                    widgetIntrospector.introspectImplementation();
+
+                    implementation.setUnresolved(false);
+                } catch (IOException e) {
+                	ContributionResolveException ce = new ContributionResolveException(e);
+                	error(context.getMonitor(), "ContributionResolveException", resolver, ce);
+                    //throw ce;
+                }
+            } else {
+                error(context.getMonitor(), "CouldNotResolveLocation", resolver, implementation.getLocation());
+                //throw new ContributionResolveException("Could not resolve implementation.widget location: " + implementation.getLocation());
+            }
+    	}
+    }
+
+    public void write(WidgetImplementation implementation, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
+        // Write <implementation.widget>        
+        writeStart(writer, WidgetImplementation.TYPE.getNamespaceURI(), WidgetImplementation.TYPE.getLocalPart());
+
+        if (implementation.getLocation() != null) {
+            writer.writeAttribute("location", implementation.getLocation());
+        }
+
+        writeEnd(writer);
+    }
+    
+    /**
+     * Utility methods
+     */
+    
+    
+    /**
+     * Report a error.
+     *
+     * @param problems
+     * @param message
+     * @param model
+     */
+    private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "impl-widget-validation-messages",
+                                      Severity.ERROR,
+                                      model,
+                                      message,
+                                      (Object[])messageParameters);
+            monitor.problem(problem);
+        }
+    }
+
+    /**
+     * Report a exception.
+     *
+     * @param problems
+     * @param message
+     * @param model
+     */
+    private void error(Monitor monitor, String message, Object model, Exception ex) {
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "impl-widget-validation-messages",
+                                      Severity.ERROR,
+                                      model,
+                                      message,
+                                      ex);
+            monitor.problem(problem);
+        }
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java
new file mode 100644
index 0000000000..960a01d07e
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java
@@ -0,0 +1,43 @@
+/*
+ * 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.implementation.widget.impl;
+
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
+import org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory;
+
+/**
+ * Factory for the widget implementation model.
+ *
+ * @version $Rev$ $Date$
+ */
+public class WidgetImplementationFactoryImpl implements WidgetImplementationFactory {
+    
+    private ExtensionPointRegistry registry;
+    
+    public WidgetImplementationFactoryImpl(ExtensionPointRegistry registry) {
+        this.registry = registry;
+    }
+
+    public WidgetImplementation createWidgetImplementation() {
+        return new WidgetImplementationImpl(registry);
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
new file mode 100644
index 0000000000..58edfdd3ba
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
@@ -0,0 +1,134 @@
+/*
+ * 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.implementation.widget.impl;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.implementation.widget.Widget;
+import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
+
+
+/**
+ * The model representing a widget implementation in an SCA assembly model.
+ *
+ * @version $Rev$ $Date$
+ */
+public class WidgetImplementationImpl extends ImplementationImpl implements WidgetImplementation {
+    private Service widgetService;
+
+    private String location;
+    private URL locationUrl;
+
+    /**
+     * Constructs a new resource implementation.
+     */
+    WidgetImplementationImpl(ExtensionPointRegistry registry) {
+        
+        super(TYPE);
+        
+        FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
+        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        JavaInterfaceFactory javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
+        
+        // Resource implementation always provide a single service exposing
+        // the Resource interface, and have no references and properties
+        widgetService = assemblyFactory.createService();
+        widgetService.setName("Widget");
+        
+        // Create the Java interface contract for the Resource service
+        JavaInterface javaInterface;
+        try {
+            javaInterface = javaFactory.createJavaInterface(Widget.class);
+        } catch (InvalidInterfaceException e) {
+            throw new IllegalArgumentException(e);
+        }
+        JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
+        interfaceContract.setInterface(javaInterface);
+        widgetService.setInterfaceContract(interfaceContract);
+        
+        this.getServices().add(widgetService);
+    }
+
+    public QName getType() {
+        return TYPE;
+    }
+    
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public URL getLocationURL() {
+        return locationUrl;
+    }
+    
+    public void setLocationURL(URL url) {
+        this.locationUrl = url;
+    }
+
+    
+    @Override
+    public String toString() {
+        return "Widget : " + getLocation(); 
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + ((location == null) ? 0 : location.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (!(obj instanceof WidgetImplementationImpl)) {
+            return false;
+        }
+        WidgetImplementationImpl other = (WidgetImplementationImpl)obj;
+        if (location == null) {
+            if (other.location != null) {
+                return false;
+            }
+        } else if (!location.equals(other.location)) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/javascript/WidgetImplementationJavascriptProvider.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/javascript/WidgetImplementationJavascriptProvider.java
new file mode 100644
index 0000000000..55cf7dbf0e
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/javascript/WidgetImplementationJavascriptProvider.java
@@ -0,0 +1,34 @@
+/*
+ * 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.implementation.widget.javascript;
+
+import org.apache.tuscany.sca.core.ModuleActivator;
+
+
+/**
+ * A widget javascript provider which 
+ * provides dojo and tuscany dojo extensions 
+ * to an application using implementation.widget
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface WidgetImplementationJavascriptProvider extends ModuleActivator {
+
+}