You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by ry...@apache.org on 2006/04/18 18:21:40 UTC
svn commit: r394980 - in /incubator/woden/java: ant-test/test.xml
src/org/apache/woden/ant/WsdlCm.java
Author: ryman
Date: Tue Apr 18 09:21:38 2006
New Revision: 394980
URL: http://svn.apache.org/viewcvs?rev=394980&view=rev
Log:
Sorted {features} and {properties} in interchange format.
Modified:
incubator/woden/java/ant-test/test.xml
incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java
Modified: incubator/woden/java/ant-test/test.xml
URL: http://svn.apache.org/viewcvs/incubator/woden/java/ant-test/test.xml?rev=394980&r1=394979&r2=394980&view=diff
==============================================================================
--- incubator/woden/java/ant-test/test.xml (original)
+++ incubator/woden/java/ant-test/test.xml Tue Apr 18 09:21:38 2006
@@ -1,79 +1,79 @@
-<descriptionComponent xmlns='http://www.w3.org/2002/ws/desc/wsdl/component' xml:id='id-2228437'>
+<descriptionComponent xmlns='http://www.w3.org/2002/ws/desc/wsdl/component' xml:id='id-6165421'>
<interfaces>
- <interfaceComponent xml:id='id-19551658'>
+ <interfaceComponent xml:id='id-7100506'>
<name>
<namespaceName>http://example.org/name</namespaceName>
<localName>NameInterface</localName>
</name>
<interfaceOperations>
- <interfaceOperationComponent xml:id='id-6149506'>
+ <interfaceOperationComponent xml:id='id-5924809'>
<name>
<namespaceName>http://example.org/name</namespaceName>
<localName>getNameFromSIN</localName>
</name>
<messageExchangePattern>http://www.w3.org/2006/01/wsdl/in-out</messageExchangePattern>
<interfaceMessageReferences>
- <interfaceMessageReferenceComponent xml:id='id-18655235'>
+ <interfaceMessageReferenceComponent xml:id='id-4536327'>
<messageLabel>In</messageLabel>
<direction>in</direction>
<messageContentModel>#element</messageContentModel>
- <elementDeclaration ref='id-5924809'/>
- <parent ref='id-6149506'/>
+ <elementDeclaration ref='id-6393126'/>
+ <parent ref='id-5924809'/>
</interfaceMessageReferenceComponent>
- <interfaceMessageReferenceComponent xml:id='id-22266741'>
+ <interfaceMessageReferenceComponent xml:id='id-7987972'>
<messageLabel>Out</messageLabel>
<direction>out</direction>
<messageContentModel>#element</messageContentModel>
- <elementDeclaration ref='id-4536327'/>
- <parent ref='id-6149506'/>
+ <elementDeclaration ref='id-2569862'/>
+ <parent ref='id-5924809'/>
</interfaceMessageReferenceComponent>
</interfaceMessageReferences>
- <parent ref='id-19551658'/>
+ <parent ref='id-7100506'/>
</interfaceOperationComponent>
</interfaceOperations>
</interfaceComponent>
</interfaces>
<bindings>
- <bindingComponent xml:id='id-7987972'>
+ <bindingComponent xml:id='id-22730182'>
<name>
<namespaceName>http://example.org/name</namespaceName>
<localName>NameBinding</localName>
</name>
- <interface ref='id-19551658'/>
+ <interface ref='id-7100506'/>
<type>http://www.w3.org/2006/01/wsdl/soap</type>
<bindingOperations>
- <bindingOperationComponent xml:id='id-7122710'>
- <interfaceOperation ref='id-6149506'/>
- <parent ref='id-7987972'/>
+ <bindingOperationComponent xml:id='id-15091334'>
+ <interfaceOperation ref='id-5924809'/>
+ <parent ref='id-22730182'/>
</bindingOperationComponent>
</bindingOperations>
</bindingComponent>
</bindings>
<services>
- <serviceComponent xml:id='id-8970973'>
+ <serviceComponent xml:id='id-5226838'>
<name>
<namespaceName>http://example.org/name</namespaceName>
<localName>NameService</localName>
</name>
- <interface ref='id-19551658'/>
+ <interface ref='id-7100506'/>
<endpoints>
- <endpointComponent xml:id='id-2112561'>
+ <endpointComponent xml:id='id-17153368'>
<name>NameSOAPHTTPEndpoint</name>
- <binding ref='id-7987972'/>
- <parent ref='id-8970973'/>
+ <binding ref='id-22730182'/>
+ <parent ref='id-5226838'/>
</endpointComponent>
</endpoints>
</serviceComponent>
</services>
<elementDeclarations>
- <elementDeclarationComponent xml:id='id-4536327'>
+ <elementDeclarationComponent xml:id='id-2569862'>
<name>
<namespaceName>http://example.org/name</namespaceName>
<localName>Name</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</elementDeclarationComponent>
- <elementDeclarationComponent xml:id='id-5924809'>
+ <elementDeclarationComponent xml:id='id-6393126'>
<name>
<namespaceName>http://example.org/name</namespaceName>
<localName>SIN</localName>
@@ -82,301 +82,301 @@
</elementDeclarationComponent>
</elementDeclarations>
<typeDefinitions>
- <typeDefinitionComponent xml:id='id-17153368'>
+ <typeDefinitionComponent xml:id='id-14620722'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>ENTITIES</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-30533424'>
+ <typeDefinitionComponent xml:id='id-11372121'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>ENTITY</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-27334345'>
+ <typeDefinitionComponent xml:id='id-5195164'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>ID</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-14620722'>
+ <typeDefinitionComponent xml:id='id-6504030'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>IDREF</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-11372121'>
+ <typeDefinitionComponent xml:id='id-26460367'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>IDREFS</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-5195164'>
+ <typeDefinitionComponent xml:id='id-22507120'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>NCName</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-6504030'>
+ <typeDefinitionComponent xml:id='id-18055655'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>NMTOKEN</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-22507120'>
+ <typeDefinitionComponent xml:id='id-24417480'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>NMTOKENS</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-18055655'>
+ <typeDefinitionComponent xml:id='id-13884241'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>NOTATION</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-28678543'>
+ <typeDefinitionComponent xml:id='id-14927396'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>Name</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-13884241'>
+ <typeDefinitionComponent xml:id='id-30931963'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>QName</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-14927396'>
+ <typeDefinitionComponent xml:id='id-14688457'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>anyURI</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-31817359'>
+ <typeDefinitionComponent xml:id='id-8949356'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>boolean</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-30931963'>
+ <typeDefinitionComponent xml:id='id-20863188'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>byte</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-14688457'>
+ <typeDefinitionComponent xml:id='id-3794357'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>date</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-8949356'>
+ <typeDefinitionComponent xml:id='id-18346782'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>dateTime</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-20863188'>
+ <typeDefinitionComponent xml:id='id-22700073'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>decimal</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-3794357'>
+ <typeDefinitionComponent xml:id='id-6251267'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>double</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-18346782'>
+ <typeDefinitionComponent xml:id='id-6131844'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>duration</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-22700073'>
+ <typeDefinitionComponent xml:id='id-12245160'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>float</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-6251267'>
+ <typeDefinitionComponent xml:id='id-15081425'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>gDay</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-15081425'>
+ <typeDefinitionComponent xml:id='id-3307594'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>gMonth</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-3346521'>
+ <typeDefinitionComponent xml:id='id-24595355'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>gMonthDay</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-7760420'>
+ <typeDefinitionComponent xml:id='id-17089909'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>gYear</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-3307594'>
+ <typeDefinitionComponent xml:id='id-4171180'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>gYearMonth</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-24595355'>
+ <typeDefinitionComponent xml:id='id-9818046'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>hexBinary</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-17089909'>
+ <typeDefinitionComponent xml:id='id-24763620'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>int</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-4171180'>
+ <typeDefinitionComponent xml:id='id-26542488'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>integer</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-9818046'>
+ <typeDefinitionComponent xml:id='id-26980954'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>language</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-24763620'>
+ <typeDefinitionComponent xml:id='id-14314484'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>long</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-26542488'>
+ <typeDefinitionComponent xml:id='id-31820984'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>negativeInteger</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-26980954'>
+ <typeDefinitionComponent xml:id='id-24744797'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>nonNegativeInteger</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-14314484'>
+ <typeDefinitionComponent xml:id='id-12182618'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>nonPositiveInteger</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-31820984'>
+ <typeDefinitionComponent xml:id='id-4126736'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>normalizedString</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-24744797'>
+ <typeDefinitionComponent xml:id='id-1049443'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>positiveInteger</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-12182618'>
+ <typeDefinitionComponent xml:id='id-21925102'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>short</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-4126736'>
+ <typeDefinitionComponent xml:id='id-421988'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>string</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-1049443'>
+ <typeDefinitionComponent xml:id='id-12376621'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>time</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-21925102'>
+ <typeDefinitionComponent xml:id='id-9949215'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>token</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-421988'>
+ <typeDefinitionComponent xml:id='id-14721926'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>unsignedByte</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-12376621'>
+ <typeDefinitionComponent xml:id='id-1043272'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>unsignedInt</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-9949215'>
+ <typeDefinitionComponent xml:id='id-18871350'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>unsignedLong</localName>
</name>
<system>http://www.w3.org/2001/XMLSchema</system>
</typeDefinitionComponent>
- <typeDefinitionComponent xml:id='id-14721926'>
+ <typeDefinitionComponent xml:id='id-14301726'>
<name>
<namespaceName>http://www.w3.org/2001/XMLSchema</namespaceName>
<localName>unsignedShort</localName>
Modified: incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java?rev=394980&r1=394979&r2=394980&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java (original)
+++ incubator/woden/java/src/org/apache/woden/ant/WsdlCm.java Tue Apr 18 09:21:38 2006
@@ -786,6 +786,15 @@
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);
+ }
+ });
+
beginElement(tag);
for (int i = 0; i < components.length; i++) {
@@ -809,6 +818,15 @@
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);
+ }
+ });
beginElement(tag);
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org