You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/16 19:10:46 UTC

svn commit: r529327 - in /incubator/tuscany/java/sca: modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/ modules/binding-ws-axis2/src/main/resources/META-INF/services/ modules/core-databinding/src/main/java/org/apache/tuscany/core...

Author: jsdelfino
Date: Mon Apr 16 10:10:43 2007
New Revision: 529327

URL: http://svn.apache.org/viewvc?view=rev&rev=529327
Log:
Moved ExtensionPointRegistry and ModuleActivator to an o.a.t.core package, as part of making sure that package names follow our project naming conventions.

Added:
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/DefaultExtensionPointRegistry.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ExtensionPointRegistry.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ModuleActivator.java   (with props)
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/Bootstrapper.java   (with props)
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java   (with props)
    incubator/tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/http/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/samples/echo-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
    incubator/tuscany/java/sca/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
Removed:
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/bootstrap/ExtensionPointRegistry.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/bootstrap/ModuleActivator.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/binding/
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/
    incubator/tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/http/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/samples/echo-databinding/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
    incubator/tuscany/java/sca/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.spi.bootstrap.ModuleActivator
Modified:
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java
    incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
    incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java
    incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java
    incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java
    incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java
    incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java
    incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java
    incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java
    incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/module/JettyRuntimeModuleActivator.java
    incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/module/TomcatRuntimeModuleActivator.java
    incubator/tuscany/java/sca/modules/http/src/main/java/org/apache/tuscany/http/module/HTTPRuntimeModuleActivator.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
    incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java
    incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java
    incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java
    incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java
    incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java
    incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -23,9 +23,9 @@
 
 import org.apache.tuscany.binding.ws.xml.WebServiceBindingProcessor;
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.http.ServletHostExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 
 public class Axis2ModuleActivator implements ModuleActivator {

Added: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.binding.axis2.Axis2ModuleActivator

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/bootstrap/DataBindingModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -22,6 +22,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.core.databinding.processor.DataBindingJavaInterfaceProcessor;
 import org.apache.tuscany.core.databinding.transformers.Exception2ExceptionTransformer;
 import org.apache.tuscany.core.databinding.transformers.Input2InputTransformer;
@@ -61,8 +63,6 @@
 import org.apache.tuscany.databinding.xml.XMLStreamReader2String;
 import org.apache.tuscany.databinding.xml.XMLStringDataBinding;
 import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 import org.apache.tuscany.spi.component.ComponentManager;
 import org.apache.tuscany.spi.wire.WirePostProcessorRegistry;
 

Added: incubator/tuscany/java/sca/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.core.databinding.bootstrap.DataBindingModuleActivator

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/DefaultExtensionPointRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/DefaultExtensionPointRegistry.java?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/DefaultExtensionPointRegistry.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/DefaultExtensionPointRegistry.java Mon Apr 16 10:10:43 2007
@@ -0,0 +1,46 @@
+/*
+ * 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.core;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Default implementation of a registry to hold all the Tuscany core extension points
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultExtensionPointRegistry implements ExtensionPointRegistry {
+    private Map<Class, Object> extensionPoints = new HashMap<Class, Object>();
+
+    public <T> void addExtensionPoint(Class<T> extensionPointType, T extensionPoint) {
+        extensionPoints.put(extensionPointType, extensionPoint);
+    }
+
+    public <T> T getExtensionPoint(Class<T> extensionPointType) {
+        return extensionPointType.cast(extensionPoints.get(extensionPointType));
+    }
+
+    public void removeExtensionPoint(Class extensionPoint) {
+        extensionPoints.remove(extensionPoint);
+    }
+
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/DefaultExtensionPointRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/DefaultExtensionPointRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ExtensionPointRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ExtensionPointRegistry.java?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ExtensionPointRegistry.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ExtensionPointRegistry.java Mon Apr 16 10:10:43 2007
@@ -0,0 +1,51 @@
+/*
+ * 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.core;
+
+
+/**
+ * The registry for the Tuscany core extension points.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface ExtensionPointRegistry {
+    
+    /**
+     * Add an extension point to the registry
+     * @param <T>
+     * @param extensionPointType The interface of the extension point
+     * @param extensionPoint The instance of the extension point
+     */
+    <T> void addExtensionPoint(Class<T> extensionPointType, T extensionPoint);
+    
+    /**
+     * Get the extension point by the interface
+     * @param <T>
+     * @param extensionPointType
+     * @return
+     */
+    <T> T getExtensionPoint(Class<T> extensionPointType);
+    
+    /**
+     * Remove an extension point
+     * @param extensionPoint
+     */
+    void removeExtensionPoint(Class extensionPoint);
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ExtensionPointRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ExtensionPointRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ModuleActivator.java?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ModuleActivator.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -0,0 +1,61 @@
+/*
+ * 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.core;
+
+import java.util.Map;
+
+/**
+ * ModuleActivator represents a module that plugs into the Tuscany system. Each module should
+ * provide an implementation of this interface and registry the implementation class by defining 
+ * a file named as "META-INF/services/org.apache.tuscany.spi.bootstrp.ModuleActivator". The
+ * content of the file is the class name of the implementation. The implementation class must
+ * have a no-arg constructor. The same instance will be used to invoke all the methods during
+ * different phases of the module activation.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface ModuleActivator {
+    /**
+     * Get a map of the extension points defined by this module. The key is the
+     * java interface to represent the extension point and the the value is the
+     * instance of the implementation of the interface.
+     * 
+     * @return All the extension points defined by this module
+     */
+    Map<Class, Object> getExtensionPoints();
+
+    /**
+     * This method is invoked when the module is started by the Tuscany system.
+     * It can be used by this module to registr extensions against extension
+     * points.
+     * 
+     * @param registry The extension point registry
+     */
+    void start(ExtensionPointRegistry registry);
+
+    /**
+     * This method is invoked when the module is stopped by the Tuscany system.
+     * It can be used by this module to unregister extensions against the
+     * extension points.
+     * 
+     * @param registry The extension point registry
+     */
+    void stop(ExtensionPointRegistry registry);
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ModuleActivator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/ModuleActivator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java Mon Apr 16 10:10:43 2007
@@ -42,8 +42,8 @@
 import org.apache.tuscany.assembly.ComponentService;
 import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
 import org.apache.tuscany.contribution.service.ContributionService;
-import org.apache.tuscany.core.bootstrap.Bootstrapper;
-import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.core.component.ComponentManagerImpl;
 import org.apache.tuscany.core.component.WorkContextImpl;
 import org.apache.tuscany.core.monitor.NullMonitorFactory;
@@ -60,8 +60,6 @@
 import org.apache.tuscany.interfacedef.java.JavaInterface;
 import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
 import org.apache.tuscany.interfacedef.java.impl.DefaultJavaFactory;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.ComponentManager;

Added: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/Bootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/Bootstrapper.java?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/Bootstrapper.java (added)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/Bootstrapper.java Mon Apr 16 10:10:43 2007
@@ -0,0 +1,61 @@
+/*
+ * 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.core.runtime;
+
+import org.apache.tuscany.contribution.service.ContributionService;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.host.MonitorFactory;
+import org.apache.tuscany.spi.component.ComponentManager;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.deployer.Deployer;
+
+/**
+ * Interface that abstracts the process used to create a running Tuscany system. Implementation of this may provide
+ * different mechanisms for creating the primoridal system components used to boot the core to the level where it can
+ * support end-user applications.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface Bootstrapper {
+    /**
+     * Return the MonitorFactory being used by the implementation to provide monitor interfaces for the primordial
+     * components.
+     *
+     * @return the MonitorFactory being used by the bootstrapper
+     */
+    MonitorFactory getMonitorFactory();
+
+    /**
+     * Create a Deployer that can be used to deploy the system definition. This will most likely only support a small
+     * subset of the available programming model.
+     *
+     * @return a new primordial Deployer
+     */
+    Deployer createDeployer(ExtensionPointRegistry registry);
+
+    /**
+     * Create a ScopeRegistry that supports the Scopes supported for primordial components
+     *
+     * @return a new primordial ScopeRegistry
+     */
+    ScopeRegistry getScopeRegistry();
+
+    ComponentManager getComponentManager();
+
+}

Propchange: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/Bootstrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/Bootstrapper.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java (added)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java Mon Apr 16 10:10:43 2007
@@ -0,0 +1,178 @@
+/*
+ * 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.core.runtime;
+
+import javax.xml.stream.XMLInputFactory;
+
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.builder.BuilderRegistryImpl;
+import org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl;
+import org.apache.tuscany.core.component.ComponentManagerImpl;
+import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.component.scope.AbstractScopeContainer;
+import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
+import org.apache.tuscany.core.component.scope.RequestScopeContainer;
+import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
+import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
+import org.apache.tuscany.core.deployer.DeployerImpl;
+import org.apache.tuscany.core.implementation.composite.CompositeBuilder;
+import org.apache.tuscany.core.work.Jsr237WorkScheduler;
+import org.apache.tuscany.core.work.ThreadPoolWorkManager;
+import org.apache.tuscany.host.MonitorFactory;
+import org.apache.tuscany.spi.builder.BuilderRegistry;
+import org.apache.tuscany.spi.component.ComponentManager;
+import org.apache.tuscany.spi.component.ScopeContainerMonitor;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.component.WorkContext;
+import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.wire.WirePostProcessorRegistry;
+
+import commonj.work.WorkManager;
+
+/**
+ * A default implementation of a Bootstrapper. Please see the documentation on
+ * the individual methods for how the primordial components are created.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultBootstrapper implements Bootstrapper {
+    private final MonitorFactory monitorFactory;
+    private final XMLInputFactory xmlFactory;
+    private final ComponentManager componentManager;
+    private final ScopeRegistry scopeRegistry;
+    /**
+     * Create a default bootstrapper.
+     * 
+     * @param monitorFactory the MonitorFactory to be used to create monitors
+     *            for the primordial components
+     * @param xmlFactory the XMLInputFactory to be used by the components to
+     *            load XML artifacts
+     * @param componentManager the component manager for the runtime instance
+     * @param resolver the autowire resolver for the runtime instance
+     * @param connector the connector for the runtime instance
+     */
+    public DefaultBootstrapper(MonitorFactory monitorFactory,
+                               XMLInputFactory xmlFactory,
+                               ComponentManager componentManager) {
+        this.monitorFactory = monitorFactory;
+        this.xmlFactory = xmlFactory;
+        this.componentManager = componentManager;
+        this.scopeRegistry = createScopeRegistry();
+    }
+    
+    public DefaultBootstrapper(MonitorFactory monitorFactory) {
+        this.monitorFactory = monitorFactory;
+        this.xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
+        this.componentManager = new ComponentManagerImpl(null);
+        this.scopeRegistry = createScopeRegistry();
+    }    
+
+    /**
+     * Returns the MonitorFactory being used by this bootstrapper.
+     * 
+     * @return the MonitorFactory being used by this bootstrapper
+     */
+    public MonitorFactory getMonitorFactory() {
+        return monitorFactory;
+    }
+
+    /**
+     * Create primordial deployer that can be used to load the system
+     * definition.
+     * 
+     * @return the primordial deployer
+     */
+    public Deployer createDeployer(ExtensionPointRegistry extensionRegistry) {
+        ScopeRegistry scopeRegistry = getScopeRegistry();
+        BuilderRegistry builder = createBuilder(scopeRegistry);
+        WorkContext workContext = new WorkContextImpl();
+        WorkManager workManager = new ThreadPoolWorkManager(10);
+        WorkScheduler workScheduler = new Jsr237WorkScheduler(workManager);
+        DeployerImpl deployer = new DeployerImpl(xmlFactory, builder, componentManager, workScheduler, workContext);
+        deployer.setScopeRegistry(getScopeRegistry());
+        WirePostProcessorRegistry wirePostProcessorRegistry = new WirePostProcessorRegistryImpl();
+        deployer.setWirePostProcessorRegistry(wirePostProcessorRegistry);
+        extensionRegistry.addExtensionPoint(WirePostProcessorRegistry.class, wirePostProcessorRegistry);
+        extensionRegistry.addExtensionPoint(ScopeRegistry.class, scopeRegistry);
+        extensionRegistry.addExtensionPoint(BuilderRegistry.class, builder);
+        // extensionRegistry.addExtension(LoaderRegistry.class, loader);
+        extensionRegistry.addExtensionPoint(Deployer.class, deployer);
+        return deployer;
+    }
+
+    /**
+     * Create a basic ScopeRegistry containing the ScopeContainers that are
+     * available to components in the system definition. The implementation
+     * returned only support COMPOSITE scope.
+     * 
+     * @return a new ScopeRegistry
+     */
+    private ScopeRegistry createScopeRegistry() {
+        ScopeRegistry scopeRegistry = new ScopeRegistryImpl();
+        ScopeContainerMonitor monitor = monitorFactory.getMonitor(ScopeContainerMonitor.class);
+        AbstractScopeContainer[] containers = new AbstractScopeContainer[] {new CompositeScopeContainer(monitor),
+                                                                            new StatelessScopeContainer(monitor),
+                                                                            new RequestScopeContainer(monitor),
+        // new ConversationalScopeContainer(monitor),
+        // new HttpSessionScopeContainer(monitor)
+        };
+        for (AbstractScopeContainer c : containers) {
+            c.start();
+            scopeRegistry.register(c);
+        }
+
+        return scopeRegistry;
+    }
+
+    /**
+     * Create a Builder that can be used to build the components in the system
+     * definition. The default implementation only supports implementations from
+     * the system programming model.
+     * 
+     * @param scopeRegistry the ScopeRegistry defining the component scopes that
+     *            will be supported
+     * @return a new Builder
+     */
+    private BuilderRegistry createBuilder(ScopeRegistry scopeRegistry) {
+        BuilderRegistryImpl builderRegistry = new BuilderRegistryImpl(componentManager, scopeRegistry);
+        CompositeBuilder compositeBuilder = new CompositeBuilder();
+        compositeBuilder.setBuilderRegistry(builderRegistry);
+        compositeBuilder.setScopeRegistry(scopeRegistry);
+        compositeBuilder.init();
+        // builderRegistry.register(CompositeImplementation.class,
+        // compositeBuilder);
+        return builderRegistry;
+    }
+
+    /**
+     * @return the componentManager
+     */
+    public ComponentManager getComponentManager() {
+        return componentManager;
+    }
+
+    /**
+     * @return the scopeRegistry
+     */
+    public ScopeRegistry getScopeRegistry() {
+        return scopeRegistry;
+    }
+
+}

Propchange: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java Mon Apr 16 10:10:43 2007
@@ -1,6 +1,7 @@
 package org.apache.tuscany.core.bootstrap;
 
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.DefaultExtensionPointRegistry;
 
 import junit.framework.TestCase;
 
@@ -9,7 +10,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        registry = new ExtensionPointRegistryImpl();
+        registry = new DefaultExtensionPointRegistry();
     }
 
     public void testRegistry() {

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/databinding/axiom/bootstrap/AxiomDataBindingModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -21,6 +21,8 @@
 
 import java.util.Map;
 
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.databinding.TransformerExtensionPoint;
 import org.apache.tuscany.databinding.axiom.AxiomDataBinding;
@@ -30,8 +32,6 @@
 import org.apache.tuscany.databinding.axiom.Object2OMElement;
 import org.apache.tuscany.databinding.axiom.String2OMElement;
 import org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * Module activator for AXIOM databinding

Added: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.databinding.axiom.bootstrap.AxiomDataBindingModuleActivator
\ No newline at end of file

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/databinding/jaxb/bootstrap/JAXBDataBindingModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -21,6 +21,8 @@
 
 import java.util.Map;
 
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.databinding.TransformerExtensionPoint;
 import org.apache.tuscany.databinding.jaxb.JAXB2Node;
@@ -30,8 +32,6 @@
 import org.apache.tuscany.databinding.jaxb.Reader2JAXB;
 import org.apache.tuscany.databinding.jaxb.XMLStreamReader2JAXB;
 import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * Module activator for JAXB databinding

Added: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.databinding.jaxb.bootstrap.JAXBDataBindingModuleActivator
\ No newline at end of file

Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/databinding/sdo2om/bootstrap/SDOAxiomModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -21,11 +21,11 @@
 
 import java.util.Map;
 
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.databinding.TransformerExtensionPoint;
 import org.apache.tuscany.databinding.sdo2om.DataObject2OMElement;
 import org.apache.tuscany.databinding.sdo2om.XMLDocument2OMElement;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * Module activator for SDO/AXIOM databinding

Added: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.databinding.sdo2om.bootstrap.SDOAxiomModuleActivator
\ No newline at end of file

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/bootstrap/SDODataBindingModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -23,6 +23,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.databinding.TransformerExtensionPoint;
 import org.apache.tuscany.databinding.sdo.DataObject2String;
@@ -38,8 +40,6 @@
 import org.apache.tuscany.databinding.sdo.XMLStreamReader2DataObject;
 import org.apache.tuscany.databinding.sdo.XMLStreamReader2XMLDocument;
 import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospectorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * @version $Rev$ $Date$

Added: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.databinding.sdo.bootstrap.SDODataBindingModuleActivator

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java Mon Apr 16 10:10:43 2007
@@ -49,12 +49,12 @@
 import org.apache.tuscany.contribution.service.impl.ContributionServiceImpl;
 import org.apache.tuscany.contribution.service.impl.PackageTypeDescriberImpl;
 import org.apache.tuscany.contribution.service.util.FileHelper;
-import org.apache.tuscany.core.bootstrap.ExtensionPointRegistryImpl;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.DefaultExtensionPointRegistry;
 import org.apache.tuscany.core.component.WorkContextImpl;
 import org.apache.tuscany.core.runtime.AbstractRuntime;
 import org.apache.tuscany.host.runtime.InitializationException;
 import org.apache.tuscany.spi.Scope;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.ScopeContainer;
 import org.apache.tuscany.spi.component.ScopeRegistry;
@@ -110,7 +110,7 @@
 
     @SuppressWarnings("unchecked")
     public Component start() throws Exception {
-        ExtensionPointRegistry extensionRegistry = new ExtensionPointRegistryImpl();
+        ExtensionPointRegistry extensionRegistry = new DefaultExtensionPointRegistry();
         ContributionRepository repository = new ContributionRepositoryImpl("target");
 
         // Add artifact processor extension points

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -22,8 +22,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 
 /**

Added: incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.container.crud.CRUDModuleActivator

Modified: incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/module/JettyRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/module/JettyRuntimeModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/module/JettyRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/module/JettyRuntimeModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -21,10 +21,10 @@
 
 import java.util.Map;
 
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.http.ServletHostExtensionPoint;
 import org.apache.tuscany.http.jetty.JettyServer;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * @version $Rev$ $Date$

Added: incubator/tuscany/java/sca/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/http-jetty/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ModuleActivator
+org.apache.tuscany.http.jetty.module.JettyRuntimeModuleActivator

Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/module/TomcatRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/module/TomcatRuntimeModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/module/TomcatRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/module/TomcatRuntimeModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -21,10 +21,10 @@
 
 import java.util.Map;
 
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.http.ServletHostExtensionPoint;
 import org.apache.tuscany.http.tomcat.TomcatServer;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * @version $Rev$ $Date$

Added: incubator/tuscany/java/sca/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/http-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ModuleActivator
+org.apache.tuscany.http.tomcat.module.TomcatRuntimeModuleActivator

Modified: incubator/tuscany/java/sca/modules/http/src/main/java/org/apache/tuscany/http/module/HTTPRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http/src/main/java/org/apache/tuscany/http/module/HTTPRuntimeModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/http/src/main/java/org/apache/tuscany/http/module/HTTPRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/http/src/main/java/org/apache/tuscany/http/module/HTTPRuntimeModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -22,10 +22,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.http.DefaultServletHostExtensionPoint;
 import org.apache.tuscany.http.ServletHostExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * @version $Rev$ $Date$

Added: incubator/tuscany/java/sca/modules/http/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/http/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/http/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ModuleActivator
+org.apache.tuscany.http.module.HTTPRuntimeModuleActivator

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -23,6 +23,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.databinding.Mediator;
 import org.apache.tuscany.implementation.java.JavaImplementation;
@@ -50,8 +52,6 @@
 import org.apache.tuscany.implementation.java.xml.JavaImplementationProcessor;
 import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
 import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 import org.apache.tuscany.spi.component.ScopeRegistry;
 import org.apache.tuscany.spi.component.WorkContext;
@@ -72,7 +72,7 @@
     }
 
     /**
-     * @see org.apache.tuscany.spi.bootstrap.ModuleActivator#start(org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry)
+     * @see org.apache.tuscany.core.ModuleActivator#start(org.apache.tuscany.core.ExtensionPointRegistry)
      */
     public void start(ExtensionPointRegistry extensionPointRegistry) {
         JavaInterfaceIntrospectorExtensionPoint interfaceIntrospector = extensionPointRegistry

Added: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ModuleActivator
+org.apache.tuscany.implementation.java.module.JavaRuntimeModuleActivator

Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -22,8 +22,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 
 public class ScriptModuleActivator implements ModuleActivator {

Added: incubator/tuscany/java/sca/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.implementation.script.ScriptModuleActivator

Modified: incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/java/org/apache/tuscany/interfacedef/java/module/JavaInterfaceRuntimeModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -23,11 +23,11 @@
 import java.util.Map;
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.interfacedef.java.introspect.DefaultJavaInterfaceIntrospector;
 import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
 import org.apache.tuscany.interfacedef.java.xml.JavaInterfaceProcessor;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * @version $Rev$ $Date$
@@ -41,7 +41,7 @@
     }
 
     /**
-     * @see org.apache.tuscany.spi.bootstrap.ModuleActivator#start(org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry)
+     * @see org.apache.tuscany.core.ModuleActivator#start(org.apache.tuscany.core.ExtensionPointRegistry)
      */
     public void start(ExtensionPointRegistry extensionPointRegistry) {
         

Added: incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/interface-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ModuleActivator
+org.apache.tuscany.interfacedef.java.module.JavaInterfaceRuntimeModuleActivator

Modified: incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/java/org/apache/tuscany/interfacedef/wsdl/module/WSDLInterfaceRuntimeModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -23,10 +23,10 @@
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.interfacedef.wsdl.xml.WSDLDocumentProcessor;
 import org.apache.tuscany.interfacedef.wsdl.xml.WSDLInterfaceProcessor;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
 
 /**
  * @version $Rev$ $Date$
@@ -38,7 +38,7 @@
     }
 
     /**
-     * @see org.apache.tuscany.spi.bootstrap.ModuleActivator#start(org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry)
+     * @see org.apache.tuscany.core.ModuleActivator#start(org.apache.tuscany.core.ExtensionPointRegistry)
      */
     public void start(ExtensionPointRegistry extensionPointRegistry) {
         

Added: incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-runtime/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ModuleActivator
+org.apache.tuscany.interfacedef.wsdl.module.WSDLInterfaceRuntimeModuleActivator

Modified: incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java (original)
+++ incubator/tuscany/java/sca/samples/echo-binding/src/main/java/echo/EchoModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -22,8 +22,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 
 

Added: incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/samples/echo-binding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+echo.EchoModuleActivator

Modified: incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java (original)
+++ incubator/tuscany/java/sca/samples/echo-databinding/src/main/java/echo/EchoModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -22,8 +22,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 
 

Added: incubator/tuscany/java/sca/samples/echo-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/echo-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/samples/echo-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/samples/echo-databinding/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+echo.EchoModuleActivator

Modified: incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java?view=diff&rev=529327&r1=529326&r2=529327
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/org/apache/tuscany/container/crud/CRUDModuleActivator.java Mon Apr 16 10:10:43 2007
@@ -22,8 +22,8 @@
 import java.util.Map;
 
 import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.spi.bootstrap.ModuleActivator;
-import org.apache.tuscany.spi.bootstrap.ExtensionPointRegistry;
+import org.apache.tuscany.core.ExtensionPointRegistry;
+import org.apache.tuscany.core.ModuleActivator;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 
 /**

Added: incubator/tuscany/java/sca/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator?view=auto&rev=529327
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator (added)
+++ incubator/tuscany/java/sca/samples/implementation-crud/src/main/resources/META-INF/services/org.apache.tuscany.core.ModuleActivator Mon Apr 16 10:10:43 2007
@@ -0,0 +1,2 @@
+# Implementation class for the ExtensionActivator
+org.apache.tuscany.container.crud.CRUDModuleActivator



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