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 2006/02/28 09:16:32 UTC
svn commit: r381587 - in
/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model:
assembly/ assembly/impl/ scdl/loader/impl/ types/wsdl/impl/
Author: jsdelfino
Date: Tue Feb 28 00:16:29 2006
New Revision: 381587
URL: http://svn.apache.org/viewcvs?rev=381587&view=rev
Log:
web service entry point bringup - fixed wiring of an entry point to its target component or external service
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java?rev=381587&r1=381586&r2=381587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/AssemblyFactory.java Tue Feb 28 00:16:29 2006
@@ -141,10 +141,11 @@
/**
* Creates a new ServiceURI from a module component and configured port.
* @param moduleComponent
+ * @param aggregatePart
* @param configuredPort
* @return
*/
- ServiceURI createServiceURI(ModuleComponent moduleComponent, ConfiguredPort configuredPort);
+ ServiceURI createServiceURI(ModuleComponent moduleComponent, AggregatePart aggregatePart, ConfiguredPort configuredPort);
/**
* Create a qname from a URI
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java?rev=381587&r1=381586&r2=381587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/AssemblyFactoryImpl.java Tue Feb 28 00:16:29 2006
@@ -18,6 +18,7 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.model.assembly.AggregatePart;
import org.apache.tuscany.model.assembly.AssemblyFactory;
import org.apache.tuscany.model.assembly.ComponentType;
import org.apache.tuscany.model.assembly.ConfiguredPort;
@@ -42,6 +43,7 @@
import org.apache.tuscany.model.types.wsdl.impl.WSDLServiceContractImpl;
/**
+ * Default implementation of AssemblyFactory
*/
public class AssemblyFactoryImpl implements AssemblyFactory {
@@ -178,11 +180,11 @@
return new ServiceURIImpl(moduleComponent, serviceName);
}
- /**
- * @see org.apache.tuscany.model.assembly.AssemblyFactory#createServiceURI(org.apache.tuscany.model.assembly.ModuleComponent, org.apache.tuscany.model.assembly.ConfiguredPort)
+ /*
+ * @see org.apache.tuscany.model.assembly.AssemblyFactory#createServiceURI(org.apache.tuscany.model.assembly.ModuleComponent, org.apache.tuscany.model.assembly.AggregatePart, org.apache.tuscany.model.assembly.ConfiguredPort)
*/
- public ServiceURI createServiceURI(ModuleComponent moduleComponent, ConfiguredPort portEndpoint) {
- return new ServiceURIImpl(moduleComponent, portEndpoint);
+ public ServiceURI createServiceURI(ModuleComponent moduleComponent, AggregatePart aggregatePart, ConfiguredPort configuredPort) {
+ return new ServiceURIImpl(moduleComponent, aggregatePart, configuredPort);
}
/**
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java?rev=381587&r1=381586&r2=381587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/impl/ServiceURIImpl.java Tue Feb 28 00:16:29 2006
@@ -51,14 +51,14 @@
* @param moduleComponent
* @param configuredPort
*/
- protected ServiceURIImpl(ModuleComponent moduleComponent, ConfiguredPort configuredPort) {
+ protected ServiceURIImpl(ModuleComponent moduleComponent, AggregatePart aggregatePart, ConfiguredPort configuredPort) {
if (moduleComponent != null)
moduleComponentName = moduleComponent.getName();
else
moduleComponentName = "";
if (configuredPort instanceof ConfiguredService) {
+ partName = aggregatePart.getName();
ConfiguredService configuredService = (ConfiguredService) configuredPort;
- partName = configuredService.getAggregatePart().getName();
Service service = configuredService.getService();
if (service != null) {
serviceName = configuredService.getService().getName();
@@ -69,10 +69,12 @@
} else if (configuredPort instanceof ConfiguredReference) {
ConfiguredReference configuredReference = (ConfiguredReference) configuredPort;
- AggregatePart part = configuredReference.getAggregatePart();
- partName = part.getName();
+ partName = aggregatePart.getName();
serviceName = configuredReference.getReference().getName();
- address = "sca:///" + moduleComponentName + '/' + partName + '/' + serviceName;
+ if (serviceName!=null)
+ address = "sca:///" + moduleComponentName + '/' + partName + '/' + serviceName;
+ else
+ address = "sca:///" + moduleComponentName + '/' + partName;
}
isSCAScheme = Boolean.TRUE;
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java?rev=381587&r1=381586&r2=381587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java Tue Feb 28 00:16:29 2006
@@ -16,6 +16,7 @@
*/
package org.apache.tuscany.model.scdl.loader.impl;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -480,7 +481,7 @@
if (configuredReference == null) {
throw new IllegalArgumentException("Undefined reference " + referenceName);
}
- ServiceURI referenceURI=factory.createServiceURI(null, configuredReference);
+ ServiceURI referenceURI=factory.createServiceURI(null, component, configuredReference);
// Get the reference value text
Sequence text = referenceElement.getSequence(0);
@@ -504,7 +505,7 @@
/**
* @see org.apache.tuscany.model.scdl.util.ScdlSwitch#caseEntryPoint(org.apache.tuscany.model.scdl.EntryPoint)
*/
- public Object caseEntryPoint(EntryPoint object) {
+ public Object caseEntryPoint(final EntryPoint object) {
final org.apache.tuscany.model.assembly.EntryPoint entryPoint=factory.createEntryPoint();
entryPoint.setName(object.getName());
@@ -515,15 +516,28 @@
configuredService.setService(service);
entryPoint.setConfiguredService(configuredService);
org.apache.tuscany.model.assembly.Reference reference=factory.createReference();
- reference.setName("");
+ reference.setName(null);
reference.setMultiplicity(transformMultiplicity(object.getMultiplicity()));
- ConfiguredReference configuredReference=factory.createConfiguredReference();
+ final ConfiguredReference configuredReference=factory.createConfiguredReference();
configuredReference.setReference(reference);
entryPoint.setConfiguredReference(configuredReference);
linkers.add(new Runnable() {
public void run() {
currentAggregate.getEntryPoints().add(entryPoint);
+
+ // Create wires to the target service
+ final List<Wire>wires=new ArrayList<Wire>();
+ ServiceURI referenceURI=factory.createServiceURI(null, entryPoint, configuredReference);
+ for (String uri : (List<String>)object.getReference()) {
+ ServiceURI serviceURI=factory.createServiceURI(null, uri);
+ final Wire wire=factory.createWire();
+ wire.setSource(referenceURI);
+ wire.setTarget(serviceURI);
+ wires.add(wire);
+ }
+
+ currentAggregate.getWires().addAll(wires);
};
});
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java?rev=381587&r1=381586&r2=381587&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/wsdl/impl/WSDLServiceContractImpl.java Tue Feb 28 00:16:29 2006
@@ -193,8 +193,8 @@
String methodName=XMLNameUtil.getJavaNameFromXMLName(operation.getName(), false);
//FIXME integrate XSD to Java type mapping here
- String inputType = Type.getDescriptor(Object.class);
- String outputType = Type.getDescriptor(Object.class);
+ String inputType = Type.getDescriptor(String.class);
+ String outputType = Type.getDescriptor(String.class);
cw.visitMethod(ACC_PUBLIC + ACC_ABSTRACT, methodName, "("+inputType+")"+outputType, null, null).visitEnd();
}