You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/02/15 14:14:15 UTC
svn commit: r628054 - in /incubator/tuscany/java/sca/modules:
binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/
binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/
binding-sca/src/main/java/org/apache/tuscany/sca/bi...
Author: slaws
Date: Fri Feb 15 05:14:14 2008
New Revision: 628054
URL: http://svn.apache.org/viewvc?rev=628054&view=rev
Log:
TUSCANY-2047
Address a FIXME in the SCABindingProcessor to allow the binding processor to be loaded through the normal extension loading process rather than being created explicitly in the ReallySmallRuntime. In theory this would make it easier for people to provide their own binding.sca implementation.
Modified:
incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
Modified: incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java?rev=628054&r1=628053&r2=628054&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java Fri Feb 15 05:14:14 2008
@@ -62,15 +62,6 @@
policyProcessor = new PolicyAttachPointProcessor(policyFactory);
this.intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
}
-
- //FIXME Remove this constructor
- public SCABindingProcessor(AssemblyFactory assemblyFactory,
- PolicyFactory policyFactory,
- SCABindingFactory scaBindingFactory) {
- this.policyFactory = policyFactory;
- this.scaBindingFactory = scaBindingFactory;
- policyProcessor = new PolicyAttachPointProcessor(policyFactory);
- }
public QName getArtifactType() {
return BINDING_SCA_QNAME;
Modified: incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java?rev=628054&r1=628053&r2=628054&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java Fri Feb 15 05:14:14 2008
@@ -82,9 +82,7 @@
SCABindingFactory scaFactory = new SCABindingFactoryImpl();
factories.addFactory(scaFactory);
- SCABindingProcessor wsdlProcessor = new SCABindingProcessor(assemblyFactory,
- policyFactory,
- scaFactory);
+ SCABindingProcessor wsdlProcessor = new SCABindingProcessor(factories);
staxProcessors.addArtifactProcessor(wsdlProcessor);
}
Modified: incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java?rev=628054&r1=628053&r2=628054&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java Fri Feb 15 05:14:14 2008
@@ -80,9 +80,7 @@
staxProcessors.addArtifactProcessor(new ComponentTypeProcessor(factory, policyFactory, staxProcessor));
staxProcessors.addArtifactProcessor(new ConstrainingTypeProcessor(factory, policyFactory, staxProcessor));
- SCABindingProcessor scaProcessor = new SCABindingProcessor(factory,
- policyFactory,
- scaFactory);
+ SCABindingProcessor scaProcessor = new SCABindingProcessor(factories);
staxProcessors.addArtifactProcessor(scaProcessor);
}
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java?rev=628054&r1=628053&r2=628054&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java Fri Feb 15 05:14:14 2008
@@ -28,6 +28,10 @@
* @version $Rev$ $Date$
*/
public class SCABindingFactoryImpl implements SCABindingFactory {
+
+ public SCABindingFactoryImpl (){
+
+ }
public SCABinding createSCABinding() {
return new SCABindingImpl();
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java?rev=628054&r1=628053&r2=628054&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java Fri Feb 15 05:14:14 2008
@@ -117,6 +117,13 @@
factories.addFactory(assemblyFactory);
PolicyFactory policyFactory = new DefaultPolicyFactory();
factories.addFactory(policyFactory);
+
+ // Load the runtime modules
+ modules = loadModules(registry);
+
+ // Start the runtime modules
+ startModules(registry, modules);
+
SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class);
IntentAttachPointTypeFactory intentAttachPointTypeFactory = new DefaultIntentAttachPointTypeFactory();
factories.addFactory(intentAttachPointTypeFactory);
@@ -144,31 +151,9 @@
scopeRegistry,
workScheduler);
-
- // Load the runtime modules
- modules = loadModules(registry);
-
- // Start the runtime modules
- startModules(registry, modules);
-
// Load the definitions.xml
loadSCADefinitions(registry);
- //Create a composite builder
- /*compositeBuilder = ReallySmallRuntimeBuilder.createCompositeBuilder(assemblyFactory,
- scaBindingFactory,
- intentAttachPointTypeFactory,
- mapper,
- domainPolicySets);
- */
-
- //Create a domain builder
- /*domainBuilder = ReallySmallRuntimeBuilder.createDomainBuilder(assemblyFactory,
- scaBindingFactory,
- intentAttachPointTypeFactory,
- mapper,
- domainPolicySets);
- */
if (logger.isLoggable(Level.FINE)) {
long end = System.currentTimeMillis();
logger.fine("The tuscany runtime is started in " + (end - start) + " ms.");
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java?rev=628054&r1=628053&r2=628054&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java Fri Feb 15 05:14:14 2008
@@ -120,13 +120,9 @@
registry.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
RuntimeWireProcessor wireProcessor = new ExtensibleWireProcessor(wireProcessors);
- // Add the SCABindingProcessor extension
- PolicyFactory policyFactory = registry.getExtensionPoint(PolicyFactory.class);
- SCABindingProcessor scaBindingProcessor =
- new SCABindingProcessor(assemblyFactory, policyFactory, scaBindingFactory);
+ // Retireve the processors extension point
StAXArtifactProcessorExtensionPoint processors =
- registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- processors.addArtifactProcessor(scaBindingProcessor);
+ registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
// Create a provider factory extension point
ProviderFactoryExtensionPoint providerFactories =
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org