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/05/09 00:08:23 UTC
svn commit: r536350 - in /incubator/tuscany/java/sca/modules:
core-spi/src/main/java/org/apache/tuscany/provider/
core/src/main/java/org/apache/tuscany/core/runtime/
Author: jsdelfino
Date: Tue May 8 15:08:22 2007
New Revision: 536350
URL: http://svn.apache.org/viewvc?view=rev&rev=536350
Log:
Fixed bug with the registration of provider factories.
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/DefaultProviderFactoryExtensionPoint.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/ProviderFactoryExtensionPoint.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/DefaultProviderFactoryExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/DefaultProviderFactoryExtensionPoint.java?view=diff&rev=536350&r1=536349&r2=536350
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/DefaultProviderFactoryExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/DefaultProviderFactoryExtensionPoint.java Tue May 8 15:08:22 2007
@@ -36,11 +36,11 @@
}
public void addProviderFactory(ProviderFactory providerFactory) {
- providerFactories.put(providerFactory.getClass(), providerFactory);
+ providerFactories.put(providerFactory.getModelType(), providerFactory);
}
public void removeProviderFactory(ProviderFactory providerFactory) {
- providerFactories.remove(providerFactory.getClass());
+ providerFactories.remove(providerFactory.getModelType());
}
public ProviderFactory getProviderFactory(Class<?> modelType) {
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/ProviderFactoryExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/ProviderFactoryExtensionPoint.java?view=diff&rev=536350&r1=536349&r2=536350
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/ProviderFactoryExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/provider/ProviderFactoryExtensionPoint.java Tue May 8 15:08:22 2007
@@ -47,6 +47,6 @@
* @param modelType a model type
* @return the provider factory associated with the given model type
*/
- <M> ProviderFactory<M> getProviderFactory(Class<?> modelType);
+ ProviderFactory getProviderFactory(Class<?> modelType);
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java?view=diff&rev=536350&r1=536349&r2=536350
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java Tue May 8 15:08:22 2007
@@ -111,6 +111,8 @@
if (bindingProvider != null) {
((RuntimeComponentService)service).setBindingProvider(binding, bindingProvider);
}
+ } else {
+ throw new IllegalStateException("Provider factory not found for class: " + binding.getClass().getName());
}
}
}
@@ -123,6 +125,8 @@
if (bindingProvider != null) {
((RuntimeComponentReference)reference).setBindingProvider(binding, bindingProvider);
}
+ } else {
+ throw new IllegalStateException("Provider factory not found for class: " + binding.getClass().getName());
}
}
}
@@ -138,6 +142,8 @@
if (implementationProvider != null) {
((RuntimeComponent)component).setImplementationProvider(implementationProvider);
}
+ } else {
+ throw new IllegalStateException("Provider factory not found for class: " + implementation.getClass().getName());
}
setScopeContainer(component);
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java?view=diff&rev=536350&r1=536349&r2=536350
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeSCABindingImpl.java Tue May 8 15:08:22 2007
@@ -22,13 +22,14 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.tuscany.assembly.SCABinding;
import org.apache.tuscany.assembly.impl.SCABindingImpl;
import org.apache.tuscany.core.RuntimeWire;
/**
* @version $Rev$ $Date$
*/
-public class RuntimeSCABindingImpl extends SCABindingImpl {
+public class RuntimeSCABindingImpl extends SCABindingImpl implements SCABinding {
private List<RuntimeWire> wires = new ArrayList<RuntimeWire>();
public void addWire(RuntimeWire wire) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org