You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/08 08:05:32 UTC
svn commit: r526531 - in /incubator/tuscany/java/sca/modules:
core-spi/src/main/java/org/apache/tuscany/spi/wire/
core/src/main/java/org/apache/tuscany/core/bootstrap/
core/src/main/java/org/apache/tuscany/core/runtime/
core/src/test/java/org/apache/tu...
Author: rfeng
Date: Sat Apr 7 23:05:31 2007
New Revision: 526531
URL: http://svn.apache.org/viewvc?view=rev&rev=526531
Log:
Rename ExtensionRegistry to ExtensionPointRegistry
Added:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistry.java
- copied, changed from r526528, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistry.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImpl.java
- copied, changed from r526528, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImpl.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java
- copied, changed from r526528, incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImplTestCase.java
Removed:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistry.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImpl.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImplTestCase.java
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionActivator.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImpl.java
incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDExtensionActivator.java
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java?view=diff&rev=526531&r1=526530&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java Sat Apr 7 23:05:31 2007
@@ -67,15 +67,6 @@
Object createCallbackProxy(Class<?> interfaze, List<Wire> wires) throws ProxyCreationException;
/**
- * Creates a Java proxy for the service contract callback
- *
- * @param interfaze the interface the proxy should implement
- * @return the proxy
- * @throws ProxyCreationException if an error is encountered during proxy generation
- */
- Object createCallbackProxy(Class<?> interfaze) throws ProxyCreationException;
-
- /**
* Cast a proxy to a CallableReference.
*
* @param target a proxy generated by this implementation
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java?view=diff&rev=526531&r1=526530&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java Sat Apr 7 23:05:31 2007
@@ -46,7 +46,7 @@
*
* @return a new primordial Deployer
*/
- Deployer createDeployer(ExtensionRegistry registry);
+ Deployer createDeployer(ExtensionPointRegistry registry);
/**
* Create a ScopeRegistry that supports the Scopes supported for primordial components
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=526531&r1=526530&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Sat Apr 7 23:05:31 2007
@@ -92,15 +92,15 @@
*
* @return the primordial deployer
*/
- public Deployer createDeployer(ExtensionRegistry extensionRegistry) {
+ public Deployer createDeployer(ExtensionPointRegistry extensionRegistry) {
ScopeRegistry scopeRegistry = getScopeRegistry();
BuilderRegistry builder = createBuilder(scopeRegistry);
DeployerImpl deployer = new DeployerImpl(xmlFactory, builder, componentManager);
deployer.setScopeRegistry(getScopeRegistry());
- extensionRegistry.addExtension(ScopeRegistry.class, scopeRegistry);
- extensionRegistry.addExtension(BuilderRegistry.class, builder);
+ extensionRegistry.addExtensionPoint(ScopeRegistry.class, scopeRegistry);
+ extensionRegistry.addExtensionPoint(BuilderRegistry.class, builder);
// extensionRegistry.addExtension(LoaderRegistry.class, loader);
- extensionRegistry.addExtension(Deployer.class, deployer);
+ extensionRegistry.addExtensionPoint(Deployer.class, deployer);
return deployer;
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionActivator.java?view=diff&rev=526531&r1=526530&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionActivator.java Sat Apr 7 23:05:31 2007
@@ -27,9 +27,9 @@
/**
* @param registry
*/
- void start(ExtensionRegistry registry);
+ void start(ExtensionPointRegistry registry);
/**
* @param registry
*/
- void stop(ExtensionRegistry registry);
+ void stop(ExtensionPointRegistry registry);
}
Copied: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistry.java (from r526528, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistry.java?view=diff&rev=526531&p1=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistry.java&r1=526528&p2=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistry.java&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistry.java Sat Apr 7 23:05:31 2007
@@ -19,37 +19,32 @@
package org.apache.tuscany.core.bootstrap;
-import java.util.List;
/**
+ * The registry for extension points
+ *
* @version $Rev$ $Date$
*/
-public interface ExtensionRegistry {
+public interface ExtensionPointRegistry {
+
/**
+ * Add an extension point to the registry
* @param <T>
- * @param extensionPoint
- * @param extension
+ * @param extensionPointType The interface of the extension point
+ * @param extensionPoint The instance of the extension point
*/
- <T> void addExtension(Class<T> extensionPoint, T extension);
+ <T> void addExtensionPoint(Class<T> extensionPointType, T extensionPoint);
+
/**
+ * Get the extension point by the interface
* @param <T>
- * @param extensionPoint
+ * @param extensionPointType
* @return
*/
- <T> List<T> getExtensions(Class<T> extensionPoint);
- /**
- * @param <T>
- * @param extensionPoint
- * @return
- */
- <T> T getExtension(Class<T> extensionPoint);
- /**
- * @param <T>
- * @param extensionPoint
- * @param extension
- */
- <T> void removeExtension(Class<T> extensionPoint, T extension);
+ <T> T getExtensionPoint(Class<T> extensionPointType);
+
/**
+ * Remove an extension point
* @param extensionPoint
*/
void removeExtensionPoint(Class extensionPoint);
Copied: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImpl.java (from r526528, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImpl.java?view=diff&rev=526531&p1=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImpl.java&r1=526528&p2=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImpl.java&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImpl.java Sat Apr 7 23:05:31 2007
@@ -29,43 +29,19 @@
*
* @version $Rev$ $Date$
*/
-public class ExtensionRegistryImpl implements ExtensionRegistry {
- private Map<Class, List<Object>> extensions = new HashMap<Class, List<Object>>();
+public class ExtensionPointRegistryImpl implements ExtensionPointRegistry {
+ private Map<Class, Object> extensionPoints = new HashMap<Class, Object>();
- public <T> void addExtension(Class<T> extensionPoint, T extension) {
- List<Object> list = extensions.get(extensionPoint);
- if (list == null) {
- list = new ArrayList<Object>();
- extensions.put(extensionPoint, list);
- }
- if (!list.contains(extension)) {
- list.add(extension);
- }
+ public <T> void addExtensionPoint(Class<T> extensionPointType, T extensionPoint) {
+ extensionPoints.put(extensionPointType, extensionPoint);
}
- public <T> T getExtension(Class<T> extensionPoint) {
- List<Object> list = extensions.get(extensionPoint);
- if (list == null || list.isEmpty()) {
- return null;
- } else {
- return extensionPoint.cast(list.get(0));
- }
- }
-
- @SuppressWarnings("unchecked")
- public <T> List<T> getExtensions(Class<T> extensionPoint) {
- return (List<T>)extensions.get(extensionPoint);
- }
-
- public <T> void removeExtension(Class<T> extensionPoint, T extension) {
- List<T> list = getExtensions(extensionPoint);
- if (list != null) {
- list.remove(extension);
- }
+ public <T> T getExtensionPoint(Class<T> extensionPointType) {
+ return extensionPointType.cast(extensionPoints.get(extensionPointType));
}
public void removeExtensionPoint(Class extensionPoint) {
- extensions.remove(extensionPoint);
+ extensionPoints.remove(extensionPoint);
}
}
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=526531&r1=526530&r2=526531
==============================================================================
--- 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 Sat Apr 7 23:05:31 2007
@@ -43,8 +43,8 @@
import org.apache.tuscany.core.bootstrap.Bootstrapper;
import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
import org.apache.tuscany.core.bootstrap.ExtensionActivator;
-import org.apache.tuscany.core.bootstrap.ExtensionRegistry;
-import org.apache.tuscany.core.bootstrap.ExtensionRegistryImpl;
+import org.apache.tuscany.core.bootstrap.ExtensionPointRegistry;
+import org.apache.tuscany.core.bootstrap.ExtensionPointRegistryImpl;
import org.apache.tuscany.core.component.ComponentManagerImpl;
import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
@@ -114,7 +114,7 @@
* The ComponentManager that manages all components in this runtime.
*/
protected ComponentManager componentManager;
- protected ExtensionRegistry extensionRegistry;
+ protected ExtensionPointRegistry extensionRegistry;
/**
* Registry for ClassLoaders used by this runtime.
@@ -197,7 +197,7 @@
this.managementService = managementService;
}
- public void initialize(ExtensionRegistry extensionRegistry, ContributionService contributionService)
+ public void initialize(ExtensionPointRegistry extensionRegistry, ContributionService contributionService)
throws InitializationException {
this.contributionService = contributionService;
this.extensionRegistry = extensionRegistry;
@@ -206,7 +206,7 @@
Deployer deployer = bootstrapper.createDeployer(extensionRegistry);
- extensionRegistry.addExtension(ContributionService.class, contributionService);
+ extensionRegistry.addExtensionPoint(ContributionService.class, contributionService);
registerSystemComponent(TUSCANY_DEPLOYER, Deployer.class, deployer);
registerSystemComponent(WORK_CONTEXT_URI, WorkContext.class, new SimpleWorkContext());
@@ -271,7 +271,7 @@
try {
ComponentService contract = createContract(type);
componentManager.registerJavaObject(uri, contract, component);
- extensionRegistry.addExtension(type, component);
+ extensionRegistry.addExtensionPoint(type, component);
} catch (RegistrationException e) {
throw new InitializationException(e);
}
Copied: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java (from r526528, incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImplTestCase.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=526531&p1=incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImplTestCase.java&r1=526528&p2=incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionRegistryImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/bootstrap/ExtensionPointRegistryImplTestCase.java Sat Apr 7 23:05:31 2007
@@ -2,35 +2,27 @@
import junit.framework.TestCase;
-public class ExtensionRegistryImplTestCase extends TestCase {
- private ExtensionRegistry registry;
+public class ExtensionPointRegistryImplTestCase extends TestCase {
+ private ExtensionPointRegistry registry;
protected void setUp() throws Exception {
super.setUp();
- registry = new ExtensionRegistryImpl();
+ registry = new ExtensionPointRegistryImpl();
}
public void testRegistry() {
- MyService service = new MyServiceImpl();
- registry.addExtension(MyService.class, service);
- assertSame(service, registry.getExtension(MyService.class));
- assertEquals(1, registry.getExtensions(MyService.class).size());
- MyService service2 = new MyServiceImpl();
- registry.addExtension(MyService.class, service2);
- assertSame(service, registry.getExtension(MyService.class));
- assertEquals(2, registry.getExtensions(MyService.class).size());
- registry.removeExtension(MyService.class, service);
- assertSame(service2, registry.getExtension(MyService.class));
- assertEquals(1, registry.getExtensions(MyService.class).size());
- registry.removeExtensionPoint(MyService.class);
- assertNull(registry.getExtension(MyService.class));
+ MyRegistry service = new MyREgistryImpl();
+ registry.addExtensionPoint(MyRegistry.class, service);
+ assertSame(service, registry.getExtensionPoint(MyRegistry.class));
+ registry.removeExtensionPoint(MyRegistry.class);
+ assertNull(registry.getExtensionPoint(MyRegistry.class));
}
- private static interface MyService {
+ private static interface MyRegistry {
void doSomething();
}
- private static class MyServiceImpl implements MyService {
+ private static class MyREgistryImpl implements MyRegistry {
public void doSomething() {
}
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImpl.java?view=diff&rev=526531&r1=526530&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImpl.java Sat Apr 7 23:05:31 2007
@@ -30,8 +30,8 @@
import org.apache.tuscany.assembly.xml.impl.CompositeDocumentProcessor;
import org.apache.tuscany.assembly.xml.impl.CompositeProcessor;
import org.apache.tuscany.assembly.xml.impl.ConstrainingTypeProcessor;
-import org.apache.tuscany.core.bootstrap.ExtensionRegistry;
-import org.apache.tuscany.core.bootstrap.ExtensionRegistryImpl;
+import org.apache.tuscany.core.bootstrap.ExtensionPointRegistry;
+import org.apache.tuscany.core.bootstrap.ExtensionPointRegistryImpl;
import org.apache.tuscany.core.component.SimpleWorkContext;
import org.apache.tuscany.core.runtime.AbstractRuntime;
import org.apache.tuscany.host.runtime.InitializationException;
@@ -108,14 +108,14 @@
@SuppressWarnings("unchecked")
public Component start() throws Exception {
- ExtensionRegistry extensionRegistry = new ExtensionRegistryImpl();
+ ExtensionPointRegistry extensionRegistry = new ExtensionPointRegistryImpl();
ContributionRepository repository = new ContributionRepositoryImpl("target");
DefaultStAXArtifactProcessorRegistry registry = new DefaultStAXArtifactProcessorRegistry();
registry.addArtifactProcessor(new CompositeProcessor(registry));
registry.addArtifactProcessor(new ComponentTypeProcessor(registry));
registry.addArtifactProcessor(new ConstrainingTypeProcessor(registry));
- extensionRegistry.addExtension(StAXArtifactProcessorRegistry.class, registry);
+ extensionRegistry.addExtensionPoint(StAXArtifactProcessorRegistry.class, registry);
DefaultURLArtifactProcessorRegistry artifactRegistry = new DefaultURLArtifactProcessorRegistry();
CompositeDocumentProcessor compositeProcessor = new CompositeDocumentProcessor(registry);
@@ -132,7 +132,7 @@
ContributionService contributionService =
new ContributionServiceImpl(repository, pkgRegistry, artifactRegistry, artifactResolver);
- extensionRegistry.addExtension(ContributionService.class, contributionService);
+ extensionRegistry.addExtensionPoint(ContributionService.class, contributionService);
initialize(extensionRegistry, contributionService);
ScopeRegistry scopeRegistry = getScopeRegistry();
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDExtensionActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDExtensionActivator.java?view=diff&rev=526531&r1=526530&r2=526531
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDExtensionActivator.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/org/apache/tuscany/container/crud/CRUDExtensionActivator.java Sat Apr 7 23:05:31 2007
@@ -20,7 +20,7 @@
package org.apache.tuscany.container.crud;
import org.apache.tuscany.core.bootstrap.ExtensionActivator;
-import org.apache.tuscany.core.bootstrap.ExtensionRegistry;
+import org.apache.tuscany.core.bootstrap.ExtensionPointRegistry;
import org.apache.tuscany.services.spi.contribution.StAXArtifactProcessorRegistry;
import org.apache.tuscany.spi.builder.BuilderRegistry;
@@ -31,9 +31,9 @@
private CRUDImplementationLoader implementationLoader;
private CRUDComponentBuilder builder;
- public void start(ExtensionRegistry registry) {
- StAXArtifactProcessorRegistry processors = registry.getExtension(StAXArtifactProcessorRegistry.class);
- BuilderRegistry builderRegistry = registry.getExtension(BuilderRegistry.class);
+ public void start(ExtensionPointRegistry registry) {
+ StAXArtifactProcessorRegistry processors = registry.getExtensionPoint(StAXArtifactProcessorRegistry.class);
+ BuilderRegistry builderRegistry = registry.getExtensionPoint(BuilderRegistry.class);
implementationLoader = new CRUDImplementationLoader();
processors.addArtifactProcessor(implementationLoader);
@@ -43,6 +43,6 @@
builder.init();
}
- public void stop(ExtensionRegistry registry) {
+ public void stop(ExtensionPointRegistry registry) {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org