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 2004/07/23 09:00:33 UTC
cvs commit: ws-jaxme status.xml
jochen 2004/07/23 00:00:33
Modified: src/test/jaxb Tag: Branch_R0_3 types.xsd
src/jaxme/org/apache/ws/jaxme/junit Tag: Branch_R0_3
MarshallerTest.java
src/jaxme/org/apache/ws/jaxme/impl Tag: Branch_R0_3
JMHandlerImpl.java
. Tag: Branch_R0_3 status.xml
Added: src/jaxme/org/apache/ws/jaxme Tag: Branch_R0_3
XMLConstants.java
Log:
Attributes in the xml namespace, the xmlns namespace, and the xsi namespace are now by default ignored.
PR: JAXME-17
Revision Changes Path
No revision
No revision
1.1.2.1 +0 -0 ws-jaxme/src/jaxme/org/apache/ws/jaxme/XMLConstants.java
Index: XMLConstants.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/XMLConstants.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.4.2.2 +2 -0 ws-jaxme/src/test/jaxb/types.xsd
Index: types.xsd
===================================================================
RCS file: /home/cvs/ws-jaxme/src/test/jaxb/types.xsd,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- types.xsd 27 Jun 2004 21:51:01 -0000 1.4.2.1
+++ types.xsd 23 Jul 2004 07:00:33 -0000 1.4.2.2
@@ -49,6 +49,7 @@
<xs:element name="NonPositiveIntegerElem" type="xs:nonPositiveInteger"/>
<xs:element name="NegativeIntegerElem" type="xs:negativeInteger"/>
<xs:element name="QNameElem" type="xs:QName"/>
+ <xs:element name="BooleanElem" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
@@ -77,6 +78,7 @@
<xs:attribute name="NonPositiveIntegerAttr" type="xs:nonPositiveInteger"/>
<xs:attribute name="NegativeIntegerAttr" type="xs:negativeInteger"/>
<xs:attribute name="QNameAttr" type="xs:QName"/>
+ <xs:attribute name="BooleanAttr" type="xs:boolean"/>
</xs:complexType>
<xs:simpleType name="ListType">
No revision
No revision
1.9.2.1 +19 -5 ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java
Index: MarshallerTest.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/MarshallerTest.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- MarshallerTest.java 16 Feb 2004 23:39:54 -0000 1.9
+++ MarshallerTest.java 23 Jul 2004 07:00:33 -0000 1.9.2.1
@@ -36,6 +36,7 @@
import org.apache.ws.jaxme.JMMarshaller;
import org.apache.ws.jaxme.JMUnmarshaller;
import org.apache.ws.jaxme.JMXmlSerializer;
+import org.apache.ws.jaxme.XMLConstants;
import org.apache.ws.jaxme.XMLWriter;
import org.apache.ws.jaxme.impl.JAXBContextImpl;
import org.apache.ws.jaxme.impl.JMMarshallerImpl;
@@ -137,6 +138,7 @@
element.setNonPositiveIntegerElem(new BigInteger("-21714"));
element.setNegativeIntegerElem(new BigInteger("-21714"));
element.setQNameElem(new QName("http://ws.apache.org/jaxme/test/misc/types", "ias"));
+ element.setBooleanElem(true);
return element;
}
@@ -177,14 +179,18 @@
"<ex:NonPositiveIntegerElem>-21714</ex:NonPositiveIntegerElem>" +
"<ex:NegativeIntegerElem>-21714</ex:NegativeIntegerElem>" +
"<ex:QNameElem>ex:ias</ex:QNameElem>" +
+ "<ex:BooleanElem>true</ex:BooleanElem>" +
"</ex:AllSimpleTypesElement>";
}
- public String getAllTypesElementString() {
+ private String getAllTypesElementString(boolean pSchemaDeclaration) {
AllTypesElementImpl elem = new AllTypesElementImpl();
String uri = elem.getQName().getNamespaceURI();
+ String xsi = pSchemaDeclaration ? " xmlns:xsi=\""
+ + XMLConstants.XML_SCHEMA_URI + "\" xsi:"
+ + XMLConstants.XML_SCHEMA_NS_ATTR + "=\"foo.xsd\"" : "";
return
- "<ex:AllTypesElement xmlns:ex=\"" + uri + "\">\n" +
+ "<ex:AllTypesElement xmlns:ex=\"" + uri + "\"" + xsi + ">\n" +
" <ex:AllSimpleTypesElement>\n" +
" <ex:StringElem>This is a string with german Umlauts: äöüßÄÖÜ</ex:StringElem>\n" +
" <ex:IntElem>-2139879</ex:IntElem>\n" +
@@ -207,6 +213,7 @@
" <ex:NonPositiveIntegerElem>-21714</ex:NonPositiveIntegerElem>\n" +
" <ex:NegativeIntegerElem>-21714</ex:NegativeIntegerElem>\n" +
" <ex:QNameElem>ex:ias</ex:QNameElem>\n" +
+ " <ex:BooleanElem>true</ex:BooleanElem>\n" +
" </ex:AllSimpleTypesElement>\n" +
" <ex:ListTypeElement>7 -3 0</ex:ListTypeElement>\n" +
" <ex:UnionTypeElement>2002-11-22T16:43:37Z</ex:UnionTypeElement>\n" +
@@ -239,6 +246,7 @@
assertEquals(getHexBytes(), pElement.getHexBinaryElem());
assertEquals(getHexBytes(), pElement.getBase64BinaryElem());
assertEquals(new BigInteger("101"), pElement.getNonNegativeIntegerElem());
+ assertTrue(pElement.isBooleanElem());
}
public void verifyAllTypesElement(AllTypesElement pElement) {
@@ -268,9 +276,15 @@
}
public void testUnmarshalComplexElements() throws Exception {
+ testUnmarshalComplexElements(false);
+ testUnmarshalComplexElements(true);
+ }
+
+ private void testUnmarshalComplexElements(boolean pSchemaLocation)
+ throws Exception {
JAXBContext myFactory = getFactory();
Unmarshaller unmarshaller = myFactory.createUnmarshaller();
- StringReader sr = new StringReader(getAllTypesElementString());
+ StringReader sr = new StringReader(getAllTypesElementString(pSchemaLocation));
AllTypesElement result = (AllTypesElement) unmarshaller.unmarshal(new InputSource(sr));
verifyAllTypesElement(result);
}
@@ -294,7 +308,7 @@
Class c = marshaller.getXMLWriterClass();
XMLWriter w = (XMLWriter) c.newInstance();
w.init(marshaller);
- String rawInput = getAllTypesElementString();
+ String rawInput = getAllTypesElementString(false);
StringBuffer input = new StringBuffer();
for (int i = 0; i < rawInput.length(); i++) {
char ch = rawInput.charAt(i);
No revision
No revision
1.5.2.1 +12 -5 ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMHandlerImpl.java
Index: JMHandlerImpl.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/impl/JMHandlerImpl.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- JMHandlerImpl.java 12 Apr 2004 15:09:18 -0000 1.5
+++ JMHandlerImpl.java 23 Jul 2004 07:00:33 -0000 1.5.2.1
@@ -19,6 +19,7 @@
import javax.xml.bind.ValidationEvent;
import org.apache.ws.jaxme.ValidationEvents;
+import org.apache.ws.jaxme.XMLConstants;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -46,10 +47,16 @@
public void addAttribute(String pNamespaceURI, String pLocalName,
String pValue) throws SAXException {
- validationEvent(ValidationEvent.ERROR,
- "Unknown attribute: '" + pLocalName + "' in namespace '" +
- pNamespaceURI + "'",
- ValidationEvents.EVENT_UNKNOWN_ATTRIBUTE);
+ if (javax.xml.XMLConstants.XML_NS_URI.equals(pNamespaceURI)
+ || javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(pNamespaceURI)
+ || XMLConstants.XML_SCHEMA_URI.equals(pNamespaceURI)) {
+ // Ignore attributes in the xsi namespace
+ } else {
+ validationEvent(ValidationEvent.ERROR,
+ "Unknown attribute: '" + pLocalName
+ + "' in namespace '" + pNamespaceURI + "'",
+ ValidationEvents.EVENT_UNKNOWN_ATTRIBUTE);
+ }
}
public void startElement(String pNamespaceURI, String pLocalName,
No revision
No revision
1.15.2.2 +15 -1 ws-jaxme/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/ws-jaxme/status.xml,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- status.xml 27 Jun 2004 19:16:37 -0000 1.15.2.1
+++ status.xml 23 Jul 2004 07:00:33 -0000 1.15.2.2
@@ -29,7 +29,21 @@
</todo>
<changes>
- <release version="0.3-dev" date="unreleased">
+ <release version="0.3.1-dev" date="unreleased">
+ <action dev="JW" type="fix" context="generator">
+ If an attribute or element is mapped to the Java type "boolean",
+ then the getter is now called "isFoo", rather than "getFoo".
+ See JAXB SPEC, 4.5.1, and JAXME-19 in Jira.
+ </action>
+ <action dev="JW" type="fix" context="runtime">
+ Attributes in the following namespaces are now by default
+ ignored: The XML namespace (http://www.w3.org/XML/1998/namespace),
+ the XMLNS namespace (http://www.w3.org/2000/xmlns/), and the
+ XML Schema namespace (http://www.w3.org/2001/XMLSchema-instance).
+ See JAXME-17 in Jira.
+ </action>
+ </release>
+ <release version="0.3" date="2004-Jul-19">
<action dev="CL" type="enhancement" context="generator">
Initial work on nested groups.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org