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/07 09:53:50 UTC
svn commit: r526394 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/
assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/
assembly-xml/src/test/resources/ assembly/src/main/java/org/apach...
Author: jsdelfino
Date: Sat Apr 7 00:53:48 2007
New Revision: 526394
URL: http://svn.apache.org/viewvc?view=rev&rev=526394
Log:
Added copy constructors to the assembly model classes, suppport for deep copy of included composites, and correct read/write of composite qnames.
Removed:
incubator/tuscany/java/sca/modules/assembly/src/test/resources/Calculator.composite
incubator/tuscany/java/sca/modules/assembly/src/test/resources/CalculatorComponent.constrainingType
incubator/tuscany/java/sca/modules/assembly/src/test/resources/CalculatorImpl.componentType
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/Calculator.composite
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/CalculatorComponent.constrainingType
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllCalculator.composite
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllDivide.composite
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractPropertyImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractReferenceImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractServiceImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/BaseImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentPropertyImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentReferenceImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentServiceImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeReferenceImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeServiceImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/PropertyImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ReferenceImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ServiceImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/WireImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
incubator/tuscany/java/sca/modules/idl-java-xml/pom.xml
incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/Calculator.composite
incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/CalculatorComponent.constrainingType
incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/Calculator.composite
incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/CalculatorComponent.constrainingType
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeProcessor.java Sat Apr 7 00:53:48 2007
@@ -208,7 +208,7 @@
try {
writeStartDocument(writer, COMPONENT_TYPE,
- new XAttr(Constants.CONSTRAINING_TYPE, getConstrainingTypeAttr(componentType)));
+ new XAttr(CONSTRAINING_TYPE, getConstrainingTypeAttr(componentType)));
for (Service service : componentType.getServices()) {
writeStart(writer, SERVICE, new XAttr(NAME, service.getName()));
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeProcessor.java Sat Apr 7 00:53:48 2007
@@ -115,7 +115,7 @@
// Read a <composite>
composite = factory.createComposite();
- composite.setName(getQName(reader, NAME));
+ composite.setName(new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME)));
composite.setAutowire(getBoolean(reader, AUTOWIRE));
composite.setLocal(getBoolean(reader, LOCAL));
composite.setConstrainingType(getConstrainingType(reader));
@@ -333,7 +333,10 @@
public void write(Composite composite, XMLStreamWriter writer) throws ContributionWriteException {
try {
- writeStartDocument(writer, COMPOSITE, new XAttr(CONSTRAINING_TYPE, getConstrainingTypeAttr(composite)));
+ writeStartDocument(writer, COMPOSITE,
+ new XAttr(CONSTRAINING_TYPE, getConstrainingTypeAttr(composite)),
+ new XAttr(TARGET_NAMESPACE, composite.getName().getNamespaceURI()),
+ new XAttr(NAME, composite.getName().getLocalPart()));
for (Service service : composite.getServices()) {
CompositeService compositeService = (CompositeService)service;
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeProcessor.java Sat Apr 7 00:53:48 2007
@@ -97,7 +97,7 @@
// Read a <constrainingType>
if (Constants.CONSTRAINING_TYPE_QNAME.equals(name)) {
constrainingType = factory.createConstrainingType();
- constrainingType.setName(getQName(reader, Constants.NAME));
+ constrainingType.setName(new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME)));
readIntents(constrainingType, reader);
} else if (Constants.SERVICE_QNAME.equals(name)) {
@@ -175,7 +175,9 @@
public void write(ConstrainingType constrainingType, XMLStreamWriter writer) throws ContributionWriteException {
try {
- writeStartDocument(writer, CONSTRAINING_TYPE);
+ writeStartDocument(writer, CONSTRAINING_TYPE,
+ new XAttr(TARGET_NAMESPACE, constrainingType.getName().getNamespaceURI()),
+ new XAttr(NAME, constrainingType.getName().getLocalPart()));
for (AbstractService service : constrainingType.getServices()) {
writeStart(writer, SERVICE, new XAttr(NAME, service.getName()));
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/ReadAllTestCase.java Sat Apr 7 00:53:48 2007
@@ -148,10 +148,17 @@
}
public void testReadCompositeAndWireIt() throws Exception {
- InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
+ DefaultArtifactResolver resolver = new DefaultArtifactResolver();
+
+ InputStream is = getClass().getClassLoader().getResourceAsStream("TestAllDivide.composite");
+ Composite included = registry.read(is, Composite.class);
+ assertNotNull(included);
+ resolver.put(included, included);
+
+ is = getClass().getClassLoader().getResourceAsStream("TestAllCalculator.composite");
Composite composite = registry.read(is, Composite.class);
assertNotNull(composite);
- registry.resolve(composite, new DefaultArtifactResolver());
+ registry.resolve(composite, resolver);
registry.wire(composite);
Component calcComponent = composite.getComponents().get(0);
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/Calculator.composite?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/Calculator.composite Sat Apr 7 00:53:48 2007
@@ -18,8 +18,9 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:calc="http://calc"
- name="calc:Calculator">
+ xmlns:calc="http://calc"
+ targetNamespace="http://calc"
+ name="Calculator">
<service name="CalculatorService" promote="CalculatorServiceComponent">
<interface.java interface="calculator.CalculatorService"/>
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/CalculatorComponent.constrainingType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/CalculatorComponent.constrainingType?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/CalculatorComponent.constrainingType (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/CalculatorComponent.constrainingType Sat Apr 7 00:53:48 2007
@@ -19,7 +19,8 @@
-->
<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:calc="http://calc"
- name="calc:CalculatorComponent">
+ targetNamespace="http://calc"
+ name="CalculatorComponent">
<service name="CalculatorService">
<interface.java class="calculator.CalculatorService" />
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllCalculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllCalculator.composite?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllCalculator.composite (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllCalculator.composite Sat Apr 7 00:53:48 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<composite autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="tns:TestAllCalculator" policySets="sns:secure"
+<composite autowire="false" constrainingType="tns:CalculatorComponent" local="true" name="TestAllCalculator" policySets="sns:secure"
requires="cns:confidentiality" targetNamespace="http://calc" xmlns:tns="http://calc"
xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllDivide.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllDivide.composite?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllDivide.composite (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/TestAllDivide.composite Sat Apr 7 00:53:48 2007
@@ -2,7 +2,7 @@
<composite autowire="false"
constrainingType="tns:Calculator"
local="true"
- name="CompleteCalculator"
+ name="TestAllDivide"
policySets="" requires=""
targetNamespace="http://calc"
xmlns:tns="http://calc"
@@ -13,67 +13,26 @@
<include>tns:CompleteDivide</include>
- <service name="CalculatorService" policySets="" promote="CalculatorComponent/CalculatorService" requires="">
- <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback"/>
- <operation name="add" policySets="" requires=""/>
+ <service name="DivideService" policySets="" promote="CalculatorDivideComponent/DivideService" requires="">
+ <interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
+ <operation name="divide" policySets="" requires=""/>
<binding.ws name="CalculatorWS" policySets="" port="" requires="" uri="http://calc/ws">
- <operation name="add" policySets="" requires=""/>
+ <operation name="divide" policySets="" requires=""/>
</binding.ws>
<callback policySets="" requires="">
<binding.ws name="CalculatorCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">
- <operation name="addCallback" policySets="" requires=""/>
+ <operation name="divideCallback" policySets="" requires=""/>
</binding.ws>
</callback>
</service>
- <component name="CalculatorServiceComponent" autowire="false" constrainingType="tns:CalculatorServiceComponent" policySets="" requires="">
- <service name="CalculatorService" policySets="" requires="">
- <interface.java interface="calculator.CalculatorService" callbackInterface="calculator.CalculatorCallback"/>
+ <component name="CalculatorDivideComponent" autowire="false" constrainingType="tns:CalculatorServiceComponent" policySets="" requires="">
+ <service name="DivideService" policySets="" requires="">
+ <interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
</service>
-
- <reference name="addService" target="AddServiceComponent" autowire="false" multiplicity="1..1" policySets="" requires="" wiredByImpl="false">
- <interface.java interface="calculator.AddService" callbackInterface="calculator.AddCallback"/>
- </reference>
- <reference name="subtractService" target="SubtractServiceComponent"/>
- <reference name="multiplyService"/>
- <reference name="divideService" target="DivideServiceComponent"/>
-
- <property name="round" type="xsd:boolean" many="false">true</property>
-
- <implementation.java class="calculator.CalculatorServiceImpl" policySets="" requires=""/>
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
+ <implementation.java class="calculator.DivideImpl" policySets="" requires=""/>
</component>
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
- <reference name="MultiplyService" policySets="" promote="CalculatorComponent/multiplyService" requires="">
- <interface.java interface="calculator.MultiplyService" callbackInterface="calculator.MultiplyCallback"/>
- <operation name="multiply" policySets="" requires=""/>
-
- <binding.ws name="MultiplyWS" policySets="" port="" requires="" uri="http://calc/ws">
- <operation name="multiply" policySets="" requires=""/>
- </binding.ws>
-
- <callback policySets="" requires="">
- <binding.ws name="MultiplyCallbackWS" policySets="" port="" requires="" uri="http://calc/callback/ws">
- <operation name="multiplyCallback" policySets="" requires=""/>
- </binding.ws>
- </callback>
- </reference>
-
</composite>
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Composite.java Sat Apr 7 00:53:48 2007
@@ -96,4 +96,9 @@
*/
void setAutowire(boolean autowire);
+ /**
+ * Returns a copy of the composite.
+ * @return a copy of the composite.
+ */
+ Composite copy();
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/Wire.java Sat Apr 7 00:53:48 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.assembly;
+import org.apache.tuscany.assembly.util.Visitable;
import org.apache.tuscany.policy.IntentAttachPoint;
import org.apache.tuscany.policy.PolicySetAttachPoint;
@@ -26,7 +27,7 @@
*
* @version $Rev$ $Date$
*/
-public interface Wire extends Base, IntentAttachPoint, PolicySetAttachPoint {
+public interface Wire extends Base, IntentAttachPoint, PolicySetAttachPoint, Visitable {
/**
* Returns the source of the wire.
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractPropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractPropertyImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractPropertyImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractPropertyImpl.java Sat Apr 7 00:53:48 2007
@@ -41,6 +41,27 @@
private boolean mustSupply;
private List<Intent> requiredIntents = new ArrayList<Intent>();
+ /**
+ * Constructs a new abstract property.
+ */
+ public AbstractPropertyImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public AbstractPropertyImpl(AbstractProperty other) {
+ super(other);
+ defaultValue = other.getDefaultValue();
+ many = other.isMany();
+ mustSupply = other.isMustSupply();
+ name = other.getName();
+ xsdElement = other.getXSDElement();
+ xsdType = other.getXSDType();
+ requiredIntents.addAll(other.getRequiredIntents());
+ }
+
public Object getDefaultValue() {
return defaultValue;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractReferenceImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractReferenceImpl.java Sat Apr 7 00:53:48 2007
@@ -29,6 +29,21 @@
public class AbstractReferenceImpl extends ContractImpl implements AbstractReference {
private Multiplicity multiplicity = Multiplicity.ONE_ONE;
+ /**
+ * Constructs a new abstract reference.
+ */
+ public AbstractReferenceImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public AbstractReferenceImpl(AbstractReference other) {
+ super(other);
+ multiplicity = other.getMultiplicity();
+ }
+
public Multiplicity getMultiplicity() {
return multiplicity;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractServiceImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/AbstractServiceImpl.java Sat Apr 7 00:53:48 2007
@@ -26,5 +26,19 @@
* @version $Rev$ $Date$
*/
public class AbstractServiceImpl extends ContractImpl implements AbstractService {
+
+ /**
+ * Constructs a new abstract service.
+ */
+ public AbstractServiceImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param service
+ */
+ public AbstractServiceImpl(AbstractService other) {
+ super(other);
+ }
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/BaseImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/BaseImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/BaseImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/BaseImpl.java Sat Apr 7 00:53:48 2007
@@ -34,6 +34,21 @@
private List<Object> extensions = new ArrayList<Object>();
private boolean unresolved;
+ /**
+ * Constructs a new base model object.
+ */
+ public BaseImpl() {
+ }
+
+ /**
+ * Copy constructor
+ * @param other
+ */
+ public BaseImpl(Base other) {
+ unresolved = other.isUnresolved();
+ extensions.addAll(other.getExtensions());
+ }
+
public List<Object> getExtensions() {
return extensions;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentImpl.java Sat Apr 7 00:53:48 2007
@@ -46,6 +46,30 @@
private List<Intent> requiredIntents = new ArrayList<Intent>();
private List<PolicySet> policySets = new ArrayList<PolicySet>();
private boolean autowire;
+
+ /**
+ * Constructs a new component.
+ */
+ public ComponentImpl() {
+ }
+
+ public ComponentImpl(Component other) {
+ constrainingType = other.getConstrainingType();
+ implementation = other.getImplementation();
+ name = other.getName();
+ for (ComponentProperty property: other.getProperties()) {
+ properties.add(new ComponentPropertyImpl(property));
+ }
+ for (ComponentReference reference: other.getReferences()) {
+ references.add(new ComponentReferenceImpl(reference));
+ }
+ for (ComponentService service: other.getServices()) {
+ services.add(new ComponentServiceImpl(service));
+ }
+ requiredIntents.addAll(other.getRequiredIntents());
+ policySets.addAll(other.getPolicySets());
+ autowire = other.isAutowire();
+ }
public ConstrainingType getConstrainingType() {
return constrainingType;
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentPropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentPropertyImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentPropertyImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentPropertyImpl.java Sat Apr 7 00:53:48 2007
@@ -32,6 +32,23 @@
private Property property;
private String source;
+ /**
+ * Constructs a new component property.
+ */
+ public ComponentPropertyImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public ComponentPropertyImpl(ComponentProperty other) {
+ super(other);
+ file = other.getFile();
+ property = other.getProperty();
+ source = other.getSource();
+ }
+
public String getFile() {
return file;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentReferenceImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentReferenceImpl.java Sat Apr 7 00:53:48 2007
@@ -30,6 +30,21 @@
public class ComponentReferenceImpl extends ReferenceImpl implements ComponentReference {
private Reference reference;
+ /**
+ * Constructs a new component reference.
+ */
+ public ComponentReferenceImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public ComponentReferenceImpl(ComponentReference other) {
+ super(other);
+ reference = other.getReference();
+ }
+
public Reference getReference() {
return reference;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentServiceImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentServiceImpl.java Sat Apr 7 00:53:48 2007
@@ -29,6 +29,21 @@
*/
public class ComponentServiceImpl extends ServiceImpl implements ComponentService {
private Service service;
+
+ /**
+ * Constructs a new component service.
+ */
+ public ComponentServiceImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public ComponentServiceImpl(ComponentService other) {
+ super(other);
+ service = other.getService();
+ }
public Service getService() {
return service;
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ComponentTypeImpl.java Sat Apr 7 00:53:48 2007
@@ -42,6 +42,34 @@
private List<Service> services = new ArrayList<Service>();
private List<Intent> requiredIntents = new ArrayList<Intent>();
private List<PolicySet> policySets = new ArrayList<PolicySet>();
+
+ /**
+ * Constructs a new component type.
+ */
+ public ComponentTypeImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public ComponentTypeImpl(ComponentType other) {
+ super(other);
+ constrainingType = other.getConstrainingType();
+ getServices().clear();
+ for (Service service: other.getServices()) {
+ getServices().add(new ServiceImpl(service));
+ }
+ getReferences().clear();
+ for (Reference reference: other.getReferences()) {
+ getReferences().add(new ReferenceImpl(reference));
+ }
+ for (Property property: other.getProperties()) {
+ getProperties().add(new PropertyImpl(property));
+ }
+ requiredIntents.addAll(other.getRequiredIntents());
+ policySets.addAll(other.getPolicySets());
+ }
public ConstrainingType getConstrainingType() {
return constrainingType;
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeImpl.java Sat Apr 7 00:53:48 2007
@@ -26,7 +26,13 @@
import org.apache.tuscany.assembly.Component;
import org.apache.tuscany.assembly.Composite;
+import org.apache.tuscany.assembly.CompositeReference;
+import org.apache.tuscany.assembly.CompositeService;
+import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.assembly.Reference;
+import org.apache.tuscany.assembly.Service;
import org.apache.tuscany.assembly.Wire;
+import org.apache.tuscany.assembly.util.Visitor;
public class CompositeImpl extends ComponentTypeImpl implements Composite {
private List<Component> components = new ArrayList<Component>();
@@ -35,6 +41,40 @@
private List<Wire> wires = new ArrayList<Wire>();
private boolean autowire;
private boolean local = true;
+
+ /**
+ * Constructs a new composite.
+ */
+ public CompositeImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public CompositeImpl(Composite other) {
+ super(other);
+ for (Component component: other.getComponents()) {
+ components.add(new ComponentImpl(component));
+ }
+ getServices().clear();
+ for (Service service: other.getServices()) {
+ getServices().add(new CompositeServiceImpl((CompositeService)service));
+ }
+ getReferences().clear();
+ for (Reference reference: other.getReferences()) {
+ getReferences().add(new CompositeReferenceImpl((CompositeReference)reference));
+ }
+ for (Property property: other.getProperties()) {
+ getProperties().add(new PropertyImpl(property));
+ }
+ name = other.getName();
+ for (Wire wire: other.getWires()) {
+ wires.add(new WireImpl(wire));
+ }
+ autowire = other.isAutowire();
+ local = other.isLocal();
+ }
public List<Component> getComponents() {
return components;
@@ -70,6 +110,25 @@
public void setName(QName name) {
this.name = name;
+ }
+
+ @Override
+ public boolean accept(Visitor visitor) {
+ boolean result = super.accept(visitor);
+ if (!result) {
+ return false;
+ }
+
+ for (Wire wire: wires) {
+ if (!wire.accept(visitor))
+ return false;
+ }
+ return true;
+ }
+
+ public Composite copy() {
+ CompositeImpl copy = new CompositeImpl(this);
+ return copy;
}
@Override
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeReferenceImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeReferenceImpl.java Sat Apr 7 00:53:48 2007
@@ -33,6 +33,21 @@
public class CompositeReferenceImpl extends ReferenceImpl implements CompositeReference {
private List<ComponentReference> promotedReferences = new ArrayList<ComponentReference>();
+ /**
+ * Constructs a new composite reference.
+ */
+ public CompositeReferenceImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public CompositeReferenceImpl(CompositeReference other) {
+ super(other);
+ promotedReferences.addAll(other.getPromotedReferences());
+ }
+
public List<ComponentReference> getPromotedReferences() {
return promotedReferences;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeServiceImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/CompositeServiceImpl.java Sat Apr 7 00:53:48 2007
@@ -19,10 +19,6 @@
package org.apache.tuscany.assembly.impl;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.assembly.Binding;
import org.apache.tuscany.assembly.ComponentService;
import org.apache.tuscany.assembly.CompositeService;
@@ -32,13 +28,23 @@
* @version $Rev$ $Date$
*/
public class CompositeServiceImpl extends ServiceImpl implements CompositeService {
- private List<Binding> callbackBindings = new ArrayList<Binding>();
private ComponentService promotedService;
- public List<Binding> getCallbackBindings() {
- return callbackBindings;
+ /**
+ * Constructs a new composite service.
+ */
+ public CompositeServiceImpl() {
}
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public CompositeServiceImpl(CompositeService other) {
+ super(other);
+ promotedService = other.getPromotedService();
+ }
+
public ComponentService getPromotedService() {
return promotedService;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ContractImpl.java Sat Apr 7 00:53:48 2007
@@ -30,6 +30,24 @@
private Interface callInterface;
private String name;
private List<Intent> requiredIntents = new ArrayList<Intent>();
+
+ /**
+ * Constructs a new contract.
+ */
+ public ContractImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public ContractImpl(AbstractContract other) {
+ super(other);
+ callbackInterface = other.getCallbackInterface();
+ callInterface = other.getInterface();
+ name = other.getName();
+ requiredIntents.addAll(other.getRequiredIntents());
+ }
public Interface getCallbackInterface() {
return callbackInterface;
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/PropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/PropertyImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/PropertyImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/PropertyImpl.java Sat Apr 7 00:53:48 2007
@@ -33,6 +33,20 @@
public class PropertyImpl extends AbstractPropertyImpl implements Property {
private List<PolicySet> policySets = new ArrayList<PolicySet>();
+ /**
+ * Constructs a new property.
+ */
+ public PropertyImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ */
+ public PropertyImpl(Property other) {
+ super(other);
+ policySets.addAll(other.getPolicySets());
+ }
+
public List<PolicySet> getPolicySets() {
return policySets;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ReferenceImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ReferenceImpl.java Sat Apr 7 00:53:48 2007
@@ -41,6 +41,26 @@
private Callback callback;
private boolean autowire;
+ /**
+ * Constructs a new reference.
+ */
+ public ReferenceImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param reference
+ */
+ public ReferenceImpl(Reference other) {
+ super(other);
+ bindings.addAll(other.getBindings());
+ wiredByImpl = other.isWiredByImpl();
+ policySets.addAll(other.getPolicySets());
+ targets.addAll(other.getTargets());
+ callback = other.getCallback();
+ autowire = other.isAutowire();
+ }
+
public List<Binding> getBindings() {
return bindings;
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ServiceImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/ServiceImpl.java Sat Apr 7 00:53:48 2007
@@ -36,6 +36,23 @@
private List<Binding> bindings = new ArrayList<Binding>();
private List<PolicySet> policySets = new ArrayList<PolicySet>();
private Callback callback;
+
+ /**
+ * Constructs a new service.
+ */
+ public ServiceImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param other
+ */
+ public ServiceImpl(Service other) {
+ super(other);
+ bindings.addAll(other.getBindings());
+ policySets.addAll(other.getPolicySets());
+ callback = other.getCallback();
+ }
public List<Binding> getBindings() {
return bindings;
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/WireImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/WireImpl.java?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/WireImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/impl/WireImpl.java Sat Apr 7 00:53:48 2007
@@ -38,6 +38,24 @@
private List<Intent> requiredIntents = new ArrayList<Intent>();
private List<PolicySet> policySets = new ArrayList<PolicySet>();
+ /**
+ * Constructs a new wire.
+ */
+ public WireImpl() {
+ }
+
+ /**
+ * Copy constructor.
+ * @param wire
+ */
+ public WireImpl(Wire other) {
+ super(other);
+ source = other.getSource();
+ target = other.getTarget();
+ requiredIntents.addAll(other.getRequiredIntents());
+ policySets.addAll(other.getPolicySets());
+ }
+
public ComponentReference getSource() {
return source;
}
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=526394&r1=526393&r2=526394
==============================================================================
--- 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 Sat Apr 7 00:53:48 2007
@@ -65,7 +65,29 @@
wire(problems);
}
+ private void collectIncludes(Composite composite, List<Composite> includes) {
+ for (Composite include: composite.getIncludes()) {
+ includes.add(include);
+ collectIncludes(include, includes);
+ }
+ }
+
private void init(List<Base> problems) {
+
+ // Bring includes in
+ List<Composite> includes = new ArrayList<Composite>();
+ collectIncludes(composite, includes);
+ for (Composite include: includes) {
+ include = include.copy();
+ composite.getComponents().addAll(include.getComponents());
+ composite.getServices().addAll(include.getServices());
+ composite.getReferences().addAll(include.getReferences());
+ composite.getProperties().addAll(include.getProperties());
+ composite.getWires().addAll(include.getWires());
+ composite.getPolicySets().addAll(include.getPolicySets());
+ composite.getRequiredIntents().addAll(include.getRequiredIntents());
+ }
+ composite.getIncludes().clear();
// Init all component services and references
for (Component component : composite.getComponents()) {
@@ -267,6 +289,9 @@
resolvedReference.getTargets().add(resolvedService);
}
}
+
+ // Clear wires
+ composite.getWires().clear();
}
}
Modified: incubator/tuscany/java/sca/modules/idl-java-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl-java-xml/pom.xml?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/idl-java-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/idl-java-xml/pom.xml Sat Apr 7 00:53:48 2007
@@ -33,7 +33,6 @@
<groupId>org.osoa</groupId>
<artifactId>sca-api</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/Calculator.composite?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/Calculator.composite Sat Apr 7 00:53:48 2007
@@ -19,6 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:calc="http://sample.calculator"
+ targetNamespace="http://calc"
name="calc:Calculator">
<service name="CalculatorService" promote="CalculatorServiceComponent">
Modified: incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/CalculatorComponent.constrainingType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/CalculatorComponent.constrainingType?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/CalculatorComponent.constrainingType (original)
+++ incubator/tuscany/java/sca/modules/idl-java-xml/src/test/resources/CalculatorComponent.constrainingType Sat Apr 7 00:53:48 2007
@@ -18,8 +18,9 @@
* under the License.
-->
<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:calc="http://sample.calculator"
- name="calc:CalculatorComponent">
+ xmlns:calc="http://calc"
+ targetNamespace="http://calc"
+ name="CalculatorComponent">
<service name="CalculatorService">
<interface.java class="calculator.CalculatorService" />
Modified: incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/Calculator.composite?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/Calculator.composite Sat Apr 7 00:53:48 2007
@@ -19,6 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:calc="http://sample.calculator"
+ targetNamespace="http://calc"
name="calc:Calculator">
<service name="CalculatorService" promote="CalculatorServiceComponent">
Modified: incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/CalculatorComponent.constrainingType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/CalculatorComponent.constrainingType?view=diff&rev=526394&r1=526393&r2=526394
==============================================================================
--- incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/CalculatorComponent.constrainingType (original)
+++ incubator/tuscany/java/sca/modules/idl-wsdl-xml/src/test/resources/CalculatorComponent.constrainingType Sat Apr 7 00:53:48 2007
@@ -18,8 +18,9 @@
* under the License.
-->
<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:calc="http://sample.calculator"
- name="calc:CalculatorComponent">
+ xmlns:calc="http://calc"
+ targetNamespace="http://calc"
+ name="CalculatorComponent">
<service name="CalculatorService">
<interface.wsdl interface="http://sample/calculator#wsdl.interface(Calculator)"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org