[jboss-svn-commits] JBoss Common SVN: r2828 - in jbossxb/trunk/src: test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Apr 18 05:29:47 EDT 2008
Author: alex.loubyansky at jboss.com
Date: 2008-04-18 05:29:47 -0400 (Fri, 18 Apr 2008)
New Revision: 2828
Modified:
jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support/Root.java
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyAttributeValueEntryContent.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyValueAttributes.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyValueSequence.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWithEntryTypeKeyAttributeValueEntry.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWithEntryTypeKeyAttributeValueEntryContent.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWrappedKeyValueSequence.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testEntryTypeKeyAttributeValueEntry.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testEntryTypeKeyAttributeValueEntryContent.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyAttributeValueEntryContent.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyValueAttributes.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyValueSequence.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testWrappedKeyValueSequence.xml
jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testXmlElementWrapperMap.xml
Log:
JBXB-139
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java 2008-04-18 09:29:47 UTC (rev 2828)
@@ -2060,10 +2060,8 @@
{
TypeBinding attributeType = resolveTypeBinding(keyType);
AttributeHandler attributeHandler = new PropertyHandler(entryInfo.getProperty("key"), keyType);
- String attrNs = keyAttribute.namespace();
- if(JBossXmlConstants.DEFAULT.equals(attrNs))
- attrNs = defaultNamespace;
- AttributeBinding keyBinding = new AttributeBinding(schemaBinding, new QName(attrNs, keyAttribute.name()), attributeType, attributeHandler);
+ QName attrQName = generateXmlName(keyType, attributeForm, keyAttribute.namespace(), keyAttribute.name());
+ AttributeBinding keyBinding = new AttributeBinding(schemaBinding, attrQName, attributeType, attributeHandler);
keyBinding.setRequired(true);
entryType.addAttribute(keyBinding);
}
@@ -2072,10 +2070,8 @@
{
TypeBinding attributeType = resolveTypeBinding(valueType);
AttributeHandler attributeHandler = new PropertyHandler(entryInfo.getProperty("value"), valueType);
- String valueNs = valueAttribute.namespace();
- if(JBossXmlConstants.DEFAULT.equals(valueNs))
- valueNs = defaultNamespace;
- AttributeBinding valueBinding = new AttributeBinding(schemaBinding, new QName(valueNs, valueAttribute.name()), attributeType, attributeHandler);
+ QName attrQName = generateXmlName(valueType, attributeForm, valueAttribute.namespace(), valueAttribute.name());
+ AttributeBinding valueBinding = new AttributeBinding(schemaBinding, attrQName, attributeType, attributeHandler);
valueBinding.setRequired(true);
entryType.addAttribute(valueBinding);
}
Modified: jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support/Root.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support/Root.java 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xb/builder/object/jbossxmlmapentry/support/Root.java 2008-04-18 09:29:47 UTC (rev 2828)
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
import org.jboss.xb.annotations.JBossXmlMapEntry;
@@ -32,6 +33,7 @@
import org.jboss.xb.annotations.JBossXmlMapKeyElement;
import org.jboss.xb.annotations.JBossXmlMapValueAttribute;
import org.jboss.xb.annotations.JBossXmlMapValueElement;
+import org.jboss.xb.annotations.JBossXmlSchema;
/**
@@ -41,6 +43,7 @@
* @version $Revision: 1.1 $
*/
@XmlRootElement
+ at JBossXmlSchema(namespace="ns", elementFormDefault= XmlNsForm.QUALIFIED)
public class Root
{
private Map<String, Integer> stringToInteger;
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyAttributeValueEntryContent.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyAttributeValueEntryContent.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyAttributeValueEntryContent.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<annotated-map-key-attr-value-entry-content key="key1">1</annotated-map-key-attr-value-entry-content>
<annotated-map-key-attr-value-entry-content key="key2">22</annotated-map-key-attr-value-entry-content>
<annotated-map-key-attr-value-entry-content key="key3">333</annotated-map-key-attr-value-entry-content>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyValueAttributes.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyValueAttributes.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyValueAttributes.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<annotated-map-key-value-attr key="key1" value="1"/>
<annotated-map-key-value-attr key="key2" value="22"/>
<annotated-map-key-value-attr key="key3" value="333"/>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyValueSequence.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyValueSequence.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapKeyValueSequence.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<key-kvs>key1</key-kvs><value-kvs>1</value-kvs>
<key-kvs>key2</key-kvs><value-kvs>22</value-kvs>
<key-kvs>key3</key-kvs><value-kvs>333</value-kvs>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWithEntryTypeKeyAttributeValueEntry.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWithEntryTypeKeyAttributeValueEntry.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWithEntryTypeKeyAttributeValueEntry.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<annotated-map-entry-type-key-attr-value-entry key="key1" attr="attr1">
<value>1</value>
</annotated-map-entry-type-key-attr-value-entry>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWithEntryTypeKeyAttributeValueEntryContent.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWithEntryTypeKeyAttributeValueEntryContent.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWithEntryTypeKeyAttributeValueEntryContent.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<annotated-map-with-entry-type-key-attr-value-entry-content key="key1">1</annotated-map-with-entry-type-key-attr-value-entry-content>
<annotated-map-with-entry-type-key-attr-value-entry-content key="key2">22</annotated-map-with-entry-type-key-attr-value-entry-content>
<annotated-map-with-entry-type-key-attr-value-entry-content key="key3">333</annotated-map-with-entry-type-key-attr-value-entry-content>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWrappedKeyValueSequence.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWrappedKeyValueSequence.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testAnnotatedMapWrappedKeyValueSequence.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<annotated-map-wrapped-key-value>
<key>key1</key><value>1</value>
</annotated-map-wrapped-key-value>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testEntryTypeKeyAttributeValueEntry.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testEntryTypeKeyAttributeValueEntry.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testEntryTypeKeyAttributeValueEntry.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<entry-type-key-attr-value-entry key="key1" attr="attr1">
<value>1</value>
</entry-type-key-attr-value-entry>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testEntryTypeKeyAttributeValueEntryContent.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testEntryTypeKeyAttributeValueEntryContent.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testEntryTypeKeyAttributeValueEntryContent.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<entry-type-key-attr-value-entry-content key="key1">1</entry-type-key-attr-value-entry-content>
<entry-type-key-attr-value-entry-content key="key2">22</entry-type-key-attr-value-entry-content>
<entry-type-key-attr-value-entry-content key="key3">333</entry-type-key-attr-value-entry-content>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyAttributeValueEntryContent.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyAttributeValueEntryContent.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyAttributeValueEntryContent.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<key-attr-value-entry-content key="key1">1</key-attr-value-entry-content>
<key-attr-value-entry-content key="key2">22</key-attr-value-entry-content>
<key-attr-value-entry-content key="key3">333</key-attr-value-entry-content>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyValueAttributes.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyValueAttributes.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyValueAttributes.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<key-value-attr key="key1" value="1"/>
<key-value-attr key="key2" value="22"/>
<key-value-attr key="key3" value="333"/>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyValueSequence.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyValueSequence.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testKeyValueSequence.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<key>key1</key><value>1</value>
<key>key2</key><value>22</value>
<key>key3</key><value>333</value>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testWrappedKeyValueSequence.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testWrappedKeyValueSequence.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testWrappedKeyValueSequence.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<wrapped-key-value>
<key>key1</key><value>1</value>
</wrapped-key-value>
Modified: jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testXmlElementWrapperMap.xml
===================================================================
--- jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testXmlElementWrapperMap.xml 2008-04-08 14:16:41 UTC (rev 2827)
+++ jbossxb/trunk/src/test/resources/org/jboss/test/xb/builder/object/jbossxmlmapentry/test/JBossXmlMapEntry_testXmlElementWrapperMap.xml 2008-04-18 09:29:47 UTC (rev 2828)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<root>
+<root xmlns="ns">
<map>
<entry key="key1">1</entry>
<entry key="key2">22</entry>
More information about the jboss-svn-commits
mailing list