You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/09/03 06:00:00 UTC
svn commit: r810774 - in /tuscany/branches/sca-java-1.x/modules:
implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/
implementation-widget-runtime/src/main/resources/META-INF/services/
implementation-widget/sr...
Author: lresende
Date: Thu Sep 3 03:59:59 2009
New Revision: 810774
URL: http://svn.apache.org/viewvc?rev=810774&view=rev
Log:
TUSCANY-3247 - Making interfaces and instantiatng widget factory via extension point mechanism
Added:
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java
- copied, changed from r810726, tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
- copied, changed from r810726, tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
- copied, changed from r810726, tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
Removed:
tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
Modified:
tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
Copied: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java (from r810726, tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java?p2=tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java&p1=tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java&r1=810726&r2=810774&rev=810774&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java Thu Sep 3 03:59:59 2009
@@ -17,10 +17,11 @@
* under the License.
*/
-package org.apache.tuscany.sca.implementation.widget;
+package org.apache.tuscany.sca.implementation.widget.impl;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
/**
@@ -28,18 +29,18 @@
*
* @version $Rev$ $Date$
*/
-public class WidgetImplementationFactory {
+public class WidgetImplementationFactoryImpl implements WidgetImplementationFactory {
private AssemblyFactory assemblyFactory;
private JavaInterfaceFactory javaFactory;
- public WidgetImplementationFactory(ModelFactoryExtensionPoint modelFactories) {
+ public WidgetImplementationFactoryImpl(ModelFactoryExtensionPoint modelFactories) {
assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
}
- public WidgetImplementation createWidgetImplementation() {
- return new WidgetImplementation(assemblyFactory, javaFactory);
+ public WidgetImplementationImpl createWidgetImplementation() {
+ return new WidgetImplementationImpl(assemblyFactory, javaFactory);
}
}
Copied: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java (from r810726, tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java?p2=tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java&p1=tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java&r1=810726&r2=810774&rev=810774&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java Thu Sep 3 03:59:59 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.widget;
+package org.apache.tuscany.sca.implementation.widget.impl;
import java.net.URL;
import java.util.ArrayList;
@@ -25,10 +25,11 @@
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
+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;
@@ -40,7 +41,7 @@
*
* @version $Rev$ $Date$
*/
-public class WidgetImplementation implements Implementation {
+public class WidgetImplementationImpl implements WidgetImplementation {
private Service widgetService;
private List<Reference> references = new ArrayList<Reference>();
private List<Property> properties = new ArrayList<Property>();
@@ -52,7 +53,7 @@
/**
* Constructs a new resource implementation.
*/
- WidgetImplementation(AssemblyFactory assemblyFactory,
+ WidgetImplementationImpl(AssemblyFactory assemblyFactory,
JavaInterfaceFactory javaFactory) {
// Resource implementation always provide a single service exposing
Copied: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory (from r810726, tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory?p2=tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory&p1=tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory&r1=810726&r2=810774&rev=810774&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory Thu Sep 3 03:59:59 2009
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for model factory
-org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
+org.apache.tuscany.sca.implementation.widget.impl.WidgetImplementationFactoryImpl
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java?rev=810774&r1=810773&r2=810774&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java Thu Sep 3 03:59:59 2009
@@ -19,20 +19,8 @@
package org.apache.tuscany.sca.implementation.widget;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-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;
/**
@@ -40,95 +28,13 @@
*
* @version $Rev$ $Date$
*/
-public class WidgetImplementation implements Implementation {
- private Service widgetService;
- private List<Reference> references = new ArrayList<Reference>();
- private List<Property> properties = new ArrayList<Property>();
+public interface WidgetImplementation extends Implementation {
- private String location;
- private URL url;
- private boolean unresolved;
-
- /**
- * Constructs a new resource implementation.
- */
- WidgetImplementation(AssemblyFactory assemblyFactory,
- JavaInterfaceFactory javaFactory) {
-
- // 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);
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public URL getLocationURL() {
- return url;
- }
-
- public void setLocationURL(URL url) {
- this.url = url;
- }
-
- public ConstrainingType getConstrainingType() {
- // The resource implementation does not support constrainingTypes
- return null;
- }
-
- public List<Property> getProperties() {
- return properties;
- }
-
- public List<Service> getServices() {
- // The resource implementation does not support services
- return Collections.singletonList(widgetService);
- }
+ String getLocation();
+
+ void setLocation(String location);
+
+ URL getLocationURL();
- public List<Reference> getReferences() {
- return references;
- }
-
- public String getURI() {
- return location;
- }
-
- public void setConstrainingType(ConstrainingType constrainingType) {
- // The resource implementation does not support constrainingTypes
- }
-
- public void setURI(String uri) {
- this.location = uri;
- }
-
-
- public boolean isUnresolved() {
- return unresolved;
- }
-
- public void setUnresolved(boolean unresolved) {
- this.unresolved = unresolved;
- }
-
- @Override
- public String toString() {
- return "Widget : " + getLocation();
- }
+ void setLocationURL(URL url);
}
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java?rev=810774&r1=810773&r2=810774&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java Thu Sep 3 03:59:59 2009
@@ -19,27 +19,14 @@
package org.apache.tuscany.sca.implementation.widget;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
/**
* Factory for the widget implementation model.
*
* @version $Rev$ $Date$
*/
-public class WidgetImplementationFactory {
+public interface WidgetImplementationFactory {
- private AssemblyFactory assemblyFactory;
- private JavaInterfaceFactory javaFactory;
+ WidgetImplementation createWidgetImplementation();
- public WidgetImplementationFactory(ModelFactoryExtensionPoint modelFactories) {
- assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
- javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
- }
-
- public WidgetImplementation createWidgetImplementation() {
- return new WidgetImplementation(assemblyFactory, javaFactory);
- }
-
-}
+}
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java?rev=810774&r1=810773&r2=810774&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java Thu Sep 3 03:59:59 2009
@@ -60,7 +60,7 @@
public WidgetImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
contributionFactory = modelFactories.getFactory(ContributionFactory.class);
- implementationFactory = new WidgetImplementationFactory(modelFactories);
+ implementationFactory = modelFactories.getFactory(WidgetImplementationFactory.class);
this.monitor = monitor;
}