Author: ryman
Date: Tue Nov 14 05:35:04 2006
New Revision: 474780
URL: http://svn.apache.org/viewvc?view=rev&rev=474780
Log:
[WODEN-80] Corrected WSDL 2.0 Component Model output and removed F & P while I
was at it.
Modified:
incubator/woden/trunk/java/ant-test/test-suite-results.zip
incubator/woden/trunk/java/src/org/apache/woden/ant/CmBaseWriter.java
incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java
Modified: incubator/woden/trunk/java/ant-test/test-suite-results.zip
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/test-suite-results.zip?view=diff&rev=474780&r1=474779&r2=474780
==============================================================================
Binary files - no diff available.
Modified: incubator/woden/trunk/java/src/org/apache/woden/ant/CmBaseWriter.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/CmBaseWriter.java?view=diff&rev=474780&r1=474779&r2=474780
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/CmBaseWriter.java
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/CmBaseWriter.java Tue
Nov 14 05:35:04 2006
@@ -32,13 +32,9 @@
public final static String PREFIX = "cmbase";
// element names
- public final static String FEATURES = PREFIX + ":features";
- public final static String FEATURE_COMPONENT = PREFIX +
":featureComponent";
public final static String LOCAL_NAME = PREFIX + ":localName";
public final static String NAMESPACE_NAME = PREFIX + ":namespaceName";
public final static String PARENT = PREFIX + ":parent";
- public final static String PROPERTIES = PREFIX + ":properties";
- public final static String PROPERTY_COMPONENT = PREFIX +
":propertyComponent";
public final static String REF = PREFIX + ":ref";
public final static String REQUIRED = PREFIX + ":required";
public final static String URI = PREFIX + ":uri";
@@ -50,16 +46,6 @@
super(out, NS, PREFIX);
}
- public void features(Feature[] features) {
-
- write(FEATURES, features);
- }
-
- public void properties(Property[] properties) {
-
- write(PROPERTIES, properties);
- }
-
public void parent(Object parent) {
writeRef(PARENT, parent);
@@ -125,74 +111,6 @@
return "ref='" + id(o) + "'";
}
- public void write(String tag, Feature[] components) {
-
- if (components.length == 0)
- return;
-
- Arrays.sort(components, new Comparator() {
-
- public int compare(Object o1, Object o2) {
- URI x1 = ((Feature) o1).getRef();
- URI x2 = ((Feature) o2).getRef();
- return x1.compareTo(x2);
- }
- });
-
- out.beginElement(tag);
-
- for (int i = 0; i < components.length; i++) {
- write(FEATURE_COMPONENT, components[i]);
- }
- out.endElement();
- }
-
- public void write(String tag, Feature component) {
-
- out.beginElement(tag, idAttribute(component));
-
- write(REF, component.getRef());
- out.write(REQUIRED, component.isRequired());
- writeRef(PARENT, component.getParent());
-
- out.endElement();
- }
-
- public void write(String tag, Property[] components) {
-
- if (components.length == 0)
- return;
-
- Arrays.sort(components, new Comparator() {
-
- public int compare(Object o1, Object o2) {
- URI x1 = ((Property) o1).getRef();
- URI x2 = ((Property) o2).getRef();
- return x1.compareTo(x2);
- }
- });
-
- out.beginElement(tag);
-
- for (int i = 0; i < components.length; i++) {
- write(PROPERTY_COMPONENT, components[i]);
- }
-
- out.endElement();
- }
-
- public void write(String tag, Property component) {
-
- out.beginElement(tag, idAttribute(component));
-
- write(REF, component.getRef());
- writeOptionalRef(VALUE_CONSTRAINT, component.getValueConstraint());
- writeAny(VALUE, component.getValue());
- writeRef(PARENT, component.getParent());
-
- out.endElement();
- }
-
public static int compareQName(QName q1, QName q2) {
if (q1.equals(q2))
Modified: incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java?view=diff&rev=474780&r1=474779&r2=474780
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java Tue Nov
14 05:35:04 2006
@@ -192,8 +192,6 @@
writeRefs("extendedInterfaces", component.getExtendedInterfaces());
write("interfaceFaults", component.getInterfaceFaults());
write("interfaceOperations", component.getInterfaceOperations());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
out.endElement();
}
@@ -228,8 +226,6 @@
cmbase.write("name", component.getName());
cmbase.writeOptionalRef("elementDeclaration", component
.getElementDeclaration());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
cmbase.parent(component.getParent());
out.endElement();
@@ -269,8 +265,6 @@
write("interfaceFaultReferences", component
.getInterfaceFaultReferences());
cmbase.writeUris("style", component.getStyle());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
cmbase.parent(component.getParent());
InterfaceOperationExtensions extensions =
(InterfaceOperationExtensions) component
@@ -317,8 +311,6 @@
out.write("messageContentModel", component.getMessageContentModel());
cmbase.writeOptionalRef("elementDeclaration", component
.getElementDeclaration());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
cmbase.parent(component.getParent());
out.endElement();
@@ -374,8 +366,6 @@
cmbase.writeRef("interfaceFault", component.getInterfaceFault());
out.write("messageLabel", component.getMessageLabel().toString());
out.write("direction", component.getDirection().toString());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
cmbase.parent(component.getParent());
out.endElement();
@@ -412,8 +402,6 @@
write("type", component.getType());
write("bindingFaults", component.getBindingFaults());
write("bindingOperations", component.getBindingOperations());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
HTTPBindingExtensions http = (HTTPBindingExtensions) component
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
@@ -465,8 +453,6 @@
out.beginElement(tag, CmBaseWriter.idAttribute(component));
cmbase.writeRef("interfaceFault", component.getInterfaceFault());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
cmbase.parent(component.getParent());
HTTPBindingFaultExtensions http = (HTTPBindingFaultExtensions)
component
@@ -511,11 +497,9 @@
cmbase
.writeRef("interfaceOperation", component
.getInterfaceOperation());
- write("bindingFaultReferences", component.getBindingFaultReferences());
write("bindingMessageReferences", component
.getBindingMessageReferences());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
+ write("bindingFaultReferences", component.getBindingFaultReferences());
cmbase.parent(component.getParent());
HTTPBindingOperationExtensions http = (HTTPBindingOperationExtensions)
component
@@ -552,7 +536,7 @@
out.beginElement(tag);
for (int i = 0; i < components.length; i++)
- write("bindingMessageReferenceComponent", components[i]);
+ write("BindingMessageReferenceComponent", components[i]);
out.endElement();
}
@@ -563,8 +547,7 @@
cmbase.writeRef("interfaceMessageReference", component
.getInterfaceMessageReference());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
+
cmbase.parent(component.getParent());
HTTPBindingMessageReferenceExtensions http =
(HTTPBindingMessageReferenceExtensions) component
@@ -608,7 +591,7 @@
out.beginElement(tag);
for (int i = 0; i < components.length; i++)
- write("bindingFaultReferenceComponent", components[i]);
+ write("BindingFaultReferenceComponent", components[i]);
out.endElement();
}
@@ -619,8 +602,6 @@
cmbase.writeRef("interfaceFaultReference", component
.getInterfaceFaultReference());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
cmbase.parent(component.getParent());
SOAPBindingFaultReferenceExtensions soap =
(SOAPBindingFaultReferenceExtensions) component
@@ -659,8 +640,6 @@
cmbase.write("name", component.getName());
cmbase.writeRef("interface", component.getInterface());
write("endpoints", component.getEndpoints());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
out.endElement();
}
@@ -696,8 +675,6 @@
out.write("name", component.getName());
cmbase.writeRef("binding", component.getBinding());
cmbase.write("address", component.getAddress());
- cmbase.features(component.getFeatures());
- cmbase.properties(component.getProperties());
cmbase.parent(component.getParent());
HTTPEndpointExtensions http = (HTTPEndpointExtensions) component
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
