Author: rfeng
Date: Fri Oct 24 15:51:06 2008
New Revision: 707774
URL: http://svn.apache.org/viewvc?rev=707774&view=rev
Log:
Fix the newFactoryClassInstance and bring up the sample-calculator-equinox
Added:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddService.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/AddServiceImpl.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorClient.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorService.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/CalculatorServiceImpl.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideService.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/DivideServiceImpl.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyService.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/MultiplyServiceImpl.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractService.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/SubtractServiceImpl.java
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
(props changed)
- copied unchanged from r707237,
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/Calculator.composite
Modified:
tuscany/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
tuscany/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
tuscany/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
tuscany/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml
tuscany/branches/sca-equinox/pom.xml
tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
Modified:
tuscany/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
(original)
+++
tuscany/branches/sca-equinox/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
Fri Oct 24 15:51:06 2008
@@ -22,7 +22,7 @@
import javax.jms.Message;
import javax.jms.Session;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.impl.JMSBindingImpl;
import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
public class TestMessageProcessor extends XMLTextMessageProcessor {
@@ -31,7 +31,7 @@
public static boolean extractPayloadFromJMSMessageCalled;
public static boolean setOperationNameCalled;
- public TestMessageProcessor(JMSBinding jmsBinding) {
+ public TestMessageProcessor(JMSBindingImpl jmsBinding) {
super(jmsBinding);
}
public Object extractPayloadFromJMSMessage(Message message) {
Modified:
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
Fri Oct 24 15:51:06 2008
@@ -18,15 +18,9 @@
*/
package org.apache.tuscany.sca.binding.ws.wsdlgen;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-
import junit.framework.TestCase;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint;
import
org.apache.tuscany.sca.core.databinding.processor.DataBindingJavaInterfaceProcessor;
import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
@@ -50,7 +44,7 @@
public class BindingWSDLGeneratorTestCase extends TestCase {
public void testCreateWSDLInterfaceContract() throws
InvalidInterfaceException {
- DefaultFactoryExtensionPoint modelFactories = new
DefaultFactoryExtensionPoint();
+ DefaultFactoryExtensionPoint modelFactories = new
DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry());
WSDLFactory wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
XSDFactory xsdFactory = modelFactories.getFactory(XSDFactory.class);
DefaultJavaInterfaceFactory factory = new
DefaultJavaInterfaceFactory();
Modified:
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
Fri Oct 24 15:51:06 2008
@@ -24,6 +24,7 @@
import javax.wsdl.Definition;
import javax.wsdl.xml.WSDLWriter;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint;
import
org.apache.tuscany.sca.core.databinding.processor.DataBindingJavaInterfaceProcessor;
import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
@@ -50,7 +51,7 @@
JAXWSFaultExceptionMapper faultExceptionMapper = new
JAXWSFaultExceptionMapper(dataBindings, null);
new JAXWSJavaInterfaceProcessor(dataBindings, faultExceptionMapper,
null).visitInterface(iface);
new
DataBindingJavaInterfaceProcessor(dataBindings).visitInterface(iface);
- DefaultFactoryExtensionPoint modelFactories = new
DefaultFactoryExtensionPoint();
+ DefaultFactoryExtensionPoint modelFactories = new
DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry());
WSDLDefinition wsdlDefinition = new
DefaultWSDLFactory(modelFactories).createWSDLDefinition();
DefaultXSDFactory factory = new DefaultXSDFactory();
Interface2WSDLGenerator generator = new Interface2WSDLGenerator(false,
new XSDModelResolver(null, null), dataBindings, factory, null);
Modified:
tuscany/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
Fri Oct 24 15:51:06 2008
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.ContributionFactory;
import org.apache.tuscany.sca.contribution.DefaultContributionFactory;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.junit.Before;
@@ -45,7 +46,7 @@
ModelResolverExtensionPoint resolvers = new
DefaultModelResolverExtensionPoint();
resolvers.addResolver(Model.class, TestModelResolver.class);
- FactoryExtensionPoint factories = new DefaultFactoryExtensionPoint();
+ FactoryExtensionPoint factories = new DefaultFactoryExtensionPoint(new
DefaultExtensionPointRegistry());
resolver = new ExtensibleModelResolver(null, resolvers, factories,
null);
Modified:
tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
(original)
+++
tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
Fri Oct 24 15:51:06 2008
@@ -44,10 +44,13 @@
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -66,6 +69,15 @@
private boolean hasSchemas;
private Schema aggregatedSchema;
+ public DefaultValidatingXMLInputFactory(ExtensionPointRegistry registry) {
+ FactoryExtensionPoint factoryExtensionPoint =
registry.getExtensionPoint(FactoryExtensionPoint.class);
+ XMLInputFactory factory =
factoryExtensionPoint.getFactory(XMLInputFactory.class);
+ this.inputFactory = factory;
+ this.schemas =
registry.getExtensionPoint(ValidationSchemaExtensionPoint.class);
+ this.monitor =
+
registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(MonitorFactory.class).createMonitor();
+ }
+
/**
* Constructs a new XMLInputFactory.
*
Modified:
tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
(original)
+++
tuscany/branches/sca-equinox/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
Fri Oct 24 15:51:06 2008
@@ -27,16 +27,4 @@
* @version $Rev$ $Date$
*/
public abstract class ValidatingXMLInputFactory extends XMLInputFactory {
-
- /**
- * Create a new default validating XML input factory.
- * @return
- */
- public static ValidatingXMLInputFactory newInstance() {
- return new DefaultValidatingXMLInputFactory(
-
XMLInputFactory.newInstance(),
- new
DefaultValidationSchemaExtensionPoint(),
- null);
- }
-
}
Modified:
tuscany/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
Fri Oct 24 15:51:06 2008
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.ContributionFactory;
import org.apache.tuscany.sca.contribution.DefaultContributionFactory;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.junit.Before;
@@ -45,7 +46,7 @@
ModelResolverExtensionPoint resolvers = new
DefaultModelResolverExtensionPoint();
resolvers.addResolver(Model.class, TestModelResolver.class);
- FactoryExtensionPoint factories = new DefaultFactoryExtensionPoint();
+ FactoryExtensionPoint factories = new DefaultFactoryExtensionPoint(new
DefaultExtensionPointRegistry());
resolver = new ExtensibleModelResolver(null, resolvers, factories,
null);
Modified:
tuscany/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
(original)
+++
tuscany/branches/sca-equinox/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
Fri Oct 24 15:51:06 2008
@@ -28,6 +28,7 @@
import org.apache.tuscany.sca.contribution.resolver.ClassReference;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint;
import com.example.ipo.sdo.SdoFactory;
@@ -69,7 +70,7 @@
@Override
protected void setUp() throws Exception {
- loader = new ImportSDOProcessor(new DefaultFactoryExtensionPoint(),
null);
+ loader = new ImportSDOProcessor(new DefaultFactoryExtensionPoint(new
DefaultExtensionPointRegistry()), null);
xmlFactory = XMLInputFactory.newInstance();
}
Modified:
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
(original)
+++
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
Fri Oct 24 15:51:06 2008
@@ -33,13 +33,14 @@
* @version $Rev$ $Date$
*/
public class DefaultFactoryExtensionPoint implements FactoryExtensionPoint {
-
+ private ExtensionPointRegistry extensionPointRegistry;
private HashMap<Class<?>, Object> factories = new HashMap<Class<?>,
Object>();
/**
* Constructs a new DefaultModelFactoryExtensionPoint.
*/
- public DefaultFactoryExtensionPoint() {
+ public DefaultFactoryExtensionPoint(ExtensionPointRegistry
extensionPointRegistry) {
+ this.extensionPointRegistry = extensionPointRegistry;
}
/**
@@ -88,43 +89,35 @@
public <T> T getFactory(Class<T> factoryInterface) {
Object factory = factories.get(factoryInterface);
if (factory == null) {
-
- if (factoryInterface.isInterface()) {
-
- // Dynamically load a factory class declared under
META-INF/services
- try {
- ServiceDeclaration factoryDeclaration =
ServiceDiscovery.getInstance().getFirstServiceDeclaration(factoryInterface.getName());
- if (factoryDeclaration != null) {
- Class<?> factoryClass =
factoryDeclaration.loadClass();
-
+
+ // Dynamically load a factory class declared under
META-INF/services
+ try {
+ ServiceDeclaration factoryDeclaration =
+
ServiceDiscovery.getInstance().getFirstServiceDeclaration(factoryInterface.getName());
+ if (factoryDeclaration != null) {
+ Class<?> factoryClass = factoryDeclaration.loadClass();
+
+ try {
+ // Default empty constructor
+ Constructor<?> constructor =
factoryClass.getConstructor();
+ factory = constructor.newInstance();
+ } catch (NoSuchMethodException e) {
try {
- // Default empty constructor
- Constructor<?> constructor =
factoryClass.getConstructor();
- factory = constructor.newInstance();
- } catch (NoSuchMethodException e) {
-
// Constructor taking the model factory extension
point
Constructor<?> constructor =
factoryClass.getConstructor(FactoryExtensionPoint.class);
factory = constructor.newInstance(this);
+ } catch (NoSuchMethodException e1) {
+ // Constructor taking the extension point registry
+ Constructor<?> constructor =
factoryClass.getConstructor(ExtensionPointRegistry.class);
+ factory =
constructor.newInstance(extensionPointRegistry);
}
-
- // Cache the loaded factory
- addFactory(factory);
}
- } catch (Exception e) {
- throw new IllegalArgumentException(e);
- }
- } else {
- // Call the newInstance static method on the factory abstract
class
- try {
- factory =
ServiceDiscovery.getInstance().newFactoryClassInstance(factoryInterface.getName());
- } catch (Exception e) {
- throw new IllegalArgumentException(e);
+ // Cache the loaded factory
+ addFactory(factory);
}
-
- // Cache the factory
- addFactory(factory);
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e);
}
}
return factoryInterface.cast(factory);
Modified:
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
(original)
+++
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
Fri Oct 24 15:51:06 2008
@@ -24,8 +24,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.ref.WeakReference;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLConnection;
import java.security.AccessController;
@@ -45,7 +43,7 @@
/**
* A ServiceDiscoverer that find META-INF/services/... using the Context
ClassLoader.
*
- * @version $Rev: $ $Date: $
+ * @version $Rev$ $Date$
*/
public class ContextClassLoaderServiceDiscoverer implements ServiceDiscoverer {
private static final Logger logger =
Logger.getLogger(ContextClassLoaderServiceDiscoverer.class.getName());
@@ -243,11 +241,4 @@
}
- public Object newFactoryClassInstance(String name) throws
SecurityException, NoSuchMethodException, InvocationTargetException,
IllegalAccessException, ClassNotFoundException {
- Class<?> factoryClass = Class.forName(name, false,
classLoaderReference.get());
- Method newInstanceMethod = factoryClass.getMethod("newInstance");
- Object factory = newInstanceMethod.invoke(null);
- return factory;
- }
-
}
Modified:
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
(original)
+++
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
Fri Oct 24 15:51:06 2008
@@ -47,16 +47,4 @@
*/
public ServiceDeclaration getFirstServiceDeclaration(String name) throws
IOException;
- /**
- * Create a new instance of a factory service class.
- *
- * @param name
- * @return service implementation class
- * @throws SecurityException
- * @throws NoSuchMethodException
- * @throws InvocationTargetException
- * @throws IllegalAccessException
- */
- public Object newFactoryClassInstance(String name) throws
SecurityException, NoSuchMethodException, InvocationTargetException,
IllegalAccessException, ClassNotFoundException;
-
}
Modified:
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
(original)
+++
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
Fri Oct 24 15:51:06 2008
@@ -20,7 +20,6 @@
package org.apache.tuscany.sca.extensibility;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Set;
@@ -84,9 +83,17 @@
return service;
}
- public Object newFactoryClassInstance(String name) throws
SecurityException, NoSuchMethodException, InvocationTargetException,
IllegalAccessException, ClassNotFoundException {
- Object factory = getServiceDiscoverer().newFactoryClassInstance(name);
- return factory;
+ public Object newFactoryClassInstance(String name) {
+ try {
+ ServiceDeclaration declaration = getFirstServiceDeclaration(name);
+ if (declaration == null) {
+ return null;
+ }
+ Class<?> factoryClass = declaration.loadClass();
+ return factoryClass.newInstance();
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e);
+ }
}
}
Modified: tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml Fri Oct 24
15:51:06 2008
@@ -87,8 +87,12 @@
<id>build-thirdparty-distro</id>
<phase>generate-resources</phase>
<goals>
- <goal>build-thirdparty-distro</goal>
+ <goal>generate-modules</goal>
</goals>
+ <configuration>
+
<generateTargetPlatform>true</generateTargetPlatform>
+ <generatePlugin>true</generatePlugin>
+ </configuration>
</execution>
<!--
Modified: tuscany/branches/sca-equinox/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/pom.xml?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/pom.xml (original)
+++ tuscany/branches/sca-equinox/pom.xml Fri Oct 24 15:51:06 2008
@@ -244,6 +244,9 @@
<module>demos</module>
<module>distribution</module>
</modules>
+ <build>
+ <defaultGoal>eclipse:eclipse</defaultGoal>
+ </build>
</profile>
<profile>
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
tuscany/branches/sca-equinox/samples/calculator-osgi/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml Fri Oct 24
15:51:06 2008
@@ -198,7 +198,7 @@
<Bundle-Description>${pom.name}</Bundle-Description>
<Bundle-Activator>calculator.rcp.Activator</Bundle-Activator>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>calculator.rcp*</Export-Package>
+ <Export-Package></Export-Package>
</instructions>
<manifestLocation>${basedir}/META-INF</manifestLocation>
</configuration>
Modified:
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java?rev=707774&r1=707773&r2=707774&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
(original)
+++
tuscany/branches/sca-equinox/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
Fri Oct 24 15:51:06 2008
@@ -215,7 +215,6 @@
// Copy a WAR as is
log.info("Adding WAR artifact: " + artifact);
copyFile(artifactFile, root);
- bundleSymbolicNames.add(bundleName);
} else {
