You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/05/27 17:52:38 UTC
svn commit: r948869 [20/20] - in /ode/trunk: ./
agents/src/main/java/org/apache/ode/agents/memory/ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/main/webapp/WEB-INF/conf/
axis2-war/src/main/webapp/js/ axis2-war/src/test/java/org/apache/ode/axis...
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/SystemUtils.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/SystemUtils.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/SystemUtils.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/SystemUtils.java Thu May 27 15:52:24 2010
@@ -31,123 +31,123 @@ public class SystemUtils {
private static final Pattern PROPERTY_PATTERN = Pattern.compile("\\$\\{([^\\}]+)\\}");
/**
- * @see System#getProperties()
- */
- public static String javaVersion() {
- return System.getProperty("java.version");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String javaVendor() {
- return System.getProperty("java.vendor");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String javaHome() {
- return System.getProperty("java.home");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String javaClassVersion() {
- return System.getProperty("java.class.version");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String javaClassPath() {
- return System.getProperty("java.class.path");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String javaTemporaryDirectory() {
- return System.getProperty("java.io.tmpdir");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String javaLibraryPath() {
- return System.getProperty("java.library.path");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String operatingSystemArchitecture() {
- return System.getProperty("os.arch");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String operatingSystemName() {
- return System.getProperty("os.name");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String operatingSystemVersion() {
- return System.getProperty("os.version");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String fileSeparator() {
- return System.getProperty("file.separator");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String pathSeparator() {
- return System.getProperty("path.separator");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String lineSeparator() {
- return System.getProperty("line.separator");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String userName() {
- return System.getProperty("user.name");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String userHome() {
- return System.getProperty("user.home");
- }
-
- /**
- * @see System#getProperties()
- */
- public static String userDirectory() {
- return System.getProperty("user.dir");
- }
-
- /**
- * Replace system property values in the given String using the ${system.property} convention.
- *
- * e.g., "The java version is ${java.version}" ==> "The java version is 1.5.0_11"
- */
- public static String replaceSystemProperties(String str) {
+ * @see System#getProperties()
+ */
+ public static String javaVersion() {
+ return System.getProperty("java.version");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String javaVendor() {
+ return System.getProperty("java.vendor");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String javaHome() {
+ return System.getProperty("java.home");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String javaClassVersion() {
+ return System.getProperty("java.class.version");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String javaClassPath() {
+ return System.getProperty("java.class.path");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String javaTemporaryDirectory() {
+ return System.getProperty("java.io.tmpdir");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String javaLibraryPath() {
+ return System.getProperty("java.library.path");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String operatingSystemArchitecture() {
+ return System.getProperty("os.arch");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String operatingSystemName() {
+ return System.getProperty("os.name");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String operatingSystemVersion() {
+ return System.getProperty("os.version");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String fileSeparator() {
+ return System.getProperty("file.separator");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String pathSeparator() {
+ return System.getProperty("path.separator");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String lineSeparator() {
+ return System.getProperty("line.separator");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String userName() {
+ return System.getProperty("user.name");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String userHome() {
+ return System.getProperty("user.home");
+ }
+
+ /**
+ * @see System#getProperties()
+ */
+ public static String userDirectory() {
+ return System.getProperty("user.dir");
+ }
+
+ /**
+ * Replace system property values in the given String using the ${system.property} convention.
+ *
+ * e.g., "The java version is ${java.version}" ==> "The java version is 1.5.0_11"
+ */
+ public static String replaceSystemProperties(String str) {
return replaceProperties(str, PROPERTY_PATTERN, System.getProperties());
}
@@ -164,21 +164,21 @@ public class SystemUtils {
*/
public static String replaceProperties(String str, Pattern pattern, Map values){
int start = 0;
- while (true) {
- Matcher match = pattern.matcher(str);
- if (!match.find(start))
- break;
- String property = match.group(1);
+ while (true) {
+ Matcher match = pattern.matcher(str);
+ if (!match.find(start))
+ break;
+ String property = match.group(1);
if(property==null) throw new IllegalArgumentException("Regex pattern must capture at least 1 group! "+pattern.toString());
- String value = (String) values.get(property);
- if (value != null) {
- str = match.replaceFirst(Matcher.quoteReplacement(value));
- } else {
- // if the property doesn't exist, no substitution and skip to next
- start = match.end();
- }
- }
- return str;
- }
+ String value = (String) values.get(property);
+ if (value != null) {
+ str = match.replaceFirst(Matcher.quoteReplacement(value));
+ } else {
+ // if the property doesn't exist, no substitution and skip to next
+ start = match.end();
+ }
+ }
+ return str;
+ }
}
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/cli/CommandlineSyntaxException.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/cli/CommandlineSyntaxException.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/cli/CommandlineSyntaxException.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/cli/CommandlineSyntaxException.java Thu May 27 15:52:24 2010
@@ -21,9 +21,9 @@ package org.apache.ode.utils.cli;
public class CommandlineSyntaxException extends Exception {
- private static final long serialVersionUID = 1177045670342594833L;
+ private static final long serialVersionUID = 1177045670342594833L;
- public CommandlineSyntaxException(String s) {
- super(s);
- }
+ public CommandlineSyntaxException(String s) {
+ super(s);
+ }
}
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/jmx/JMXConstants.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/jmx/JMXConstants.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/jmx/JMXConstants.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/jmx/JMXConstants.java Thu May 27 15:52:24 2010
@@ -50,7 +50,7 @@ public final class JMXConstants {
* @return JMX {@link ObjectName}
*/
public static ObjectName createDomainObjectName(String domainId) throws MalformedObjectNameException {
- Hashtable<String, String> tbl = new Hashtable<String, String>();
+ Hashtable<String, String> tbl = new Hashtable<String, String>();
tbl.put("domain", domainId);
tbl.put("node", "node0");
tbl.put("type", TYPE_DOMAINMBEAN);
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/uuid/UUID.java Thu May 27 15:52:24 2010
@@ -26,57 +26,57 @@ import java.io.Serializable;
*/
public class UUID implements Serializable {
- private static final long serialVersionUID = -2632846855777989452L;
+ private static final long serialVersionUID = -2632846855777989452L;
- private static final UUIDGen UUIDGEN = new UUIDGen();
+ private static final UUIDGen UUIDGEN = new UUIDGen();
- private String _id;
+ private String _id;
- public UUID() {
- _id = prefix() + UUIDGEN.nextUUID();
- }
-
- protected UUID(String id) {
- if (!id.startsWith(prefix())) {
- throw new IllegalArgumentException("Invalid UUID");
- }
-
- _id = id;
- }
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object o) {
- return (o.getClass() == getClass()) && ((UUID) o)._id.equals(_id);
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return _id.hashCode();
- }
-
- /**
- * String form of a uuid.
- *
- * @param uuid
- * convert the <code>uuid</code> to a string
- * @return string representation
- */
- public static String toIdString(UUID uuid) {
- return uuid._id;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return _id;
- }
-
- protected String prefix() {
- return "";
- }
+ public UUID() {
+ _id = prefix() + UUIDGEN.nextUUID();
+ }
+
+ protected UUID(String id) {
+ if (!id.startsWith(prefix())) {
+ throw new IllegalArgumentException("Invalid UUID");
+ }
+
+ _id = id;
+ }
+
+ /**
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ public boolean equals(Object o) {
+ return (o.getClass() == getClass()) && ((UUID) o)._id.equals(_id);
+ }
+
+ /**
+ * @see java.lang.Object#hashCode()
+ */
+ public int hashCode() {
+ return _id.hashCode();
+ }
+
+ /**
+ * String form of a uuid.
+ *
+ * @param uuid
+ * convert the <code>uuid</code> to a string
+ * @return string representation
+ */
+ public static String toIdString(UUID uuid) {
+ return uuid._id;
+ }
+
+ /**
+ * @see java.lang.Object#toString()
+ */
+ public String toString() {
+ return _id;
+ }
+
+ protected String prefix() {
+ return "";
+ }
}
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/Duration.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/Duration.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/Duration.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/Duration.java Thu May 27 15:52:24 2010
@@ -29,68 +29,68 @@ import java.util.regex.Pattern;
* Does NOT support negative duration, only positive!!
*/
public class Duration {
- static final Pattern PATTERN =
- Pattern.compile("P(\\d+Y)?(\\d+M)?(\\d+D)?(T(\\d+H)?(\\d+M)?((\\d+\\.?\\d*|\\.\\d+)S)?)?");
-
- static final int YEAR_MG = 1;
- static final int MONTH_MG = 2;
- static final int DAY_MG = 3;
- static final int HOUR_MG = 5;
- static final int MIN_MG = 6;
- static final int SEC_MG = 8;
-
- private int _years;
- private int _months;
- private int _days;
- private int _hours;
- private int _minutes;
- private BigDecimal _seconds;
-
- /**
- *
- */
- public Duration(String duration) {
- Matcher m = PATTERN.matcher(duration);
- if(m.matches()){
- _years = parseInt(m.group(YEAR_MG));
- _months = parseInt(m.group(MONTH_MG));
- _days = parseInt(m.group(DAY_MG));
- _hours = parseInt(m.group(HOUR_MG));
- _minutes = parseInt(m.group(MIN_MG));
- _seconds = m.group(SEC_MG) == null
- ? null : new BigDecimal(m.group(SEC_MG));
- }
- else{
- throw new IllegalArgumentException("Bad duration: " + duration);
- }
- }
-
- /**
- * Adds current duration to a calendar object.
- * @param calendar
- */
- public void addTo(Calendar calendar){
-
- calendar.add( Calendar.YEAR, _years );
- calendar.add( Calendar.MONTH, _months );
- calendar.add( Calendar.DAY_OF_MONTH, _days );
- calendar.add( Calendar.HOUR, _hours );
- calendar.add( Calendar.MINUTE, _minutes );
- calendar.add( Calendar.SECOND, (_seconds == null)
- ? 0 : _seconds.intValue());
-
- if(_seconds!=null) {
+ static final Pattern PATTERN =
+ Pattern.compile("P(\\d+Y)?(\\d+M)?(\\d+D)?(T(\\d+H)?(\\d+M)?((\\d+\\.?\\d*|\\.\\d+)S)?)?");
+
+ static final int YEAR_MG = 1;
+ static final int MONTH_MG = 2;
+ static final int DAY_MG = 3;
+ static final int HOUR_MG = 5;
+ static final int MIN_MG = 6;
+ static final int SEC_MG = 8;
+
+ private int _years;
+ private int _months;
+ private int _days;
+ private int _hours;
+ private int _minutes;
+ private BigDecimal _seconds;
+
+ /**
+ *
+ */
+ public Duration(String duration) {
+ Matcher m = PATTERN.matcher(duration);
+ if(m.matches()){
+ _years = parseInt(m.group(YEAR_MG));
+ _months = parseInt(m.group(MONTH_MG));
+ _days = parseInt(m.group(DAY_MG));
+ _hours = parseInt(m.group(HOUR_MG));
+ _minutes = parseInt(m.group(MIN_MG));
+ _seconds = m.group(SEC_MG) == null
+ ? null : new BigDecimal(m.group(SEC_MG));
+ }
+ else{
+ throw new IllegalArgumentException("Bad duration: " + duration);
+ }
+ }
+
+ /**
+ * Adds current duration to a calendar object.
+ * @param calendar
+ */
+ public void addTo(Calendar calendar){
+
+ calendar.add( Calendar.YEAR, _years );
+ calendar.add( Calendar.MONTH, _months );
+ calendar.add( Calendar.DAY_OF_MONTH, _days );
+ calendar.add( Calendar.HOUR, _hours );
+ calendar.add( Calendar.MINUTE, _minutes );
+ calendar.add( Calendar.SECOND, (_seconds == null)
+ ? 0 : _seconds.intValue());
+
+ if(_seconds!=null) {
BigDecimal fraction = _seconds.subtract(_seconds.setScale(0,BigDecimal.ROUND_DOWN));
int millisec = fraction.movePointRight(3).intValue();
calendar.add( Calendar.MILLISECOND, millisec );
- }
- }
-
- private static int parseInt(String value){
- if(value == null)
- return 0;
- else{
- return Integer.parseInt(value.substring(0, value.length()-1));
- }
- }
+ }
+ }
+
+ private static int parseInt(String value){
+ if(value == null)
+ return 0;
+ else{
+ return Integer.parseInt(value.substring(0, value.length()-1));
+ }
+ }
}
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/xsl/XslTransformHandler.java Thu May 27 15:52:24 2010
@@ -144,18 +144,18 @@ public class XslTransformHandler {
}
String method = tf.getOutputProperties().getProperty("method");
if (method == null || "xml".equals(method)) {
- DOMResult result = new DOMResult();
- tf.transform(source, result);
- Node node = result.getNode();
- if(node.getNodeType() == Node.DOCUMENT_NODE)
- node = ((Document)node).getDocumentElement();
+ DOMResult result = new DOMResult();
+ tf.transform(source, result);
+ Node node = result.getNode();
+ if(node.getNodeType() == Node.DOCUMENT_NODE)
+ node = ((Document)node).getDocumentElement();
if(__log.isDebugEnabled()) __log.debug("Returned node: type="+node.getNodeType()+", "+ DOMUtils.domToString(node));
- return node;
+ return node;
} else {
// text and html outputs are handled the same way
StringWriter writerResult = new StringWriter();
StreamResult result = new StreamResult(writerResult);
- tf.transform(source, result);
+ tf.transform(source, result);
writerResult.flush();
String output = writerResult.toString();
if(__log.isDebugEnabled()) __log.debug("Returned string: "+output);
@@ -173,9 +173,9 @@ public class XslTransformHandler {
}
public void clearXSLSheets(QName processQName) {
- synchronized (_templateCache) {
- _templateCache.removeAll(processQName);
- }
+ synchronized (_templateCache) {
+ _templateCache.removeAll(processQName);
+ }
}
}
Modified: ode/trunk/utils/src/main/resources/org/apache/ode/utils/wsdl.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/resources/org/apache/ode/utils/wsdl.xsd?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/main/resources/org/apache/ode/utils/wsdl.xsd (original)
+++ ode/trunk/utils/src/main/resources/org/apache/ode/utils/wsdl.xsd Thu May 27 15:52:24 2010
@@ -38,7 +38,7 @@
<xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
</xs:sequence>
</xs:complexType>
-
+
<xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
<xs:complexContent>
<xs:extension base="wsdl:tDocumented" >
@@ -112,7 +112,7 @@
<xs:selector xpath="wsdl:port" />
<xs:field xpath="@name" />
</xs:unique>
- </xs:element>
+ </xs:element>
</xs:choice>
</xs:group>
@@ -184,7 +184,7 @@ maxOccurs="unbounded"/>
<xs:complexType name="tOperation" >
<xs:complexContent>
<xs:extension base="wsdl:tExtensibleDocumented" >
- <xs:sequence>
+ <xs:sequence>
<xs:choice>
<xs:group ref="wsdl:request-response-or-one-way-operation" />
<xs:group ref="wsdl:solicit-response-or-notification-operation" />
@@ -199,9 +199,9 @@ maxOccurs="unbounded"/>
<xs:group name="request-response-or-one-way-operation" >
<xs:sequence>
<xs:element name="input" type="wsdl:tParam" />
- <xs:sequence minOccurs='0' >
- <xs:element name="output" type="wsdl:tParam" />
- <xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+ <xs:sequence minOccurs='0' >
+ <xs:element name="output" type="wsdl:tParam" />
+ <xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:sequence>
</xs:group>
@@ -209,10 +209,10 @@ maxOccurs="unbounded"/>
<xs:group name="solicit-response-or-notification-operation" >
<xs:sequence>
<xs:element name="output" type="wsdl:tParam" />
- <xs:sequence minOccurs='0' >
- <xs:element name="input" type="wsdl:tParam" />
- <xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
+ <xs:sequence minOccurs='0' >
+ <xs:element name="input" type="wsdl:tParam" />
+ <xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
</xs:sequence>
</xs:group>
Modified: ode/trunk/utils/src/test/java/org/apache/ode/utils/DOMUtilsTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/java/org/apache/ode/utils/DOMUtilsTest.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/java/org/apache/ode/utils/DOMUtilsTest.java (original)
+++ ode/trunk/utils/src/test/java/org/apache/ode/utils/DOMUtilsTest.java Thu May 27 15:52:24 2010
@@ -53,11 +53,11 @@ public class DOMUtilsTest extends TestCa
}
public void testSerializeDom() throws Exception {
- Document doc = DOMUtils.newDocument();
- Element foo = doc.createElement("foo");
- Element bar = doc.createElement("bar");
- doc.appendChild(foo);
- foo.appendChild(bar);
+ Document doc = DOMUtils.newDocument();
+ Element foo = doc.createElement("foo");
+ Element bar = doc.createElement("bar");
+ doc.appendChild(foo);
+ foo.appendChild(bar);
assertEquals(foo.toString(), DOMUtils.stringToDOM(DOMUtils.domToString(foo)).toString());
assertEquals(bar.toString(), DOMUtils.stringToDOM(DOMUtils.domToString(bar)).toString());
Modified: ode/trunk/utils/src/test/java/org/apache/ode/utils/SystemUtilsTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/java/org/apache/ode/utils/SystemUtilsTest.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/java/org/apache/ode/utils/SystemUtilsTest.java (original)
+++ ode/trunk/utils/src/test/java/org/apache/ode/utils/SystemUtilsTest.java Thu May 27 15:52:24 2010
@@ -25,58 +25,58 @@ import junit.framework.TestCase;
*/
public class SystemUtilsTest extends TestCase {
- static final String PROP = "org.apache.ode.test.property";
+ static final String PROP = "org.apache.ode.test.property";
- static final String REPLACE = "${" + PROP + "}";
+ static final String REPLACE = "${" + PROP + "}";
- static final String VALUE = "foo\bar$bar";
+ static final String VALUE = "foo\bar$bar";
- public void setUp() {
- System.getProperties().setProperty(PROP, VALUE);
- }
+ public void setUp() {
+ System.getProperties().setProperty(PROP, VALUE);
+ }
- public void teardown() {
- System.getProperties().setProperty(PROP, null);
- }
+ public void teardown() {
+ System.getProperties().setProperty(PROP, null);
+ }
- public void testReplaceSystemProperties() throws Exception {
- // no replacement
- assertReplace("xxx", "xxx");
+ public void testReplaceSystemProperties() throws Exception {
+ // no replacement
+ assertReplace("xxx", "xxx");
- // no substitutions for special characters
- assertReplace("\\aaa\\\\bbb$$$ccc$", "\\aaa\\\\bbb$$$ccc$");
+ // no substitutions for special characters
+ assertReplace("\\aaa\\\\bbb$$$ccc$", "\\aaa\\\\bbb$$$ccc$");
- // empty replacement
- assertReplace("${}", "${}");
+ // empty replacement
+ assertReplace("${}", "${}");
- // as-is
- assertReplace(REPLACE, VALUE);
+ // as-is
+ assertReplace(REPLACE, VALUE);
- // before
- assertReplace(REPLACE + "foo", VALUE + "foo");
+ // before
+ assertReplace(REPLACE + "foo", VALUE + "foo");
- // after
- assertReplace("foo" + REPLACE, "foo" + VALUE);
+ // after
+ assertReplace("foo" + REPLACE, "foo" + VALUE);
- // before+after
- assertReplace(REPLACE + "foo" + REPLACE, VALUE + "foo" + VALUE);
+ // before+after
+ assertReplace(REPLACE + "foo" + REPLACE, VALUE + "foo" + VALUE);
- // in-between
- assertReplace("foo" + REPLACE + "bar", "foo" + VALUE + "bar");
+ // in-between
+ assertReplace("foo" + REPLACE + "bar", "foo" + VALUE + "bar");
- // multiple occurence
- assertReplace(" " + REPLACE + " " + REPLACE + " " + REPLACE, " "
- + VALUE + " " + VALUE + " " + VALUE);
+ // multiple occurence
+ assertReplace(" " + REPLACE + " " + REPLACE + " " + REPLACE, " "
+ + VALUE + " " + VALUE + " " + VALUE);
- // undefined
- assertReplace(" ${undefined.property} ", " ${undefined.property} ");
+ // undefined
+ assertReplace(" ${undefined.property} ", " ${undefined.property} ");
- // stacked
- assertReplace(REPLACE + REPLACE, VALUE + VALUE);
- }
+ // stacked
+ assertReplace(REPLACE + REPLACE, VALUE + VALUE);
+ }
- static void assertReplace(String str, String expected) throws Exception {
- String actual = SystemUtils.replaceSystemProperties(str);
- assertEquals(expected, actual);
- }
+ static void assertReplace(String str, String expected) throws Exception {
+ String actual = SystemUtils.replaceSystemProperties(str);
+ assertEquals(expected, actual);
+ }
}
Modified: ode/trunk/utils/src/test/java/org/apache/ode/utils/xsd/DurationTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/java/org/apache/ode/utils/xsd/DurationTest.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/java/org/apache/ode/utils/xsd/DurationTest.java (original)
+++ ode/trunk/utils/src/test/java/org/apache/ode/utils/xsd/DurationTest.java Thu May 27 15:52:24 2010
@@ -27,85 +27,85 @@ import junit.framework.TestCase;
*
*/
public class DurationTest extends TestCase {
- /**
- * Constructor for DurationTest.
- * @param arg0
- */
- public DurationTest(String arg0) {
- super(arg0);
- }
-
- public void testDuration1() {
- String TEST ="P10Y10M10DT10H10M10.1S";
- Duration d = new Duration(TEST);
- long time = System.currentTimeMillis();
-
- Calendar c1 = Calendar.getInstance();
- c1.setTimeInMillis(time);
- Calendar c2 = Calendar.getInstance();
- c2.setTimeInMillis(time);
-
- d.addTo(c1);
- c2.add(Calendar.YEAR, 10);
- c2.add(Calendar.MONTH, 10);
- c2.add(Calendar.DAY_OF_MONTH, 10);
- c2.add(Calendar.HOUR, 10);
- c2.add(Calendar.MINUTE, 10);
- c2.add(Calendar.SECOND, 10);
- c2.add(Calendar.MILLISECOND, 100);
-
- assertEquals(c2.getTimeInMillis(), c1.getTimeInMillis());
- }
-
- public void testDuration2() {
- String TEST ="P10Y10M10D";
- Duration d = new Duration(TEST);
- long time = System.currentTimeMillis();
-
- Calendar c1 = Calendar.getInstance();
- c1.setTimeInMillis(time);
- Calendar c2 = Calendar.getInstance();
- c2.setTimeInMillis(time);
-
- d.addTo(c1);
- c2.add(Calendar.YEAR, 10);
- c2.add(Calendar.MONTH, 10);
- c2.add(Calendar.DAY_OF_MONTH, 10);
-
- assertEquals(c2.getTimeInMillis(), c1.getTimeInMillis());
- }
-
- public void testDuration3() {
- String TEST ="P10M";
- Duration d = new Duration(TEST);
- long time = System.currentTimeMillis();
-
- Calendar c1 = Calendar.getInstance();
- c1.setTimeInMillis(time);
- Calendar c2 = Calendar.getInstance();
- c2.setTimeInMillis(time);
-
- d.addTo(c1);
- c2.add(Calendar.MONTH, 10);
-
- assertEquals(c2.getTimeInMillis(), c1.getTimeInMillis());
- }
-
- public void testDuration4() {
- String TEST ="P10YT90S";
- Duration d = new Duration(TEST);
- long time = System.currentTimeMillis();
-
- Calendar c1 = Calendar.getInstance();
- c1.setTimeInMillis(time);
- Calendar c2 = Calendar.getInstance();
- c2.setTimeInMillis(time);
-
- d.addTo(c1);
- c2.add(Calendar.YEAR, 10);
- c2.add(Calendar.SECOND, 90);
-
- assertEquals(c2.getTimeInMillis(), c1.getTimeInMillis());
- }
-
+ /**
+ * Constructor for DurationTest.
+ * @param arg0
+ */
+ public DurationTest(String arg0) {
+ super(arg0);
+ }
+
+ public void testDuration1() {
+ String TEST ="P10Y10M10DT10H10M10.1S";
+ Duration d = new Duration(TEST);
+ long time = System.currentTimeMillis();
+
+ Calendar c1 = Calendar.getInstance();
+ c1.setTimeInMillis(time);
+ Calendar c2 = Calendar.getInstance();
+ c2.setTimeInMillis(time);
+
+ d.addTo(c1);
+ c2.add(Calendar.YEAR, 10);
+ c2.add(Calendar.MONTH, 10);
+ c2.add(Calendar.DAY_OF_MONTH, 10);
+ c2.add(Calendar.HOUR, 10);
+ c2.add(Calendar.MINUTE, 10);
+ c2.add(Calendar.SECOND, 10);
+ c2.add(Calendar.MILLISECOND, 100);
+
+ assertEquals(c2.getTimeInMillis(), c1.getTimeInMillis());
+ }
+
+ public void testDuration2() {
+ String TEST ="P10Y10M10D";
+ Duration d = new Duration(TEST);
+ long time = System.currentTimeMillis();
+
+ Calendar c1 = Calendar.getInstance();
+ c1.setTimeInMillis(time);
+ Calendar c2 = Calendar.getInstance();
+ c2.setTimeInMillis(time);
+
+ d.addTo(c1);
+ c2.add(Calendar.YEAR, 10);
+ c2.add(Calendar.MONTH, 10);
+ c2.add(Calendar.DAY_OF_MONTH, 10);
+
+ assertEquals(c2.getTimeInMillis(), c1.getTimeInMillis());
+ }
+
+ public void testDuration3() {
+ String TEST ="P10M";
+ Duration d = new Duration(TEST);
+ long time = System.currentTimeMillis();
+
+ Calendar c1 = Calendar.getInstance();
+ c1.setTimeInMillis(time);
+ Calendar c2 = Calendar.getInstance();
+ c2.setTimeInMillis(time);
+
+ d.addTo(c1);
+ c2.add(Calendar.MONTH, 10);
+
+ assertEquals(c2.getTimeInMillis(), c1.getTimeInMillis());
+ }
+
+ public void testDuration4() {
+ String TEST ="P10YT90S";
+ Duration d = new Duration(TEST);
+ long time = System.currentTimeMillis();
+
+ Calendar c1 = Calendar.getInstance();
+ c1.setTimeInMillis(time);
+ Calendar c2 = Calendar.getInstance();
+ c2.setTimeInMillis(time);
+
+ d.addTo(c1);
+ c2.add(Calendar.YEAR, 10);
+ c2.add(Calendar.SECOND, 90);
+
+ assertEquals(c2.getTimeInMillis(), c1.getTimeInMillis());
+ }
+
}
Modified: ode/trunk/utils/src/test/resources/Configuration.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/Configuration.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/Configuration.wsdl (original)
+++ ode/trunk/utils/src/test/resources/Configuration.wsdl Thu May 27 15:52:24 2010
@@ -24,24 +24,24 @@
xmlns:configurationType="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:documentation>
+ <wsdl:documentation>
This WSDL document describes the configuration header to be used by all services except the Logger. This header
is part of a supply chain management system. It is used to demonstrate a web service that is
conformant with the Basic Profile and to show how different web service platforms can interoperate.
</wsdl:documentation>
- <wsdl:types>
- <xs:schema>
- <xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" schemaLocation="Configuration.xsdion.xsd"/>
- </xs:schema>
- </wsdl:types>
+ <wsdl:types>
+ <xs:schema>
+ <xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" schemaLocation="Configuration.xsdion.xsd"/>
+ </xs:schema>
+ </wsdl:types>
- <wsdl:message name="ConfigurationFaultMessage">
- <wsdl:documentation>
+ <wsdl:message name="ConfigurationFaultMessage">
+ <wsdl:documentation>
The Configuration fault header indicates why the configuration was invalid and enumerates all
of the service URLs which were not valid in Configuration header of the request message.
</wsdl:documentation>
- <wsdl:part name="ConfigurationFault" element="configurationType:ConfigurationFault"/>
- </wsdl:message>
+ <wsdl:part name="ConfigurationFault" element="configurationType:ConfigurationFault"/>
+ </wsdl:message>
</wsdl:definitions>
Modified: ode/trunk/utils/src/test/resources/Configuration.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/Configuration.xsd?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/Configuration.xsd (original)
+++ ode/trunk/utils/src/test/resources/Configuration.xsd Thu May 27 15:52:24 2010
@@ -25,58 +25,58 @@
elementFormDefault="qualified">
<xs:import namespace="http://schemas.xmlsoap.org/soap/envelope/"
schemaLocation="soap-envelope.xsd" />
- <xs:annotation>
- <xs:documentation>
+ <xs:annotation>
+ <xs:documentation>
This schema describes the types needed to describe the header common to all services. This
header is used to pass the configuration of the demo to the various web services, and does not convey
meaning required to implement a Supply Chain Management System.
- </xs:documentation>
- </xs:annotation>
- <xs:simpleType name="ConfigurationEndpointRole">
- <xs:restriction base="xs:NMTOKEN">
- <xs:enumeration value="LoggingFacility"/>
- <xs:enumeration value="Retailer"/>
- <xs:enumeration value="WarehouseA"/>
- <xs:enumeration value="WarehouseB"/>
- <xs:enumeration value="WarehouseC"/>
- <xs:enumeration value="ManufacturerA"/>
- <xs:enumeration value="ManufacturerB"/>
- <xs:enumeration value="ManufacturerC"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:complexType name="ConfigurationEndpointType">
- <xs:simpleContent>
- <xs:extension base="xs:anyURI">
- <xs:attribute name="Role" type="tns:ConfigurationEndpointRole" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:element name="Configuration" type="tns:ConfigurationType"/>
- <xs:complexType name="ConfigurationType">
- <xs:sequence>
- <xs:annotation>
- <xs:documentation>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType name="ConfigurationEndpointRole">
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="LoggingFacility"/>
+ <xs:enumeration value="Retailer"/>
+ <xs:enumeration value="WarehouseA"/>
+ <xs:enumeration value="WarehouseB"/>
+ <xs:enumeration value="WarehouseC"/>
+ <xs:enumeration value="ManufacturerA"/>
+ <xs:enumeration value="ManufacturerB"/>
+ <xs:enumeration value="ManufacturerC"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:complexType name="ConfigurationEndpointType">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:attribute name="Role" type="tns:ConfigurationEndpointRole" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:element name="Configuration" type="tns:ConfigurationType"/>
+ <xs:complexType name="ConfigurationType">
+ <xs:sequence>
+ <xs:annotation>
+ <xs:documentation>
It is left to the application to make sure that this array contains one of each of the
role values enumerated in ConfigurationEndpointType.
- </xs:documentation>
- </xs:annotation>
- <xs:element name="UserId" type="xs:string" nillable="false"/>
- <xs:element name="ServiceUrl" type="tns:ConfigurationEndpointType" nillable="false" minOccurs="8" maxOccurs="8"/>
- </xs:sequence>
- <xs:attribute ref="s:mustUnderstand" use="optional"/>
- </xs:complexType>
- <xs:element name="ConfigurationFault" type="tns:ConfigurationFaultType" />
- <xs:complexType name="ConfigurationFaultType">
- <xs:sequence>
- <xs:annotation>
- <xs:documentation>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:element name="UserId" type="xs:string" nillable="false"/>
+ <xs:element name="ServiceUrl" type="tns:ConfigurationEndpointType" nillable="false" minOccurs="8" maxOccurs="8"/>
+ </xs:sequence>
+ <xs:attribute ref="s:mustUnderstand" use="optional"/>
+ </xs:complexType>
+ <xs:element name="ConfigurationFault" type="tns:ConfigurationFaultType" />
+ <xs:complexType name="ConfigurationFaultType">
+ <xs:sequence>
+ <xs:annotation>
+ <xs:documentation>
It is required that every ServiceUrl that is missing, contains a duplicate, or does not resolve to a
reachable service will be indicated in the ErroneousElement array.
- </xs:documentation>
- </xs:annotation>
- <xs:element name="Message" type="xs:string"/>
- <xs:element name="ErroneousElement" type="tns:ConfigurationEndpointRole" minOccurs="0" maxOccurs="8"/>
- </xs:sequence>
- <xs:attribute ref="s:mustUnderstand"/>
- </xs:complexType>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:element name="Message" type="xs:string"/>
+ <xs:element name="ErroneousElement" type="tns:ConfigurationEndpointRole" minOccurs="0" maxOccurs="8"/>
+ </xs:sequence>
+ <xs:attribute ref="s:mustUnderstand"/>
+ </xs:complexType>
</xs:schema>
Modified: ode/trunk/utils/src/test/resources/RetailOrder.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/RetailOrder.xsd?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/RetailOrder.xsd (original)
+++ ode/trunk/utils/src/test/resources/RetailOrder.xsd Thu May 27 15:52:24 2010
@@ -19,81 +19,81 @@
-->
<!--
- November 14, 2002
+ November 14, 2002
- (c) Copyright 2002, The Web Services-Interoperability Organization (WS-I)
- Download or use of this file is governed by the Policies and Bylaws of WS-I.
+ (c) Copyright 2002, The Web Services-Interoperability Organization (WS-I)
+ Download or use of this file is governed by the Policies and Bylaws of WS-I.
- For more information, send email info@ws-i.org.
+ For more information, send email info@ws-i.org.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/RetailOrder.xsd"
targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/RetailOrder.xsd">
- <xsd:annotation>
- <xsd:documentation xml:lang="en">Definition of PartsOrder types for Retailer component of WS-I</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType name="PartsOrderType">
- <xsd:sequence>
- <xsd:element name="Item" type="tns:PartsOrderItem" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="PartsOrderItem">
- <xsd:sequence>
- <xsd:element name="productNumber" type="tns:productNumber" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="quantity" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="price" type="xsd:decimal" minOccurs="1" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="PartsOrderResponseType">
- <xsd:sequence>
- <xsd:element name="Item" type="tns:PartsOrderResponseItem" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="PartsOrderResponseItem">
- <xsd:sequence>
- <xsd:element name="productNumber" type="tns:productNumber" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="quantity" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="price" type="xsd:decimal" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="comment" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CustomerDetailsType">
- <xsd:sequence>
- <xsd:element name="custnbr" type="tns:CustomerReferenceType" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="street1" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="street2" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="city" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="state" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="zip" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="country" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:simpleType name="productNumber">
- <xsd:restriction base="xsd:integer">
- <xsd:minInclusive value="1"/>
- <xsd:maxInclusive value="999999"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:simpleType name="CustomerReferenceType">
- <xsd:restriction base="xsd:normalizedString">
- <xsd:maxLength value="20"/>
- <xsd:pattern value="[A-D][0-9]{5}-[0-9A-Z]{7}-[a-z]{3}#*"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:element name="InvalidProductCode" type="tns:InvalidProductCodeType"/>
- <xsd:complexType name="InvalidProductCodeType">
- <xsd:sequence>
- <xsd:element name="Reason">
- <xsd:simpleType>
- <xsd:restriction base="xsd:NMTOKEN">
- <xsd:enumeration value="InvalidProductCode"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- <xsd:element name="ProductNumber" type="tns:productNumber" />
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="BadOrderReason" type="xsd:string"/>
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">Definition of PartsOrder types for Retailer component of WS-I</xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType name="PartsOrderType">
+ <xsd:sequence>
+ <xsd:element name="Item" type="tns:PartsOrderItem" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="PartsOrderItem">
+ <xsd:sequence>
+ <xsd:element name="productNumber" type="tns:productNumber" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="quantity" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="price" type="xsd:decimal" minOccurs="1" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="PartsOrderResponseType">
+ <xsd:sequence>
+ <xsd:element name="Item" type="tns:PartsOrderResponseItem" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="PartsOrderResponseItem">
+ <xsd:sequence>
+ <xsd:element name="productNumber" type="tns:productNumber" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="quantity" type="xsd:nonNegativeInteger" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="price" type="xsd:decimal" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="CustomerDetailsType">
+ <xsd:sequence>
+ <xsd:element name="custnbr" type="tns:CustomerReferenceType" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="street1" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="street2" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="city" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="state" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="zip" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="country" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:simpleType name="productNumber">
+ <xsd:restriction base="xsd:integer">
+ <xsd:minInclusive value="1"/>
+ <xsd:maxInclusive value="999999"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ <xsd:simpleType name="CustomerReferenceType">
+ <xsd:restriction base="xsd:normalizedString">
+ <xsd:maxLength value="20"/>
+ <xsd:pattern value="[A-D][0-9]{5}-[0-9A-Z]{7}-[a-z]{3}#*"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ <xsd:element name="InvalidProductCode" type="tns:InvalidProductCodeType"/>
+ <xsd:complexType name="InvalidProductCodeType">
+ <xsd:sequence>
+ <xsd:element name="Reason">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:NMTOKEN">
+ <xsd:enumeration value="InvalidProductCode"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:element>
+ <xsd:element name="ProductNumber" type="tns:productNumber" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="BadOrderReason" type="xsd:string"/>
</xsd:schema>
Modified: ode/trunk/utils/src/test/resources/Warehouse.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/Warehouse.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/Warehouse.wsdl (original)
+++ ode/trunk/utils/src/test/resources/Warehouse.wsdl Thu May 27 15:52:24 2010
@@ -20,85 +20,85 @@
-->
<wsdl:definitions
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:c="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl"
- xmlns:ct="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
- xmlns:wh="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
- xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:c="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl"
+ xmlns:ct="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
+ xmlns:wh="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
+ xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
+ targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsi="http://ws-i.org/schemas/conformanceClaim/">
- <wsdl:documentation>
+ <wsdl:documentation>
This WSDL document describes the Warehouse service for the WS-I Basic Sample Application. This service
is part of a supply chain management system. It is used to demonstrate a web service that is
conformant with the Basic Profile and to show how different web service platforms can interoperate.
- </wsdl:documentation>
+ </wsdl:documentation>
- <wsdl:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl" location="Configuration.wsdl"/>
+ <wsdl:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl" location="Configuration.wsdl"/>
-
- <wsdl:types>
- <xs:schema>
- <xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" schemaLocation="Configuration.xsd"/>
- <xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd" schemaLocation="Warehouse.xsduse.xsd"/>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="ShipGoodsRequest">
- <wsdl:part name="ItemList" type="wh:ItemList"/>
- <wsdl:part name="Customer" type="wh:CustomerReferenceType"/>
- <wsdl:part name="ConfigurationHeader" element="ct:Configuration"/>
- </wsdl:message>
+
+ <wsdl:types>
+ <xs:schema>
+ <xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" schemaLocation="Configuration.xsd"/>
+ <xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd" schemaLocation="Warehouse.xsduse.xsd"/>
+ </xs:schema>
+ </wsdl:types>
+
+ <wsdl:message name="ShipGoodsRequest">
+ <wsdl:part name="ItemList" type="wh:ItemList"/>
+ <wsdl:part name="Customer" type="wh:CustomerReferenceType"/>
+ <wsdl:part name="ConfigurationHeader" element="ct:Configuration"/>
+ </wsdl:message>
- <wsdl:message name="ShipGoodsResponse">
- <wsdl:documentation>
+ <wsdl:message name="ShipGoodsResponse">
+ <wsdl:documentation>
A response of true indicates the goods have been shipped. A response of false
indicates the warehouse either does not carry that part or does not have enough stock to
fill the requested quantity.
- </wsdl:documentation>
- <wsdl:part name="Response" type="wh:ItemShippingStatusList"/>
- </wsdl:message>
-
- <wsdl:portType name="WarehouseShipmentsPortType">
- <wsdl:operation name="ShipGoods">
- <wsdl:documentation>Ship the specified number of the specified part to the specified customer.</wsdl:documentation>
- <wsdl:input message="tns:ShipGoodsRequest"/>
- <wsdl:output message="tns:ShipGoodsResponse"/>
- <wsdl:fault name="ConfigurationFault" message="c:ConfigurationFaultMessage"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="WarehouseSoapBinding" type="tns:WarehouseShipmentsPortType">
- <wsdl:documentation>
- <wsi:Claim conformsTo="http://ws-i.org/profiles/basic1.0/" />
- </wsdl:documentation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <wsdl:operation name="ShipGoods">
- <soap:operation
- soapAction="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"/>
- <wsdl:input>
- <soap:body use="literal"
- namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- parts="ItemList Customer" />
- <soap:header message="tns:ShipGoodsRequest" part="ConfigurationHeader" use="literal">
- <soap:headerfault message="c:ConfigurationFaultMessage" part="ConfigurationFault" use="literal" />
- </soap:header>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"
- namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
+ </wsdl:documentation>
+ <wsdl:part name="Response" type="wh:ItemShippingStatusList"/>
+ </wsdl:message>
+
+ <wsdl:portType name="WarehouseShipmentsPortType">
+ <wsdl:operation name="ShipGoods">
+ <wsdl:documentation>Ship the specified number of the specified part to the specified customer.</wsdl:documentation>
+ <wsdl:input message="tns:ShipGoodsRequest"/>
+ <wsdl:output message="tns:ShipGoodsResponse"/>
+ <wsdl:fault name="ConfigurationFault" message="c:ConfigurationFaultMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="WarehouseSoapBinding" type="tns:WarehouseShipmentsPortType">
+ <wsdl:documentation>
+ <wsi:Claim conformsTo="http://ws-i.org/profiles/basic1.0/" />
+ </wsdl:documentation>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <wsdl:operation name="ShipGoods">
+ <soap:operation
+ soapAction="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"/>
+ <wsdl:input>
+ <soap:body use="literal"
+ namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
+ parts="ItemList Customer" />
+ <soap:header message="tns:ShipGoodsRequest" part="ConfigurationHeader" use="literal">
+ <soap:headerfault message="c:ConfigurationFaultMessage" part="ConfigurationFault" use="literal" />
+ </soap:header>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"
+ namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
</wsdl:definitions>
<!-- The following is an example of a SOAP request message compliant with the above WSDL:
<s:Envelope xmlns:s="http://schemas.xmlsoap.org/envelope/">
<s:Header>
<h:Configuration
- xmlns:h="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd">
+ xmlns:h="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd">
<h:UserId>8bf7ec9a-f3b2-4f39-9807-c55c860a5983</h:UserId>
<h:ServiceUrl Role="WarehouseA">http://www.ws-i.org/BasicSampleApp/WarehouseA</h:ServiceUrl>
<h:ServiceUrl Role="LoggingFacility">http://www.ws-i.org/BasicSampleApp/LoggingFacility</h:ServiceUrl>
@@ -112,17 +112,17 @@
</s:Header>
<s:Body>
<ns1:ShipGoods xmlns:ns1="http://www,ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- xmlns:ns2="http://www,ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
- <ItemList>
- <ns2:Item>
- <ns2:ProductNumber>605006</ns2:ProductNumber>
- <ns2:Quantity>23</ns2:Quantity>
- </ns2:Item>
- <ns2:Item>
- <ns2:ProductNumber>605007</ns2:ProductNumber>
- <ns2:Quantity>22</ns2:Quantity>
- </ns2:Item>
- </ItemList>
+ xmlns:ns2="http://www,ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
+ <ItemList>
+ <ns2:Item>
+ <ns2:ProductNumber>605006</ns2:ProductNumber>
+ <ns2:Quantity>23</ns2:Quantity>
+ </ns2:Item>
+ <ns2:Item>
+ <ns2:ProductNumber>605007</ns2:ProductNumber>
+ <ns2:Quantity>22</ns2:Quantity>
+ </ns2:Item>
+ </ItemList>
<Customer>D22845-W8N349Y-tky</Customer>
</ns1:ShipGoods>
</s:Body>
@@ -133,17 +133,17 @@ The following is an example of a SOAP re
<s:Envelope xmlns:s="http://schemas.xmlsoap.org/envelope/">
<s:Body>
<ns1:ShipGoodsResponse xmlns:ns1="http://www,ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- xmlns:ns2="http://www,ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
- <Response>
- <ns2:ItemStatus>
- <ns2:ProductNumber>605006</ns2:ProductNumber>
- <ns2:Status>false</ns2:Status>
- </ns2:ItemStatus>
- <ns2:ItemStatus>
- <ns2:ProductNumber>605007</ns2:ProductNumber>
- <ns2:Status>true</ns2:Status>
- </ns2:ItemStatus>
- </Response>
+ xmlns:ns2="http://www,ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
+ <Response>
+ <ns2:ItemStatus>
+ <ns2:ProductNumber>605006</ns2:ProductNumber>
+ <ns2:Status>false</ns2:Status>
+ </ns2:ItemStatus>
+ <ns2:ItemStatus>
+ <ns2:ProductNumber>605007</ns2:ProductNumber>
+ <ns2:Status>true</ns2:Status>
+ </ns2:ItemStatus>
+ </Response>
</ns1:ShipGoodsResponse>
</s:Body>
</s:Envelope>
Modified: ode/trunk/utils/src/test/resources/Warehouse.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/Warehouse.xsd?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/Warehouse.xsd (original)
+++ ode/trunk/utils/src/test/resources/Warehouse.xsd Thu May 27 15:52:24 2010
@@ -20,40 +20,40 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- xmlns:wh="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
- targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
+ xmlns:wh="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
+ targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
- <xs:simpleType name="CustomerReferenceType">
- <xs:restriction base="xs:normalizedString">
- <xs:maxLength value="20"/>
- <xs:pattern value="[A-D][0-9]{5}-[0-9A-Z]{7}-[a-z]{3}#*"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="Item">
- <xs:sequence>
- <xs:element name="ProductNumber" type="xs:nonNegativeInteger"/>
- <xs:element name="Quantity" type="xs:unsignedShort"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ItemList">
- <xs:sequence>
- <xs:element name="Item" type="wh:Item" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ItemShippingStatus">
- <xs:sequence>
- <xs:element name="ProductNumber" type="xs:nonNegativeInteger"/>
- <xs:element name="Status" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ItemShippingStatusList">
- <xs:sequence>
- <xs:element name="ItemStatus" type="wh:ItemShippingStatus" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
- </xs:sequence>
- </xs:complexType>
+ <xs:simpleType name="CustomerReferenceType">
+ <xs:restriction base="xs:normalizedString">
+ <xs:maxLength value="20"/>
+ <xs:pattern value="[A-D][0-9]{5}-[0-9A-Z]{7}-[a-z]{3}#*"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="Item">
+ <xs:sequence>
+ <xs:element name="ProductNumber" type="xs:nonNegativeInteger"/>
+ <xs:element name="Quantity" type="xs:unsignedShort"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ItemList">
+ <xs:sequence>
+ <xs:element name="Item" type="wh:Item" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ItemShippingStatus">
+ <xs:sequence>
+ <xs:element name="ProductNumber" type="xs:nonNegativeInteger"/>
+ <xs:element name="Status" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ItemShippingStatusList">
+ <xs:sequence>
+ <xs:element name="ItemStatus" type="wh:ItemShippingStatus" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
Modified: ode/trunk/utils/src/test/resources/WarehouseImpl.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/WarehouseImpl.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/WarehouseImpl.wsdl (original)
+++ ode/trunk/utils/src/test/resources/WarehouseImpl.wsdl Thu May 27 15:52:24 2010
@@ -19,25 +19,25 @@
-->
<definitions
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:scm="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <import
- namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- location="Warehouse.wsdl"/>
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:scm="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
+ targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <import
+ namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
+ location="Warehouse.wsdl"/>
- <types/>
- <service name="WarehouseService">
- <port name="WarehouseAPort" binding="scm:WarehouseSoapBinding">
- <soap:address location="http://localhost:8080/wsi-server/scm/warehousea" />
- </port>
- <port name="WarehouseBPort" binding="scm:WarehouseSoapBinding">
- <soap:address location="http://localhost:8080/wsi-server/scm/warehouseb" />
- </port>
- <port name="WarehouseCPort" binding="scm:WarehouseSoapBinding">
- <soap:address location="http://localhost:8080/wsi-server/scm/warehousec" />
- </port>
- </service>
+ <types/>
+ <service name="WarehouseService">
+ <port name="WarehouseAPort" binding="scm:WarehouseSoapBinding">
+ <soap:address location="http://localhost:8080/wsi-server/scm/warehousea" />
+ </port>
+ <port name="WarehouseBPort" binding="scm:WarehouseSoapBinding">
+ <soap:address location="http://localhost:8080/wsi-server/scm/warehouseb" />
+ </port>
+ <port name="WarehouseCPort" binding="scm:WarehouseSoapBinding">
+ <soap:address location="http://localhost:8080/wsi-server/scm/warehousec" />
+ </port>
+ </service>
</definitions>
Modified: ode/trunk/utils/src/test/resources/bad_xml_schema_import.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/bad_xml_schema_import.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/bad_xml_schema_import.wsdl (original)
+++ ode/trunk/utils/src/test/resources/bad_xml_schema_import.wsdl Thu May 27 15:52:24 2010
@@ -20,13 +20,13 @@
<definitions
targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <types>
- <xs:schema>
- <xs:import namespace="foo://bar" schemaLocation="bad_xml.wsdl"/>
- </xs:schema>
- </types>
-
+ <types>
+ <xs:schema>
+ <xs:import namespace="foo://bar" schemaLocation="bad_xml.wsdl"/>
+ </xs:schema>
+ </types>
+
</definitions>
Modified: ode/trunk/utils/src/test/resources/dummyXML.xml
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/dummyXML.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/dummyXML.xml (original)
+++ ode/trunk/utils/src/test/resources/dummyXML.xml Thu May 27 15:52:24 2010
@@ -19,21 +19,21 @@
-->
<test>
- <empty />
- <empty>
-
-
- </empty>
- <non-empty>
- Hello.
- </non-empty>
- <non-empty>
- <![CDATA[Hello.]]>
- </non-empty>
- <empty>
- <!-- this is empty -->
- </empty>
- <non-empty>
- <foo />
- </non-empty>
+ <empty />
+ <empty>
+
+
+ </empty>
+ <non-empty>
+ Hello.
+ </non-empty>
+ <non-empty>
+ <![CDATA[Hello.]]>
+ </non-empty>
+ <empty>
+ <!-- this is empty -->
+ </empty>
+ <non-empty>
+ <foo />
+ </non-empty>
</test>
\ No newline at end of file
Modified: ode/trunk/utils/src/test/resources/invalid_but_well_formed.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/invalid_but_well_formed.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/invalid_but_well_formed.wsdl (original)
+++ ode/trunk/utils/src/test/resources/invalid_but_well_formed.wsdl Thu May 27 15:52:24 2010
@@ -19,20 +19,20 @@
-->
<definitions
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Retailer.wsdl"
- targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Retailer.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <import
- namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- location="WarehouseImpl.wsdl"/>
-
- <foobar oh="yeah" />
-
- <types>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" >
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Retailer.wsdl"
+ targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Retailer.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+ <import
+ namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
+ location="WarehouseImpl.wsdl"/>
+
+ <foobar oh="yeah" />
+
+ <types>
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" >
<xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/RetailCatalog.xsd"
schemaLocation="RetailCatalog.xsdlog.xsd" />
<xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/RetailOrder.xsd"
@@ -40,11 +40,11 @@
<xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
schemaLocation="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" />
</xs:schema>
- </types>
- <service name="RetailerService">
- <port name="RetailerPort" binding="tns:RetailerSoapBinding">
- <soap:address location="http://this/is/ignored"/>
- </port>
- </service>
-
+ </types>
+ <service name="RetailerService">
+ <port name="RetailerPort" binding="tns:RetailerSoapBinding">
+ <soap:address location="http://this/is/ignored"/>
+ </port>
+ </service>
+
</definitions>
\ No newline at end of file
Modified: ode/trunk/utils/src/test/resources/missing_imported_schema_import.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/missing_imported_schema_import.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/missing_imported_schema_import.wsdl (original)
+++ ode/trunk/utils/src/test/resources/missing_imported_schema_import.wsdl Thu May 27 15:52:24 2010
@@ -20,13 +20,13 @@
<definitions
targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <types>
- <xs:schema>
- <xs:import namespace="missing_import.xsd" schemaLocation="missing_import.xsd"/>
- </xs:schema>
- </types>
-
+ <types>
+ <xs:schema>
+ <xs:import namespace="missing_import.xsd" schemaLocation="missing_import.xsd"/>
+ </xs:schema>
+ </types>
+
</definitions>
Modified: ode/trunk/utils/src/test/resources/missing_schema_import.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/missing_schema_import.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/missing_schema_import.wsdl (original)
+++ ode/trunk/utils/src/test/resources/missing_schema_import.wsdl Thu May 27 15:52:24 2010
@@ -20,13 +20,13 @@
<definitions
targetNamespace="foo://bar/baz"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <types>
- <xs:schema>
- <xs:import namespace="missing.xsd" schemaLocation="missing.xsd"/>
- </xs:schema>
- </types>
-
+ <types>
+ <xs:schema>
+ <xs:import namespace="missing.xsd" schemaLocation="missing.xsd"/>
+ </xs:schema>
+ </types>
+
</definitions>
Modified: ode/trunk/utils/src/test/resources/non_ws-i_schema_import.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/non_ws-i_schema_import.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/non_ws-i_schema_import.wsdl (original)
+++ ode/trunk/utils/src/test/resources/non_ws-i_schema_import.wsdl Thu May 27 15:52:24 2010
@@ -20,9 +20,9 @@
<definitions
targetNamespace="foo://bar/baz"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <import
- namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
- location="Configuration.xsd"/>
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <import
+ namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
+ location="Configuration.xsd"/>
</definitions>
Modified: ode/trunk/utils/src/test/resources/not_schema_schema_import.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/not_schema_schema_import.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/not_schema_schema_import.wsdl (original)
+++ ode/trunk/utils/src/test/resources/not_schema_schema_import.wsdl Thu May 27 15:52:24 2010
@@ -20,13 +20,13 @@
<definitions
targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <types>
- <xs:schema>
- <xs:import namespace="foo://bar" schemaLocation="empty.wsdl"/>
- </xs:schema>
- </types>
-
+ <types>
+ <xs:schema>
+ <xs:import namespace="foo://bar" schemaLocation="empty.wsdl"/>
+ </xs:schema>
+ </types>
+
</definitions>
Modified: ode/trunk/utils/src/test/resources/retailer.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/retailer.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/retailer.wsdl (original)
+++ ode/trunk/utils/src/test/resources/retailer.wsdl Thu May 27 15:52:24 2010
@@ -19,18 +19,18 @@
-->
<definitions
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Retailer.wsdl"
- targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Retailer.wsdl"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <import
- namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- location="WarehouseImpl.wsdl"/>
-
- <types>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" >
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Retailer.wsdl"
+ targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Retailer.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+ <import
+ namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
+ location="WarehouseImpl.wsdl"/>
+
+ <types>
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" >
<xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/RetailCatalog.xsd"
schemaLocation="RetailCatalog.xsd" />
<xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/RetailOrder.xsd"
@@ -38,10 +38,10 @@
<xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
schemaLocation="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" />
</xs:schema>
- </types>
- <service name="RetailerService">
- <port name="RetailerPort" binding="tns:RetailerSoapBinding">
- <soap:address location="http://this/is/ignored"/>
- </port>
- </service>
+ </types>
+ <service name="RetailerService">
+ <port name="RetailerPort" binding="tns:RetailerSoapBinding">
+ <soap:address location="http://this/is/ignored"/>
+ </port>
+ </service>
</definitions>
\ No newline at end of file
Modified: ode/trunk/utils/src/test/resources/soap-envelope.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/soap-envelope.xsd?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/soap-envelope.xsd (original)
+++ ode/trunk/utils/src/test/resources/soap-envelope.xsd Thu May 27 15:52:24 2010
@@ -48,12 +48,12 @@
<xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
</xs:sequence>
<xs:anyAttribute namespace="##any" processContents="lax" >
- <xs:annotation>
- <xs:documentation>
- Prose in the spec does not specify that attributes are allowed on the Body element
- </xs:documentation>
- </xs:annotation>
- </xs:anyAttribute>
+ <xs:annotation>
+ <xs:documentation>
+ Prose in the spec does not specify that attributes are allowed on the Body element
+ </xs:documentation>
+ </xs:annotation>
+ </xs:anyAttribute>
</xs:complexType>
@@ -61,18 +61,18 @@
<xs:attribute name="mustUnderstand" >
<xs:simpleType>
<xs:restriction base='xs:boolean'>
- <xs:pattern value='0|1' />
- </xs:restriction>
+ <xs:pattern value='0|1' />
+ </xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="actor" type="xs:anyURI" />
<xs:simpleType name="encodingStyle" >
<xs:annotation>
- <xs:documentation>
- 'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element. For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
- </xs:documentation>
- </xs:annotation>
+ <xs:documentation>
+ 'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element. For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification
+ </xs:documentation>
+ </xs:annotation>
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
@@ -84,10 +84,10 @@
<xs:element name="Fault" type="tns:Fault" />
<xs:complexType name="Fault" final="extension" >
<xs:annotation>
- <xs:documentation>
- Fault reporting structure
- </xs:documentation>
- </xs:annotation>
+ <xs:documentation>
+ Fault reporting structure
+ </xs:documentation>
+ </xs:annotation>
<xs:sequence>
<xs:element name="faultcode" type="xs:QName" />
<xs:element name="faultstring" type="xs:string" />
Modified: ode/trunk/utils/src/test/resources/ws-i_schema_import.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/ws-i_schema_import.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/ws-i_schema_import.wsdl (original)
+++ ode/trunk/utils/src/test/resources/ws-i_schema_import.wsdl Thu May 27 15:52:24 2010
@@ -20,17 +20,17 @@
<definitions
targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <import
- namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
- location="Configuration.xsd"/>
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <import
+ namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd"
+ location="Configuration.xsd"/>
- <wsdl:types>
- <xs:schema>
- <xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" schemaLocation="Configuration.xsd"/>
- </xs:schema>
- </wsdl:types>
-
+ <wsdl:types>
+ <xs:schema>
+ <xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" schemaLocation="Configuration.xsd"/>
+ </xs:schema>
+ </wsdl:types>
+
</definitions>
Modified: ode/trunk/utils/src/test/resources/wsdl_deep_schema_import.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/test/resources/wsdl_deep_schema_import.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/utils/src/test/resources/wsdl_deep_schema_import.wsdl (original)
+++ ode/trunk/utils/src/test/resources/wsdl_deep_schema_import.wsdl Thu May 27 15:52:24 2010
@@ -20,13 +20,13 @@
<definitions
targetNamespace="foo://bar/baz"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <types>
- <xs:schema>
- <xs:import namespace="bar://baz/qux" schemaLocation="good_import.xsd"/>
- </xs:schema>
- </types>
-
+ <types>
+ <xs:schema>
+ <xs:import namespace="bar://baz/qux" schemaLocation="good_import.xsd"/>
+ </xs:schema>
+ </types>
+
</definitions>