You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2006/09/04 16:34:44 UTC
svn commit: r440093 - in /webservices/jaxme/branches: MAVEN/
MAVEN/projects/jm/src/test/resources/bindings/
MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/xml/ b0_5/
b0_5/src/xs/org/apache/ws/jaxme/xs/xml/
Author: jochen
Date: Mon Sep 4 07:34:44 2006
New Revision: 440093
URL: http://svn.apache.org/viewvc?view=rev&rev=440093
Log:
Eliminated a JRE dependency, which caused the test suite to fail on JRE 1.6.
Added:
webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/bindings.jxb
Modified:
webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java
webservices/jaxme/branches/MAVEN/status.xml
webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java
webservices/jaxme/branches/b0_5/status.xml
Added: webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/bindings.jxb
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/bindings.jxb?view=auto&rev=440093
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/bindings.jxb (added)
+++ webservices/jaxme/branches/MAVEN/projects/jm/src/test/resources/bindings/bindings.jxb Mon Sep 4 07:34:44 2006
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2003, 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jxb:bindings
+ version="1.0"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:bindings schemaLocation="bindings.xsd" node="/xs:schema">
+ <jxb:schemaBindings>
+ <jxb:package name="org.apache.ws.jaxme.test.bindings.vo"/>
+ </jxb:schemaBindings>
+ <jxb:bindings node="xs:simpleType[@name='YesNoType']">
+ <jxb:typesafeEnumClass/>
+ </jxb:bindings>
+ </jxb:bindings>
+
+ <jxb:bindings schemaLocation="imported.xsi" node="/xs:schema">
+ <jxb:schemaBindings>
+ <jxb:package name="org.apache.ws.jaxme.test.bindings.imported.vo"/>
+ </jxb:schemaBindings>
+ <jxb:bindings node="xs:simpleType[@name='YesNoType']">
+ <jxb:typesafeEnumClass/>
+ </jxb:bindings>
+ <jxb:bindings node="xs:element[@name='foo']">
+ <jxb:class name="ImpFoo"/>
+ </jxb:bindings>
+ </jxb:bindings>
+</jxb:bindings>
Modified: webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java?view=diff&rev=440093&r1=440092&r2=440093
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java (original)
+++ webservices/jaxme/branches/MAVEN/projects/xs/src/main/java/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java Mon Sep 4 07:34:44 2006
@@ -16,10 +16,9 @@
*/
package org.apache.ws.jaxme.xs.xml;
+import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
import java.util.StringTokenizer;
@@ -113,28 +112,33 @@
}
}
+ /**
+ * Default implementation of {@link XsNamespaceList}.
+ */
public static class Basic extends XsNamespaceList {
- private final XsAnyURI targetNamespace;
private final XsAnyURI[] uris;
private final String toStr;
protected Basic(String pValue, XsAnyURI pTargetNamespace) {
- targetNamespace = pTargetNamespace;
toStr = pValue;
- Set set = new HashSet();
+ List list = new ArrayList();
if (pTargetNamespace == null) {
pTargetNamespace = new XsAnyURI("");
}
for (StringTokenizer st = new StringTokenizer(pValue); st.hasMoreTokens(); ) {
- String s = st.nextToken();
+ String s = st.nextToken();
+ final XsAnyURI uri;
if ("##targetNamespace".equals(s)) {
- set.add(pTargetNamespace);
+ uri = pTargetNamespace;
} else if ("##local".equals(pTargetNamespace)) {
- set.add(new XsAnyURI(""));
+ uri = new XsAnyURI("");
} else {
- set.add(new XsAnyURI(s));
+ uri = new XsAnyURI(s);
+ }
+ if (!list.contains(uri)) {
+ list.add(uri);
}
}
- uris = (XsAnyURI[]) set.toArray(new XsAnyURI[set.size()]);
+ uris = (XsAnyURI[]) list.toArray(new XsAnyURI[list.size()]);
}
/** @return false
*/
Modified: webservices/jaxme/branches/MAVEN/status.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/status.xml?view=diff&rev=440093&r1=440092&r2=440093
==============================================================================
--- webservices/jaxme/branches/MAVEN/status.xml (original)
+++ webservices/jaxme/branches/MAVEN/status.xml Mon Sep 4 07:34:44 2006
@@ -70,6 +70,10 @@
<action dev="JW" type="fix" context="generator">
The element jaxb:property/jaxb:baseType/jaxb:javaType wasn't honured.
</action>
+ <action dev="JW" type="fix" context="xs">
+ Eliminated a runtime dependency, which caused the test suite to fail
+ on JRE 1.6.
+ </action>
</release>
<release version="0.5.1" date="Not yet published">
<action dev="JW" type="enhancement" context="js">
Modified: webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java?view=diff&rev=440093&r1=440092&r2=440093
==============================================================================
--- webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java (original)
+++ webservices/jaxme/branches/b0_5/src/xs/org/apache/ws/jaxme/xs/xml/XsNamespaceList.java Mon Sep 4 07:34:44 2006
@@ -16,10 +16,9 @@
*/
package org.apache.ws.jaxme.xs.xml;
+import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
import java.util.StringTokenizer;
@@ -113,28 +112,33 @@
}
}
+ /**
+ * Default implementation of {@link XsNamespaceList}.
+ */
public static class Basic extends XsNamespaceList {
- private final XsAnyURI targetNamespace;
private final XsAnyURI[] uris;
private final String toStr;
protected Basic(String pValue, XsAnyURI pTargetNamespace) {
- targetNamespace = pTargetNamespace;
toStr = pValue;
- Set set = new HashSet();
+ List list = new ArrayList();
if (pTargetNamespace == null) {
pTargetNamespace = new XsAnyURI("");
}
for (StringTokenizer st = new StringTokenizer(pValue); st.hasMoreTokens(); ) {
- String s = st.nextToken();
+ String s = st.nextToken();
+ final XsAnyURI uri;
if ("##targetNamespace".equals(s)) {
- set.add(pTargetNamespace);
+ uri = pTargetNamespace;
} else if ("##local".equals(pTargetNamespace)) {
- set.add(new XsAnyURI(""));
+ uri = new XsAnyURI("");
} else {
- set.add(new XsAnyURI(s));
+ uri = new XsAnyURI(s);
+ }
+ if (!list.contains(uri)) {
+ list.add(uri);
}
}
- uris = (XsAnyURI[]) set.toArray(new XsAnyURI[set.size()]);
+ uris = (XsAnyURI[]) list.toArray(new XsAnyURI[list.size()]);
}
/** @return false
*/
Modified: webservices/jaxme/branches/b0_5/status.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/status.xml?view=diff&rev=440093&r1=440092&r2=440093
==============================================================================
--- webservices/jaxme/branches/b0_5/status.xml (original)
+++ webservices/jaxme/branches/b0_5/status.xml Mon Sep 4 07:34:44 2006
@@ -66,6 +66,10 @@
<action dev="JW" type="fix" context="generator">
The element jaxb:property/jaxb:baseType/jaxb:javaType wasn't honured.
</action>
+ <action dev="JW" type="fix" context="xs">
+ Eliminated a runtime dependency, which caused the test suite to fail
+ on JRE 1.6.
+ </action>
</release>
<release version="0.5.1" date="06-Jan-2006">
<action dev="JW" type="enhancement" context="js">
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org