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/04/10 09:25:37 UTC
svn commit: r527048 - in /incubator/tuscany/java/sca/modules:
assembly/src/main/java/org/apache/tuscany/assembly/
assembly/src/main/java/org/apache/tuscany/assembly/impl/
assembly/src/main/java/org/apache/tuscany/assembly/util/
implementation-java/src/...
Author: jsdelfino
Date: Tue Apr 10 00:25:33 2007
New Revision: 527048
URL: http://svn.apache.org/viewvc?view=rev&rev=527048
Log:
Match references with no service name to the first service of the target component. Added back pointer to the component to the SCABinding model object.
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/SCABindingImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/DefaultJavaImplementationFactory.java
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java?view=diff&rev=527048&r1=527047&r2=527048
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/SCABinding.java Tue Apr 10 00:25:33 2007
@@ -24,5 +24,9 @@
* @version $Rev$ $Date$
*/
public interface SCABinding extends Binding {
+
+ Component getComponent();
+
+ void setComponent(Component component);
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/SCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/SCABindingImpl.java?view=diff&rev=527048&r1=527047&r2=527048
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/SCABindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/SCABindingImpl.java Tue Apr 10 00:25:33 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.assembly.impl;
+import org.apache.tuscany.assembly.Component;
import org.apache.tuscany.assembly.SCABinding;
/**
@@ -26,5 +27,15 @@
* @version $Rev$ $Date$
*/
public class SCABindingImpl extends BindingImpl implements SCABinding {
+
+ private Component component;
+
+ public Component getComponent() {
+ return component;
+ }
+
+ public void setComponent(Component component) {
+ this.component = component;
+ }
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java?view=diff&rev=527048&r1=527047&r2=527048
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java Tue Apr 10 00:25:33 2007
@@ -162,14 +162,17 @@
Map<String, ComponentService> componentServices = new HashMap<String, ComponentService>();
Map<String, ComponentReference> componentReferences = new HashMap<String, ComponentReference>();
for (Component component : composite.getComponents()) {
+ int i =0;
for (ComponentService componentService : component.getServices()) {
- String uri;
- if (componentService.getName() != null) {
- uri = component.getName() + '/' + componentService.getName();
- } else {
- uri = component.getName();
- }
+
+ // Index services as component name / service name
+ String uri = component.getName() + '/' + componentService.getName();
componentServices.put(uri, componentService);
+ if (i ==0) {
+ // Index the first service of a component as the component name
+ componentServices.put(component.getName(), componentService);
+ }
+ i++;
// Create and configure an SCA binding for the service
SCABinding scaBinding = componentService.getBinding(SCABinding.class);
@@ -178,6 +181,7 @@
componentService.getBindings().add(scaBinding);
}
scaBinding.setURI(uri);
+ scaBinding.setComponent(component);
}
for (ComponentReference componentReference : component.getReferences()) {
String uri = component.getName() + '/' + componentReference.getName();
@@ -190,6 +194,7 @@
componentReference.getBindings().add(scaBinding);
}
scaBinding.setURI(uri);
+ scaBinding.setComponent(component);
}
}
Modified: incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/DefaultJavaImplementationFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/DefaultJavaImplementationFactory.java?view=diff&rev=527048&r1=527047&r2=527048
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/DefaultJavaImplementationFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/implementation/java/impl/DefaultJavaImplementationFactory.java Tue Apr 10 00:25:33 2007
@@ -22,9 +22,8 @@
* A factory for the Java model.
*/
import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.assembly.Service;
-import org.apache.tuscany.implementation.java.JavaImplementationFactory;
import org.apache.tuscany.implementation.java.JavaImplementation;
+import org.apache.tuscany.implementation.java.JavaImplementationFactory;
public class DefaultJavaImplementationFactory implements JavaImplementationFactory {
@@ -36,11 +35,6 @@
public JavaImplementation createJavaImplementation() {
JavaImplementation javaImplementation = new JavaImplementationImpl();
-
- // TODO temporary, services should be created by introspecting
- // the implementation
- Service service = assemblyFactory.createService();
- javaImplementation.getServices().add(service);
return javaImplementation;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org