cvs commit: ws-jaxme status.xml
jochen 2005/08/04 14:33:15
Modified:src/xs/org/apache/ws/jaxme/xs/junit JiraTest.java
src/jaxme/org/apache/ws/jaxme/junit JiraTest.java
src/xs/org/apache/ws/jaxme/xs/impl XSTypeImpl.java
ant js.xml
.status.xml
Added: src/js/org/apache/ws/jaxme/js/junit AntlrTest.java
Removed: src/jaxme/org/apache/ws/jaxme/junit AntlrTest.java
Log:
If a complex type was created by referencing a group, then
the referencing particles maxOccurs and minOccurs values haven't
been inherited.
PR: JAXME-63
Revision ChangesPath
1.5 +34 -0
ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/JiraTest.java
Index: JiraTest.java
===
RCS file:
/home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/JiraTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JiraTest.java 4 Dec 2004 23:22:33 - 1.4
+++ JiraTest.java 4 Aug 2005 21:33:15 - 1.5
@@ -13,6 +13,7 @@
import org.apache.ws.jaxme.xs.XSElement;
import org.apache.ws.jaxme.xs.XSEnumeration;
import org.apache.ws.jaxme.xs.XSParser;
+import org.apache.ws.jaxme.xs.XSParticle;
import org.apache.ws.jaxme.xs.XSSchema;
import org.apache.ws.jaxme.xs.XSSimpleContentType;
import org.apache.ws.jaxme.xs.XSSimpleType;
@@ -170,4 +171,37 @@
assertEquals(XSID.getInstance(), idAttr.getType());
assertFalse(idRef.isOptional());
}
+
+ /** Test for a
href=http://issues.apache.org/jira/browse/JAXME-63;JAXME-63/a.
+ */
+ public void testJAXME63() throws Exception {
+ final String xml =
+ xs:schema\n
+ + xmlns:xs='http://www.w3.org/2001/XMLSchema'\n
+ + elementFormDefault='qualified'\n
+ + xs:group name='params'\n
+ + xs:choice\n
+ + xs:element name='string' type='xs:string'/\n
+ + xs:element name='int' type='xs:int'/\n
+ + xs:element name='boolean'
type='xs:boolean'/\n
+ + /xs:choice\n
+ + /xs:group\n
+ + xs:element name='call'\n
+ + xs:complexType\n
+ + xs:group ref='params'
maxOccurs='unbounded'/\n
+ + /xs:complexType\n
+ + /xs:element\n
+ + /xs:schema;
+XSSchema schema = parse(xml, jaxme63.xsd);
+XSElement[] elements = schema.getElements();
+assertEquals(1, elements.length);
+XSElement call = elements[0];
+assertEquals(new XsQName((String) null, call), call.getName());
+XSComplexType type = assertComplexType(call.getType());
+XSParticle particle = assertComplexContent(type);
+assertTrue(particle.isGroup());
+assertChoice(particle.getGroup());
+assertEquals(1, particle.getMinOccurs());
+assertEquals(-1, particle.getMaxOccurs());
+ }
}
1.10 +35 -1
ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java
Index: JiraTest.java
===
RCS file:
/home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JiraTest.java 30 Jul 2005 21:05:15 - 1.9
+++ JiraTest.java 4 Aug 2005 21:33:15 - 1.10
@@ -26,6 +26,7 @@
import org.apache.ws.jaxme.test.misc.types.impl.RowImpl;
import org.apache.ws.jaxme.test.misc.xsimport.a.Outer;
import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/** Some excerpts from Jira bug reports.
@@ -187,7 +188,6 @@
xml += (char) ('0' + j);
}
xml += '/;
- System.out.println(Parsing + xml);
InputSource isource = new InputSource(new StringReader(xml));
isource.setSystemId(testJAXME62-a- + i + .xsd);
EventDetector ed = new EventDetector();
@@ -196,4 +196,38 @@
u.unmarshal(isource);
assertEquals(pSuccess, ed.isSuccess());
}
+
+ /** Test for a
href=http://issues.apache.org/jira/browse/JAXME-63;JAXME-63/a.
+ */
+ public void testJAXME63() throws Exception {
+ final String xml =
+ xs:schema\n
+ + xmlns:xs='http://www.w3.org/2001/XMLSchema'\n
+ + elementFormDefault='qualified'\n
+ + xs:group name='params'\n
+ + xs:choice\n
+ + xs:element name='string'
cvs commit: ws-jaxme status.xml
jochen 2005/07/30 14:11:50 Modified:.Tag: v0_4 status.xml Log: An IllegalStateException was thrown, if a facet violation was detected in the Unmarshaller. This is now changed to a proper ValidationEvent. PR: JAXME-62 Revision ChangesPath No revision No revision 1.45.2.19 +7 -1 ws-jaxme/status.xml Index: status.xml === RCS file: /home/cvs/ws-jaxme/status.xml,v retrieving revision 1.45.2.18 retrieving revision 1.45.2.19 diff -u -r1.45.2.18 -r1.45.2.19 --- status.xml27 Jul 2005 19:45:56 - 1.45.2.18 +++ status.xml30 Jul 2005 21:11:50 - 1.45.2.19 @@ -64,11 +64,17 @@ A sequence was always treated as a required group, even if all particles were optional. /action - action dev=JW type=fix content=js + action dev=JW type=fix context=js The method JavaSource.newBeanProperty() was mismatching void and boolean when checking for isFoo vs. getFoo. (Frederic Ahring, fahring at de.ibm.com) /action + action dev=JW type=fix context=generator +A facet violation detected by the Unmarshaller was exposed +as an IllegalArgumentException. The IllegalArgumentException +is now trapped and converted to a proper ValidationEvent. +(JAXME-62) + /action /release release version=0.4 date=2005-May-19 action dev=JW type=fix context=xs - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/07/30 14:12:00 Modified:.Tag: JAXME-28 status.xml Log: An IllegalStateException was thrown, if a facet violation was detected in the Unmarshaller. This is now changed to a proper ValidationEvent. PR: JAXME-62 Revision ChangesPath No revision No revision 1.61.2.5 +7 -1 ws-jaxme/status.xml Index: status.xml === RCS file: /home/cvs/ws-jaxme/status.xml,v retrieving revision 1.61.2.4 retrieving revision 1.61.2.5 diff -u -r1.61.2.4 -r1.61.2.5 --- status.xml27 Jul 2005 19:46:11 - 1.61.2.4 +++ status.xml30 Jul 2005 21:12:00 - 1.61.2.5 @@ -45,7 +45,7 @@ even if all particles were optional. (Frederic Ahring, fahring at de.ibm.com) /action - action dev=JW type=fix content=js + action dev=JW type=fix context=js The method JavaSource.newBeanProperty() was mismatching void and boolean when checking for isFoo vs. getFoo. (Frederic Ahring, fahring at de.ibm.com) @@ -75,6 +75,12 @@ Fixed a ClassCastException, which appeared for unknown reasons. /action + action dev=JW type=fix context=generator +A facet violation detected by the Unmarshaller was exposed +as an IllegalArgumentException. The IllegalArgumentException +is now trapped and converted to a proper ValidationEvent. +(JAXME-62) + /action /release release version=0.4 date=2005-May-19 action dev=JW type=fix context=xs - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/07/30 14:12:10 Modified:.status.xml Log: An IllegalStateException was thrown, if a facet violation was detected in the Unmarshaller. This is now changed to a proper ValidationEvent. PR: JAXME-62 Revision ChangesPath 1.68 +9 -3 ws-jaxme/status.xml Index: status.xml === RCS file: /home/cvs/ws-jaxme/status.xml,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- status.xml28 Jul 2005 19:47:57 - 1.67 +++ status.xml30 Jul 2005 21:12:10 - 1.68 @@ -44,20 +44,26 @@ A sequence was always treated as a required group, even if all particles were optional. /action - action dev=JW type=fix content=generator + action dev=JW type=fix context=generator Added a unit test for mixed content handling. Fixed the handling of complex child elements in mixed content types. /action - action dev=JW type=fix content=js + action dev=JW type=fix context=js The method JavaSource.newBeanProperty() was mismatching void and boolean when checking for isFoo vs. getFoo. (Frederic Ahring, fahring at de.ibm.com) /action - action dev=JW type=fix content=js + action dev=JW type=fix context=js Got rid of JavaQNameImpl.getInstance(String, boolean). (Frederic Ahring, fahring at de.ibm.com) /action + action dev=JW type=fix context=generator +A facet violation detected by the Unmarshaller was exposed +as an IllegalArgumentException. The IllegalArgumentException +is now trapped and converted to a proper ValidationEvent. +(JAXME-62) + /action /release release version=0.5beta date=2005-Jul-13 action dev=JW type=enhancement context=generator - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/07/27 12:46:12
Modified:src/js/org/apache/ws/jaxme/js Tag: JAXME-28 JavaSource.java
.Tag: JAXME-28 status.xml
Log:
The method JavaSource.newBeanProperty() was mismatching
void and boolean when checking for isFoo vs. getFoo.
Submitted by: Frederic Ahring, fahring at de.ibm.com
Revision ChangesPath
No revision
No revision
1.10.2.2 +5 -3 ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaSource.java
Index: JavaSource.java
===
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaSource.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- JavaSource.java 19 Jul 2005 19:35:44 - 1.10.2.1
+++ JavaSource.java 27 Jul 2005 19:46:11 - 1.10.2.2
@@ -35,7 +35,8 @@
/** Specifies the type of a java class (interface, or class).
*/
public static class Type implements Serializable {
- private String name;
+ private static final long serialVersionUID =
-9130708752353639211L;
+ private String name;
Type(String pName) {
name = pName;
}
@@ -57,7 +58,8 @@
* protected, or private).
*/
public static class Protection implements Serializable {
- private String name;
+ private static final long serialVersionUID =
1184782160268911467L;
+ private String name;
Protection(String pName) {
name = pName;
}
@@ -1242,7 +1244,7 @@
*/
public void newBeanProperty(JavaQName pType, String pName) {
String upperCaseName = Character.toUpperCase(pName.charAt(0)) +
pName.substring(1);
- if (JavaQNameImpl.VOID.equals(pType)) {
+ if (JavaQNameImpl.BOOLEAN.equals(pType)) {
newBeanProperty(pType, pName, is + upperCaseName, set +
upperCaseName);
} else {
newBeanProperty(pType, pName, get + upperCaseName, set +
upperCaseName);
No revision
No revision
1.61.2.4 +16 -10ws-jaxme/status.xml
Index: status.xml
===
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.61.2.3
retrieving revision 1.61.2.4
diff -u -r1.61.2.3 -r1.61.2.4
--- status.xml19 Jul 2005 21:03:16 - 1.61.2.3
+++ status.xml27 Jul 2005 19:46:11 - 1.61.2.4
@@ -33,16 +33,22 @@
release version=0.5 date=Not yet published
action dev=JW type=enhancement context=js
Added JavaSource.getConstructor(JavaQName[]).
- (Frederic Ahring, [EMAIL PROTECTED])
+ (Frederic Ahring, fahring at de.ibm.com)
/action
action dev=JW type=fix context=js
The method JavaSource.addThrows() does now verify,
whether an exception is already declared.
- (Frederic Ahring, [EMAIL PROTECTED])
+ (Frederic Ahring, fahring at de.ibm.com)
/action
action dev=JW type=fix context=generator
A sequence was always treated as a required group,
even if all particles were optional.
+ (Frederic Ahring, fahring at de.ibm.com)
+ /action
+ action dev=JW type=fix content=js
+The method JavaSource.newBeanProperty() was mismatching
+void and boolean when checking for isFoo vs. getFoo.
+ (Frederic Ahring, fahring at de.ibm.com)
/action
/release
release version=0.5beta date=2005-Jul-13
@@ -285,7 +291,7 @@
/action
action dev=JW type=fix context=generator
Typesafe enumerations had wrong code in some cases.
- (Peter Nagy, lt;[EMAIL PROTECTED]gt;)
+ (Peter Nagy, lt;peter.1.nagy at nokia.comgt;)
/action
action dev=JW type=fix context=generator
Attention, incompatible change: The types xs:dateTime, xs:date,
and
@@ -300,12 +306,12 @@
/action
action dev=JW type=fix context=generator
Fixed a bug in the JAXBSchemaSG's handling of global simple
types.
- (Chris Kirk lt;[EMAIL PROTECTED]gt;)
+ (Chris Kirk lt;mrck1996 at yahoo.co.ukgt;)
/action
action dev=JW type=fix context=generator
The object factory has not been able to generate global types.
Local types are still missing, though.
- (Colin Bendell lt;[EMAIL PROTECTED]gt;)
+ (Colin Bendell lt;cbendell at point2.comgt;)
/action
action dev=CL type=fix context=generator
Fixed a bug in the QNameSG's mis-overriding getCastToString
method.
@@ -314,26 +320,26 @@
/action
action
cvs commit: ws-jaxme status.xml
jochen 2005/07/19 12:35:45
Modified:src/js/org/apache/ws/jaxme/js Tag: JAXME-28 JavaSource.java
.Tag: JAXME-28 status.xml
Log:
Added JavaSource.getConstructor(JavaQName[]).
Submitted by: Frederic Ahring, [EMAIL PROTECTED]
Revision ChangesPath
No revision
No revision
1.10.2.1 +34 -14ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaSource.java
Index: JavaSource.java
===
RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/JavaSource.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- JavaSource.java 18 May 2005 22:09:10 - 1.10
+++ JavaSource.java 19 Jul 2005 19:35:44 - 1.10.2.1
@@ -419,7 +419,20 @@
}
return (JavaMethod[]) result.toArray(new JavaMethod[result.size()]);
}
-
+
+private boolean isMatching(Parameter[] parameters, JavaQName[] pParams) {
+ if (parameters.length == pParams.length) {
+ for (int i = 0; i parameters.length; i++) {
+ if
(!parameters[i].getType().equals(pParams[i])) {
+ return false;
+ }
+ }
+ return true;
+ } else {
+ return false;
+ }
+}
+
/** Returns the method with the given signature or null, if there
* is no such method.
*/
@@ -429,25 +442,32 @@
if (object instanceof JavaMethod) {
JavaMethod jm = (JavaMethod) object;
if (jm.getName().equals(pMethodName)) {
- Parameter[] parameters = jm.getParams();
- if (parameters.length == pParams.length) {
- boolean equals = true;
- for (int i = 0; i parameters.length;
i++) {
- if
(!parameters[i].getType().equals(pParams[i])) {
- equals = false;
- break;
- }
- }
- if (equals) {
- return jm;
- }
+ if (isMatching(jm.getParams(), pParams)) {
+ return jm;
}
}
}
}
return null;
}
-
+
+/** Returns the constructor with the given signature or null, if there
+ * is no such constructor.
+ */
+public JavaConstructor getConstructor(JavaQName[] pParams) {
+for (Iterator iter = myObjects.iterator(); iter.hasNext(); ) {
+ConditionalIndentationJavaSourceObject object =
+ (ConditionalIndentationJavaSourceObject) iter.next();
+if (object instanceof JavaConstructor) {
+JavaConstructor jc = (JavaConstructor) object;
+if (isMatching(jc.getParams(), pParams)) {
+ return jc;
+}
+}
+}
+return null;
+}
+
private class MyObjectIterator implements Iterator {
private final Class instanceClass;
MyObjectIterator(Class pInstanceClass) {
No revision
No revision
1.61.2.1 +5 -1 ws-jaxme/status.xml
Index: status.xml
===
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.61
retrieving revision 1.61.2.1
diff -u -r1.61 -r1.61.2.1
--- status.xml13 Jul 2005 19:23:20 - 1.61
+++ status.xml19 Jul 2005 19:35:44 - 1.61.2.1
@@ -44,7 +44,7 @@
/action
action dev=JW type=fix context=js
The JavaParser didn't handle multidimensional arrays
-properly. (Frederic Ahring, [EMAIL PROTECTED])
+properly. (Frederic Ahring, fahring at de.ibm.com)
/action
action dev=JW type=fix context=generator
Fixed that the generator didn't detect top level groups with
@@ -54,6 +54,10 @@
Fixed a ClassCastException, which appeared for unknown
reasons.
/action
+ action dev=JW type=enhancement context=js
+Added JavaSource.getConstructor(JavaQName[]).
+ (Frederic Ahring, fahring at de.ibm.com)
+ /action
/release
release version=0.4 date=2005-May-19
action dev=JW type=fix context=xs
cvs commit: ws-jaxme status.xml
jochen 2005/07/19 14:02:00 Modified:.status.xml Log: A sequence was always treated as required, even if all particles were optional. Revision ChangesPath 1.64 +4 -0 ws-jaxme/status.xml Index: status.xml === RCS file: /home/cvs/ws-jaxme/status.xml,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- status.xml19 Jul 2005 19:54:32 - 1.63 +++ status.xml19 Jul 2005 21:01:59 - 1.64 @@ -40,6 +40,10 @@ whether an exception is already declared. (Frederic Ahring, [EMAIL PROTECTED]) /action + action dev=JW type=fix context=generator + A sequence was always treated as a required group, + even if all particles were optional. + /action /release release version=0.5beta date=2005-Jul-13 action dev=JW type=enhancement context=generator - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/07/19 14:02:47
Modified:src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ccsg Tag:
v0_4 GroupHandlerSG.java
.Tag: v0_4 status.xml
Log:
A sequence was always treated as required, even if all particles were
optional.
Revision ChangesPath
No revision
No revision
1.4.2.3 +16 -2
ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ccsg/GroupHandlerSG.java
Index: GroupHandlerSG.java
===
RCS file:
/home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ccsg/GroupHandlerSG.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- GroupHandlerSG.java 8 Jul 2005 20:44:34 - 1.4.2.2
+++ GroupHandlerSG.java 19 Jul 2005 21:02:47 - 1.4.2.3
@@ -150,8 +150,22 @@
}
}
- protected boolean isRequiredParticle(ParticleSG particleSG) {
- return particleSG.getMinOccurs() 0;
+ protected boolean isRequiredParticle(ParticleSG particleSG) throws
SAXException {
+ if (particleSG.getMinOccurs() == 0) {
+ return false;
+ } else {
+ if (particleSG.isGroup()) {
+ ParticleSG[] particles =
particleSG.getGroupSG().getParticles();
+ for (int i = 0; i particles.length; i++) {
+ if (isRequiredParticle(particles[i])) {
+ return true;
+ }
+ }
+ return false;
+ } else {
+ return true;
+ }
+ }
}
protected void handleStartOfChildElement(Object pUnmarshallerHandler,
No revision
No revision
1.45.2.17 +4 -0 ws-jaxme/status.xml
Index: status.xml
===
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.45.2.16
retrieving revision 1.45.2.17
diff -u -r1.45.2.16 -r1.45.2.17
--- status.xml19 Jul 2005 19:55:02 - 1.45.2.16
+++ status.xml19 Jul 2005 21:02:47 - 1.45.2.17
@@ -60,6 +60,10 @@
whether an exception is already declared.
(Frederic Ahring, [EMAIL PROTECTED])
/action
+ action dev=JW type=fix context=generator
+ A sequence was always treated as a required group,
+ even if all particles were optional.
+ /action
/release
release version=0.4 date=2005-May-19
action dev=JW type=fix context=xs
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/07/19 14:03:17 Modified:.Tag: JAXME-28 status.xml Log: A sequence was always treated as required, even if all particles were optional. Revision ChangesPath No revision No revision 1.61.2.3 +4 -0 ws-jaxme/status.xml Index: status.xml === RCS file: /home/cvs/ws-jaxme/status.xml,v retrieving revision 1.61.2.2 retrieving revision 1.61.2.3 diff -u -r1.61.2.2 -r1.61.2.3 --- status.xml19 Jul 2005 19:55:32 - 1.61.2.2 +++ status.xml19 Jul 2005 21:03:16 - 1.61.2.3 @@ -40,6 +40,10 @@ whether an exception is already declared. (Frederic Ahring, [EMAIL PROTECTED]) /action + action dev=JW type=fix context=generator + A sequence was always treated as a required group, + even if all particles were optional. + /action /release release version=0.5beta date=2005-Jul-13 action dev=JW type=enhancement context=generator - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/07/08 07:45:17
Modified:src/js/org/apache/ws/jaxme/js/util Tag: v0_4 JavaParser.java
.Tag: v0_4 status.xml
Log:
The JavaParser didn't handle multidimensional arrays properly.
Submitted by: [EMAIL PROTECTED]
Revision ChangesPath
No revision
No revision
1.7.2.1 +4 -0
ws-jaxme/src/js/org/apache/ws/jaxme/js/util/JavaParser.java
Index: JavaParser.java
===
RCS file:
/home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/js/util/JavaParser.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- JavaParser.java 9 Sep 2004 00:41:46 - 1.7
+++ JavaParser.java 8 Jul 2005 14:45:17 - 1.7.2.1
@@ -168,6 +168,10 @@
break;
case JavaTokenTypes.ARRAY_DECLARATOR:
sb.append([]);
+for (AST child = pAST.getFirstChild(); child != null;
+ child = child.getNextSibling()) {
+ parseIdentifier(child, sb);
+}
break;
default:
throw new IllegalStateException(Unknown token: +
pAST.getType());
No revision
No revision
1.45.2.12 +4 -0 ws-jaxme/status.xml
Index: status.xml
===
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.45.2.11
retrieving revision 1.45.2.12
diff -u -r1.45.2.11 -r1.45.2.12
--- status.xml5 Jul 2005 08:03:42 - 1.45.2.11
+++ status.xml8 Jul 2005 14:45:17 - 1.45.2.12
@@ -39,6 +39,10 @@
Fixed that the handler and driver classes could not
be compiled, if enumerations had default values.
/action
+ action dev=JW type=fix context=js
+The JavaParser didn't handle multidimensional arrays
+properly. (Frederic Ahring, [EMAIL PROTECTED])
+ /action
/release
release version=0.4 date=2005-May-19
action dev=JW type=fix context=xs
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/07/04 17:01:08 Modified:.Tag: v0_4 status.xml Log: Use of xs:extension is now mapped to proper Java inheritance (at least for the bean classes.) Revision ChangesPath No revision No revision 1.45.2.10 +6 -0 ws-jaxme/status.xml Index: status.xml === RCS file: /home/cvs/ws-jaxme/status.xml,v retrieving revision 1.45.2.9 retrieving revision 1.45.2.10 diff -u -r1.45.2.9 -r1.45.2.10 --- status.xml20 May 2005 06:58:59 - 1.45.2.9 +++ status.xml5 Jul 2005 00:01:08 - 1.45.2.10 @@ -30,6 +30,12 @@ /todo changes +release version=0.4.1 date=Not yet released + action dev=JW type=enhancement context=generator +Use of xs:extension is now mapped to proper Java +inheritance (at least for the bean classes). + /action +/release release version=0.4 date=2005-May-19 action dev=JW type=fix context=xs The methods XSSimpleContentImpl.isEmpty(), - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml build.xml
jochen 2005/05/19 23:58:59 Modified:src/xs/org/apache/ws/jaxme/xs/junit Tag: v0_4 ParserTest.java src/documentation/content/xdocs Tag: v0_4 news.xml site.xml .Tag: v0_4 status.xml build.xml Log: Prepared 0.4 final. Revision ChangesPath No revision No revision 1.20.2.4 +6 -0 ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java Index: ParserTest.java === RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java,v retrieving revision 1.20.2.3 retrieving revision 1.20.2.4 diff -u -r1.20.2.3 -r1.20.2.4 --- ParserTest.java 18 May 2005 22:20:56 - 1.20.2.3 +++ ParserTest.java 20 May 2005 06:58:59 - 1.20.2.4 @@ -333,6 +333,12 @@ isource.setSystemId(testElements.xsd); XSSchema schema = pParser.parse(isource); +XSAttribute[] attrs = schema.getAttributes(); +assertEquals(1, attrs.length); +XSAttribute id = attrs[0]; +assertEquals(new XsQName((String) null, id), id.getName()); +assertEquals(XSID.getInstance(), id.getType()); + XSObject[] elements = schema.getElements(); assertEquals(4, elements.length); No revision No revision 1.8.2.1 +3 -0 ws-jaxme/src/documentation/content/xdocs/news.xml Index: news.xml === RCS file: /home/cvs/ws-jaxme/src/documentation/content/xdocs/news.xml,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- news.xml 12 Apr 2005 08:17:18 - 1.8 +++ news.xml 20 May 2005 06:58:59 - 1.8.2.1 @@ -23,6 +23,9 @@ /header body dl + dt2005-May-19: JaxMe 0.4 Released/dt + ddCompared to the beta version, no new features have been introduced. +A few bugs have been fixed, mainly concerning the nested group support./dd dt2005-Apr-12: JaxMe 0.4beta Released/dt ddThis release introduces support for nested groups with multiplicity lt;= 1. In particular, xs:extension is supported now./dd 1.23.2.1 +4 -4 ws-jaxme/src/documentation/content/xdocs/site.xml Index: site.xml === RCS file: /home/cvs/ws-jaxme/src/documentation/content/xdocs/site.xml,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -r1.23 -r1.23.2.1 --- site.xml 12 Apr 2005 09:58:40 - 1.23 +++ site.xml 20 May 2005 06:58:59 - 1.23.2.1 @@ -43,11 +43,11 @@ /about docs label=Documentation -!-- build.online.site=false +!-- build.online.site=false -- manual label=Manual href=manual/index.html/ javadoc label=Javadocs href=apidocs/index.html/ --- -!-- build.online.site=true -- +!-- build.online.site -- +!-- build.online.site=true manual label=Manual manual label=Current href=manual/index.html/ manual label=0.3 href=release-0.3/manual/index.html/ @@ -56,7 +56,7 @@ javadoc label=Current href=apidocs/index.html/ javadoc label=0.3 href=release-0.3/apidocs/index.html/ /javadoc -!-- build.online.site -- +-- /docs developers label=Developer Resources No revision No revision 1.45.2.9 +1 -1 ws-jaxme/status.xml Index: status.xml === RCS file: /home/cvs/ws-jaxme/status.xml,v retrieving revision 1.45.2.8 retrieving revision 1.45.2.9 diff -u -r1.45.2.8 -r1.45.2.9 --- status.xml19 May 2005 20:30:52 - 1.45.2.8 +++ status.xml20 May 2005 06:58:59 - 1.45.2.9 @@ -30,7 +30,7 @@ /todo changes -release version=0.4 date=Not yet published +release version=0.4 date=2005-May-19 action dev=JW type=fix context=xs The methods XSSimpleContentImpl.isEmpty(), XSSimpleContentImpl.isMixed(), and 1.25.2.1 +1 -1 ws-jaxme/build.xml Index: build.xml === RCS file: /home/cvs/ws-jaxme/build.xml,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -u -r1.25 -r1.25.2.1 --- build.xml 12 Apr 2005 09:58:40 - 1.25 +++ build.xml 20 May 2005 06:58:59 - 1.25.2.1 @@ -14,7 +14,7 @@ * limitations under the License. -- project name=JaxMe default=all -property name=version value=0.4beta/ +property name=version value=0.5-dev/ property name=debug value=true/ property name=optimize value=false/ -
Re: cvs commit: ws-jaxme status.xml build.xml
[EMAIL PROTECTED] wrote: Prepared 0.4 final. I have made Richard's changes in xjctask.xml. However, I am hesitating to check in because I am not sure if you are in the process of building. Should I just commit it to HEAD? regards, nacho PD: I think the best way to avoid this is to actually point to the javadoc for XJCTask which contains the up-to-date documentation. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ws-jaxme status.xml build.xml
On 5/20/05, Nacho G. Mac Dowell [EMAIL PROTECTED] wrote: I have made Richard's changes in xjctask.xml. However, I am hesitating to check in because I am not sure if you are in the process of building. Should I just commit it to HEAD? 0.4 is out, so feel free to commit in 0.4 as well. (Documentation changes aren't so much of a problem, btw.) Thanks for doing this! PD: I think the best way to avoid this is to actually point to the javadoc for XJCTask which contains the up-to-date documentation. Basically agreed. But then, that wouldn't meet the purpose of a manual, wouldn't it? Jochen -- Outside of a dog, a book is man's best friend. Inside of a dog, its too dark to read. (Groucho Marx) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/04/20 12:30:04
Modified:src/jaxme/org/apache/ws/jaxme/generator/sg/impl Tag: v0_4
JAXBTypeSG.java
.Tag: v0_4 status.xml
Log:
Enabled support for xs:entity.
Revision ChangesPath
No revision
No revision
1.13.2.1 +4 -5
ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBTypeSG.java
Index: JAXBTypeSG.java
===
RCS file:
/home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBTypeSG.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- JAXBTypeSG.java 4 Mar 2005 10:41:52 - 1.13
+++ JAXBTypeSG.java 20 Apr 2005 19:30:04 - 1.13.2.1
@@ -464,15 +464,13 @@
return null;
}
XsQName myName = pType.getName();
-if (myName.equals(XSEntity.getInstance().getName()) ||
-myName.equals(XSNotation.getInstance().getName())||
+if (myName.equals(XSNotation.getInstance().getName())||
myName.equals(XSGYearMonth.getInstance().getName()) ||
myName.equals(XSGYear.getInstance().getName()) ||
myName.equals(XSGMonthDay.getInstance().getName()) ||
myName.equals(XSGMonth.getInstance().getName()) ||
myName.equals(XSGDay.getInstance().getName())) {
- throw new SAXParseException(The type + myName + is not
supported.,
- pType.getLocator());
+ throw new SAXException(The type + myName + is not supported.);
} else if (myName.equals(XSIDREF.getInstance().getName())) {
return new IDREFSG(pFactory, pSchema, pType);
} else if (myName.equals(XSID.getInstance().getName())) {
@@ -527,7 +525,8 @@
myName.equals(XSLanguage.getInstance().getName()) ||
myName.equals(XSName.getInstance().getName()) ||
myName.equals(XSNMToken.getInstance().getName()) ||
-myName.equals(XSNCName.getInstance().getName())) {
+myName.equals(XSNCName.getInstance().getName())||
+myName.equals(XSEntity.getInstance().getName())) {
return new StringSG(pFactory, pSchema, pType);
} else {
return null;
No revision
No revision
1.45.2.2 +3 -0 ws-jaxme/status.xml
Index: status.xml
===
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -u -r1.45.2.1 -r1.45.2.2
--- status.xml19 Apr 2005 20:11:04 - 1.45.2.1
+++ status.xml20 Apr 2005 19:30:04 - 1.45.2.2
@@ -30,6 +30,9 @@
changes
release version=0.4 date=Not yet published
+ action dev=JW type=enhancement context=generator
+Enabled support for xs:entity.
+ /action
action dev=JW type=fix context=generator
Fixed that the object factory methods didn't work for
inner classes.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/04/20 12:30:15
Modified:src/jaxme/org/apache/ws/jaxme/generator/sg/impl
JAXBTypeSG.java
.status.xml
Log:
Enabled support for xs:entity.
Revision ChangesPath
1.14 +4 -5
ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBTypeSG.java
Index: JAXBTypeSG.java
===
RCS file:
/home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBTypeSG.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JAXBTypeSG.java 4 Mar 2005 10:41:52 - 1.13
+++ JAXBTypeSG.java 20 Apr 2005 19:30:15 - 1.14
@@ -464,15 +464,13 @@
return null;
}
XsQName myName = pType.getName();
-if (myName.equals(XSEntity.getInstance().getName()) ||
-myName.equals(XSNotation.getInstance().getName())||
+if (myName.equals(XSNotation.getInstance().getName())||
myName.equals(XSGYearMonth.getInstance().getName()) ||
myName.equals(XSGYear.getInstance().getName()) ||
myName.equals(XSGMonthDay.getInstance().getName()) ||
myName.equals(XSGMonth.getInstance().getName()) ||
myName.equals(XSGDay.getInstance().getName())) {
- throw new SAXParseException(The type + myName + is not
supported.,
- pType.getLocator());
+ throw new SAXException(The type + myName + is not supported.);
} else if (myName.equals(XSIDREF.getInstance().getName())) {
return new IDREFSG(pFactory, pSchema, pType);
} else if (myName.equals(XSID.getInstance().getName())) {
@@ -527,7 +525,8 @@
myName.equals(XSLanguage.getInstance().getName()) ||
myName.equals(XSName.getInstance().getName()) ||
myName.equals(XSNMToken.getInstance().getName()) ||
-myName.equals(XSNCName.getInstance().getName())) {
+myName.equals(XSNCName.getInstance().getName())||
+myName.equals(XSEntity.getInstance().getName())) {
return new StringSG(pFactory, pSchema, pType);
} else {
return null;
1.47 +3 -0 ws-jaxme/status.xml
Index: status.xml
===
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- status.xml19 Apr 2005 20:11:14 - 1.46
+++ status.xml20 Apr 2005 19:30:15 - 1.47
@@ -31,6 +31,9 @@
changes
release version=0.4 date=Not yet published
+ action dev=JW type=enhancement context=generator
+Enabled support for xs:entity.
+ /action
action dev=JW type=fix context=generator
Fixed that the object factory methods didn't work for
inner classes.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ws-jaxme status.xml
jochen 2005/04/07 13:28:47 Modified:.status.xml Log: Revision ChangesPath 1.42 +7 -0 ws-jaxme/status.xml Index: status.xml === RCS file: /home/cvs/ws-jaxme/status.xml,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- status.xml17 Jan 2005 21:30:19 - 1.41 +++ status.xml7 Apr 2005 20:28:47 - 1.42 @@ -30,6 +30,13 @@ changes release version=0.4-dev date=unreleased + action dev=JW type=fix context=generator +Fixed that invalid code was generated for xs:integer in +combination with xs:totalDigits. (Doru Sular, dorus at savatech.ro) + /action + action dev=jw type=enhancement +Added support for nested groups with multiplicity = 1. + /action action dev=JW type=fix context=runtime For compatibility reasons with the JAXB RI, an XML declaration is now generated by default. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
