Author: jsdelfino
Date: Fri Jul 20 07:28:02 2007
New Revision: 558006
URL: http://svn.apache.org/viewvc?view=rev&rev=558006
Log:
Added missing reads for extension elements in assembly XML and associated them
with the correct parent elements.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java?view=diff&rev=558006&r1=558005&r2=558006
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
Fri Jul 20 07:28:02 2007
@@ -159,6 +159,18 @@
} else {
contract.getBindings().add((Binding)extension);
}
+ } else {
+
+ // Add the extension element to the
current element
+ if (callback != null) {
+
callback.getExtensions().add(extension);
+ } else if (contract != null) {
+
contract.getExtensions().add(extension);
+ } else if (property != null) {
+
property.getExtensions().add(extension);
+ } else {
+
componentType.getExtensions().add(extension);
+ }
}
}
}
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?view=diff&rev=558006&r1=558005&r2=558006
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Fri Jul 20 07:28:02 2007
@@ -268,8 +268,18 @@
component.setImplementation((Implementation)extension);
} else {
- // FIXME: We need to decide where to host
the extensions
- composite.getExtensions().add(extension);
+ // Add the extension element to the
current element
+ if (callback != null) {
+
callback.getExtensions().add(extension);
+ } else if (contract != null) {
+
contract.getExtensions().add(extension);
+ } else if (property != null) {
+
property.getExtensions().add(extension);
+ } else if (component != null) {
+
component.getExtensions().add(extension);
+ } else {
+
composite.getExtensions().add(extension);
+ }
}
}
}
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java?view=diff&rev=558006&r1=558005&r2=558006
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
Fri Jul 20 07:28:02 2007
@@ -126,6 +126,15 @@
// <service><interface> and
<reference><interface>
abstractContract.setInterfaceContract((InterfaceContract)extension);
+ } else {
+
+ // Add the extension element to the current
element
+ if (abstractContract != null) {
+
abstractContract.getExtensions().add(extension);
+ } else {
+
constrainingType.getExtensions().add(extension);
+ }
+
}
}
break;
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite?view=diff&rev=558006&r1=558005&r2=558006
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
(original)
+++
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
Fri Jul 20 07:28:02 2007
@@ -22,13 +22,16 @@
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";
- xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0
http://www.osoa.org/xmlns/sca/1.0 "
+ xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0
http://www.osoa.org/xmlns/sca/1.0 "
+ xmlns:ext="http://extension";
xmlns:cns="http://test/confidentiality"; xmlns:sns="http://test/secure";>
<include name="tns:TestAllDivide"/>
+ <ext:testExtension/>
<service name="CalculatorService"
promote="CalculatorServiceComponent/CalculatorService"
requires="cns:confidentiality"
- policySets="sns:secure">
+ policySets="sns:secure">
+ <ext:testExtension/>
<interface.java interface="calculator.CalculatorService"
callbackInterface="calculator.CalculatorCallback" />
<operation name="add" policySets="sns:secure"
requires="cns:confidentiality" />
@@ -37,6 +40,7 @@
</binding.ws>
<callback policySets="sns:secure" requires="cns:confidentiality">
+ <ext:testExtension/>
<binding.ws name="CalculatorCallbackWS" policySets="" port=""
requires="" uri="http://calc/callback/ws";>
<operation name="addCallback" policySets="sns:secure"
requires="cns:confidentiality" />
</binding.ws>
@@ -45,12 +49,14 @@
<component name="CalculatorServiceComponent" autowire="false"
constrainingType="tns:CalculatorComponent"
policySets="sns:secure" requires="cns:confidentiality">
+ <ext:testExtension/>
<service name="CalculatorService" policySets="sns:secure"
requires="cns:confidentiality">
<interface.java interface="calculator.CalculatorService"
callbackInterface="calculator.CalculatorCallback" />
</service>
<reference name="addService" target="AddServiceComponent/AddService"
autowire="false" multiplicity="1..1"
policySets="sns:secure" requires="cns:confidentiality"
wiredByImpl="false">
+ <ext:testExtension/>
<interface.java interface="calculator.AddService"
callbackInterface="calculator.AddCallback" />
</reference>
<reference name="subtractService" target="SubtractServiceComponent" />
@@ -106,7 +112,8 @@
</reference>
<property name="prop1" xmlns:foo="http://foo";>
- <MyComplexPropertyValue1 xsi:type="foo:MyComplexType" attr="bar">
+ <ext:testExtension/>
+ <MyComplexPropertyValue1 xsi:type="foo:MyComplexType" attr="bar">
<foo:a>AValue</foo:a>
<bar:b xmlns:bar="http://bar";>InterestingURI</bar:b>
</MyComplexPropertyValue1>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
