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 2010/03/05 02:05:57 UTC
svn commit: r919254 - in /tuscany/sca-java-2.x/trunk:
modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/
modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/
modules/assembly/src/main/java/org/apache/tuscany/sca/assembly...
Author: rfeng
Date: Fri Mar 5 01:05:56 2010
New Revision: 919254
URL: http://svn.apache.org/viewvc?rev=919254&view=rev
Log:
Remove DistributedSCABinding
Removed:
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
tuscany/sca-java-2.x/trunk/shades/base/pom.xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java?rev=919254&r1=919253&r2=919254&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java Fri Mar 5 01:05:56 2010
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.assembly.xml;
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
@@ -33,8 +32,4 @@
return new TestSCABindingImpl();
}
- public DistributedSCABinding createDistributedSCABinding() {
- return null;
- }
-
}
Modified: tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java?rev=919254&r1=919253&r2=919254&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java Fri Mar 5 01:05:56 2010
@@ -32,6 +32,4 @@
*/
SCABinding createSCABinding();
- DistributedSCABinding createDistributedSCABinding();
-
}
Modified: tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java?rev=919254&r1=919253&r2=919254&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java Fri Mar 5 01:05:56 2010
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.assembly.impl;
-import org.apache.tuscany.sca.assembly.DistributedSCABinding;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
@@ -38,8 +37,4 @@
return new SCABindingImpl();
}
- public DistributedSCABinding createDistributedSCABinding() {
- return new DistributedSCABindingImpl();
- }
-
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java?rev=919254&r1=919253&r2=919254&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java Fri Mar 5 01:05:56 2010
@@ -65,10 +65,6 @@
public DefaultSCABindingMapper(ExtensionPointRegistry registry, Map<String, String> attributes) {
this.registry = registry;
- providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
- BuilderExtensionPoint builders = registry.getExtensionPoint(BuilderExtensionPoint.class);
- StAXArtifactProcessorExtensionPoint processors =
- registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
if (attributes != null) {
String qname = attributes.get("mappedBinding");
if (qname != null) {
@@ -86,8 +82,10 @@
}
}
+ providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
+ StAXArtifactProcessorExtensionPoint processors =
+ registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
processor = processors.getProcessor(mappedBinding);
- builder = builders.getBindingBuilder(mappedBinding);
if (processor == null) {
logger.warning("Mapped binding for binding.sca is not supported: " + mappedBinding);
}
@@ -104,6 +102,8 @@
} catch (Throwable e) {
throw new ServiceRuntimeException(e);
}
+ BuilderExtensionPoint builders = registry.getExtensionPoint(BuilderExtensionPoint.class);
+ builder = builders.getBindingBuilder(mappedBinding);
remotable = isDistributed() && processor != null;
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java?rev=919254&r1=919253&r2=919254&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java Fri Mar 5 01:05:56 2010
@@ -69,7 +69,6 @@
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class);
Assert.assertNotNull(factory.createSCABinding());
- Assert.assertNotNull(factory.createDistributedSCABinding());
}
@Test
Modified: tuscany/sca-java-2.x/trunk/shades/base/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/base/pom.xml?rev=919254&r1=919253&r2=919254&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/base/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/base/pom.xml Fri Mar 5 01:05:56 2010
@@ -59,17 +59,17 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
+ <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-client-javascript</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-rmi</artifactId>
+ <artifactId>tuscany-sca-client-impl</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>