default namespace is schema for schema namespace

3 files changed, 19 insertions, 28 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaContainmentMappingXmlSchemaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaContainmentMappingXmlSchemaType.java
index 74946e3e5b..52a57fdafd 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaContainmentMappingXmlSchemaType.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaContainmentMappingXmlSchemaType.java
@@ -44,12 +44,4 @@ public class GenericJavaContainmentMappingXmlSchemaType
 	protected JaxbPackage getJaxbPackage() {
 		return this.getPersistentClass().getJaxbPackage();
 	}
-
-
-	// ********** namespace **********
-
-	public String getDefaultNamespace() {
-		return getJaxbContainmentMapping().getNamespace();
-	}
-
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPackageXmlSchemaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPackageXmlSchemaType.java
index c45c477140..2bfc690fa0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPackageXmlSchemaType.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPackageXmlSchemaType.java
@@ -34,11 +34,4 @@ public class GenericJavaPackageXmlSchemaType
 	protected JaxbPackage getJaxbPackage() {
 		return getJaxbPackageInfo().getParent();
 	}
-
-	// ********** namespace **********
-
-	public String getDefaultNamespace() {
-		return getJaxbPackage().getNamespace();
-	}
-
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchemaType.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchemaType.java
index 5b711251e8..cdc4f63320 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchemaType.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaXmlSchemaType.java
@@ -22,20 +22,21 @@ import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.iterables.EmptyIterable;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.xsd.util.XSDUtil;
 
 public abstract class GenericJavaXmlSchemaType
-	extends AbstractJavaContextNode
-	implements XmlSchemaType
-{
-
+		extends AbstractJavaContextNode
+		implements XmlSchemaType {
+	
 	protected final XmlSchemaTypeAnnotation xmlSchemaTypeAnnotation;
-
+	
 	protected String name;
-
+	
 	protected String specifiedNamespace;
-
+	
 	protected String type;
-
+	
+	
 	protected GenericJavaXmlSchemaType(JaxbContextNode parent, XmlSchemaTypeAnnotation xmlSchemaTypeAnnotation) {
 		super(parent);
 		this.xmlSchemaTypeAnnotation = xmlSchemaTypeAnnotation;
@@ -90,26 +91,31 @@ public abstract class GenericJavaXmlSchemaType
 	public String getNamespace() {
 		return getSpecifiedNamespace() == null ? getDefaultNamespace() : getSpecifiedNamespace();
 	}
-
+	
+	public String getDefaultNamespace() {
+		return XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001;
+	}
+	
 	public String getSpecifiedNamespace() {
 		return this.specifiedNamespace;
 	}
-
+	
 	public void setSpecifiedNamespace(String location) {
 		this.xmlSchemaTypeAnnotation.setNamespace(location);
 		this.setNamespace_(location);	
 	}
-
+	
 	protected void setNamespace_(String namespace) {
 		String old = this.specifiedNamespace;
 		this.specifiedNamespace = namespace;
 		this.firePropertyChanged(SPECIFIED_NAMESPACE_PROPERTY, old, namespace);
 	}
-
+	
 	protected String getResourceNamespace() {
 		return this.xmlSchemaTypeAnnotation.getNamespace();
 	}
-
+	
+	
 	// ********** type **********
 
 	public String getType() {