Author: jsdelfino
Date: Fri Jul 20 07:57:05 2007
New Revision: 558016
URL: http://svn.apache.org/viewvc?view=rev&rev=558016
Log:
Added code to write extension elements in assembly XML.
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
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=558016&r1=558015&r2=558016
==============================================================================
---
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:57:05 2007
@@ -237,9 +237,23 @@
}
if (service.getCallback() != null) {
+ Callback callback = service.getCallback();
writeStart(writer, CALLBACK);
+
+ for (Binding binding: callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+ for (Object extension: callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+
+ for (Object extension: service.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
@@ -257,17 +271,40 @@
}
if (reference.getCallback() != null) {
+ Callback callback = reference.getCallback();
writeStart(writer, CALLBACK);
+
+ for (Binding binding: callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+ for (Object extension: callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+
+ for (Object extension: reference.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
for (Property property : componentType.getProperties()) {
writeStart(writer, PROPERTY, new XAttr(NAME,
property.getName()));
+
+ for (Object extension: property.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+ for (Object extension: componentType.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEndDocument(writer);
} catch (XMLStreamException e) {
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=558016&r1=558015&r2=558016
==============================================================================
---
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:57:05 2007
@@ -348,9 +348,23 @@
}
if (service.getCallback() != null) {
+ Callback callback = service.getCallback();
writeStart(writer, CALLBACK);
+
+ for (Binding binding: callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+ for (Object extension: callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+
+ for (Object extension: service.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
@@ -367,9 +381,23 @@
}
if (service.getCallback() != null) {
+ Callback callback = service.getCallback();
writeStart(writer, CALLBACK);
+
+ for (Binding binding: callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+ for (Object extension: callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+
+ for (Object extension: service.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
@@ -387,14 +415,31 @@
}
if (reference.getCallback() != null) {
+ Callback callback = reference.getCallback();
writeStart(writer, CALLBACK);
+
+ for (Binding binding: callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+ for (Object extension: callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+
+ for (Object extension: reference.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
for (ComponentProperty property : component.getProperties()) {
writeStart(writer, PROPERTY, new XAttr(NAME,
property.getName()));
+ for (Object extension: property.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
writeEnd(writer);
}
@@ -430,17 +475,40 @@
}
if (reference.getCallback() != null) {
+ Callback callback = reference.getCallback();
writeStart(writer, CALLBACK);
+
+ for (Binding binding: callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+ for (Object extension: callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+
+ for (Object extension: reference.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
for (Property property : composite.getProperties()) {
writeStart(writer, PROPERTY, new XAttr(NAME,
property.getName()));
+
+ for (Object extension: property.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+ for (Object extension: composite.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEndDocument(writer);
} catch (XMLStreamException e) {
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=558016&r1=558015&r2=558016
==============================================================================
---
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:57:05 2007
@@ -175,6 +175,11 @@
for (AbstractService service : constrainingType.getServices()) {
writeStart(writer, SERVICE, new XAttr(NAME,
service.getName()));
extensionProcessor.write(service.getInterfaceContract(),
writer);
+
+ for (Object extension: service.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
@@ -182,14 +187,28 @@
writeStart(writer, REFERENCE,
new XAttr(NAME, reference.getName()));
extensionProcessor.write(reference.getInterfaceContract(),
writer);
+
+ for (Object extension: reference.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
for (AbstractProperty property : constrainingType.getProperties())
{
writeStart(writer, PROPERTY, new XAttr(NAME,
property.getName()));
+
+ for (Object extension: property.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEnd(writer);
}
+ for (Object extension: constrainingType.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
writeEndDocument(writer);
} catch (XMLStreamException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
