Author: rfeng
Date: Fri Sep 21 10:49:05 2007
New Revision: 578214
URL: http://svn.apache.org/viewvc?rev=578214&view=rev
Log:
Fix for TUSCANY-1788
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java?rev=578214&r1=578213&r2=578214&view=diff
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
Fri Sep 21 10:49:05 2007
@@ -33,8 +33,6 @@
import org.apache.tuscany.sdo.impl.AttributeImpl;
import org.apache.tuscany.sdo.impl.ReferenceImpl;
-import org.apache.tuscany.sdo.model.internal.InternalFactory;
-import org.apache.tuscany.sdo.model.internal.impl.InternalFactoryImpl;
import org.apache.tuscany.sdo.util.SDOUtil;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
@@ -241,6 +239,7 @@
// FIXME: We need to deal with non-containment properties
if (value == null) {
// Creating xsi:nil="true" for elements
+ registerNamespace("xsi",
"http://www.w3.org/2001/XMLSchema-instance";);
Map.Entry entry = new NameValuePair(qname, null);
propertyList.add(entry);
} else if (propertyType.isDataType()) {
@@ -283,7 +282,8 @@
if (typeName != null) {
QName realTypeName =
namespaceContext.createQName(type.getURI(), typeName);
String typeQName = realTypeName.getPrefix() + ":" +
realTypeName.getLocalPart();
- declaredNamespaceMap.put(realTypeName.getPrefix(),
realTypeName.getNamespaceURI());
+ registerNamespace("xsi",
"http://www.w3.org/2001/XMLSchema-instance";);
+ registerNamespace(realTypeName.getPrefix(),
realTypeName.getNamespaceURI());
attributeList.add(new NameValuePair(XSI_TYPE_QNAME,
typeQName));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
