Index: src/main/java/org/exolab/castor/xml/schema/ElementDecl.java
===================================================================
--- src/main/java/org/exolab/castor/xml/schema/ElementDecl.java	(Revision 6990)
+++ src/main/java/org/exolab/castor/xml/schema/ElementDecl.java	(Arbeitskopie)
@@ -445,8 +445,17 @@
     	while (enumeration.hasMoreElements()) {
     		ElementDecl temp  = (ElementDecl)enumeration.nextElement();
     		String subName = temp.getSubstitutionGroup();
-    		if (subName!=null && subName.equals(_name)) 
-    			result.add(temp);
+    		if (subName != null) {
+                // no namespace(s) or default namespace in use
+                if (subName.equals(_name)) { 
+                    result.add(temp);
+                }
+                // namespace(s) incl. prefix in use
+                // TODO: find a better way of dealing with a namespace prefix
+                else if (subName.endsWith(_name) && subName.indexOf(":") > 0) {
+                    result.add(temp);
+                }
+            }
     	}
     	return result.elements();
     }
Index: src/main/java/org/exolab/castor/xml/util/XMLClassDescriptorImpl.java
===================================================================
--- src/main/java/org/exolab/castor/xml/util/XMLClassDescriptorImpl.java	(Revision 6990)
+++ src/main/java/org/exolab/castor/xml/util/XMLClassDescriptorImpl.java	(Arbeitskopie)
@@ -376,7 +376,7 @@
                 
                 // handle substitution groups !!! 
                 List substitutes =  expectedElementDescriptor.getSubstitutes();
-                if (!substitutes.isEmpty()) {
+                if (substitutes != null && !substitutes.isEmpty()) {
                     if (substitutes.contains(elementName)) {
                         parentState.expectedIndex++;
                         return;
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/builder.properties
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/builder.properties	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/builder.properties	(Revision 0)
@@ -0,0 +1,4 @@
+# Specifies whether automatic class name conflict resolution
+# should be used or not; defaults to false.
+#
+org.exolab.castor.builder.automaticConflictResolution=true
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/test.xsd	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/test.xsd	(Revision 0)
@@ -0,0 +1,89 @@
+<!--
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+
+<xs:schema targetNamespace="http://xmlbeans.apache.org/samples/substitutiongroup/easypo"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns:po="http://xmlbeans.apache.org/samples/substitutiongroup/easypo"
+	elementFormDefault="qualified">
+
+	<xs:element name="purchase-order">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="po:invoice-header" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="invoice-header">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="ship-to" type="po:name-address" />
+				<xs:element name="bill-to" type="po:name-address" />
+				<xs:element ref="po:product" minOccurs="0" />
+				<xs:element ref="po:comment" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:complexType name="name-address">
+		<xs:sequence>
+			<xs:element name="name" type="xs:string" />
+			<xs:element name="address" type="xs:string" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="product-type" abstract="true">
+		<xs:attribute name="id" type="xs:int" />
+	</xs:complexType>
+
+	<xs:complexType name="book-type">
+		<xs:complexContent>
+			<xs:extension base="po:product-type">
+				<xs:sequence>
+					<xs:element name="title" type="xs:string" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="clothing-type">
+		<xs:complexContent>
+			<xs:extension base="po:product-type">
+				<xs:sequence>
+					<xs:element name="color">
+						<xs:simpleType>
+							<xs:restriction base="xs:token">
+								<xs:enumeration value="red" />
+								<xs:enumeration value="blue" />
+								<xs:enumeration value="green" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:element name="product" type="po:product-type" abstract="true" />
+
+	<xs:element name="book" type="po:book-type" substitutionGroup="po:product" />
+	<xs:element name="clothing" type="po:clothing-type" substitutionGroup="po:product" />
+
+	<xs:element name="comment" type="xs:string" />
+	<xs:element name="ship-comment" type="xs:string" substitutionGroup="po:comment" />
+	<xs:element name="bill-comment" type="xs:string" substitutionGroup="po:comment" />
+
+</xs:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/TestDescriptor.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/TestDescriptor.xml	(Revision 0)
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+    <Name>Tests for substitution groups with explicit namespace(s)</Name>
+    <Author>Werner Guttmann</Author>
+    <Comment>Tests substitution group funtionality</Comment>
+    <Category>basic capability</Category>
+    <SourceGeneratorTest>
+        <Schema>test.xsd</Schema>
+        <Property_File>builder.properties</Property_File>
+        <Root_Object random="false" dump="true">PurchaseOrder</Root_Object>
+        <UnitTestCase>
+			<GenerateImported>true</GenerateImported>
+            <Name>TestPurchaseOrder</Name>
+            <Input>input.xml</Input>
+            <GoldFile/>
+        </UnitTestCase>
+    </SourceGeneratorTest>
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/input.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/input.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withExplicitNamespace/input.xml	(Revision 0)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<purchase-order xmlns="http://xmlbeans.apache.org/samples/substitutiongroup/easypo">
+  <invoice-header>
+    <ship-to>
+      <name>Any Inc.</name>
+      <address>AnyTown, AnyCity</address>
+    </ship-to>
+    <bill-to>
+      <name>Any Inc.</name>
+      <address>AnyTown, AnyCity</address>
+    </bill-to>
+    <book id="123">
+      <title>The Little Engine That Could</title>
+    </book>
+    <!-- 
+    <ship-comment>Please ship this to Any Inc. asap.</ship-comment>
+     -->
+  </invoice-header>
+
+  <invoice-header>
+    <ship-to>
+      <name>Some Corp.</name>
+      <address>SomeTown, SomeCity</address>
+    </ship-to>
+    <bill-to>
+      <name>This Corp.</name>
+      <address>ThisTown, ThisCity</address>
+    </bill-to>
+    <clothing id="456">
+      <color>green</color>
+    </clothing>
+    <comment>This is being billed to This Corp.</comment>
+  </invoice-header>
+
+
+</purchase-order>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/builder.properties
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/builder.properties	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/builder.properties	(Revision 0)
@@ -0,0 +1,4 @@
+# Specifies whether automatic class name conflict resolution
+# should be used or not; defaults to false.
+#
+org.exolab.castor.builder.automaticConflictResolution=true
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/test.xsd
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/test.xsd	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/test.xsd	(Revision 0)
@@ -0,0 +1,89 @@
+<!--
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+
+<xs:schema targetNamespace="http://xmlbeans.apache.org/samples/substitutiongroup/easypo"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+	xmlns="http://xmlbeans.apache.org/samples/substitutiongroup/easypo"
+	elementFormDefault="qualified">
+
+	<xs:element name="purchase-order">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="invoice-header" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="invoice-header">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="ship-to" type="name-address" />
+				<xs:element name="bill-to" type="name-address" />
+				<xs:element ref="product" minOccurs="0" />
+				<xs:element ref="comment" minOccurs="0" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:complexType name="name-address">
+		<xs:sequence>
+			<xs:element name="name" type="xs:string" />
+			<xs:element name="address" type="xs:string" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="product-type" abstract="true">
+		<xs:attribute name="id" type="xs:int" />
+	</xs:complexType>
+
+	<xs:complexType name="book-type">
+		<xs:complexContent>
+			<xs:extension base="product-type">
+				<xs:sequence>
+					<xs:element name="title" type="xs:string" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="clothing-type">
+		<xs:complexContent>
+			<xs:extension base="product-type">
+				<xs:sequence>
+					<xs:element name="color">
+						<xs:simpleType>
+							<xs:restriction base="xs:token">
+								<xs:enumeration value="red" />
+								<xs:enumeration value="blue" />
+								<xs:enumeration value="green" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:element name="product" type="product-type" abstract="true" />
+
+	<xs:element name="book" type="book-type" substitutionGroup="product" />
+	<xs:element name="clothing" type="clothing-type" substitutionGroup="product" />
+
+	<xs:element name="comment" type="xs:string" />
+	<xs:element name="ship-comment" type="xs:string" substitutionGroup="comment" />
+	<xs:element name="bill-comment" type="xs:string" substitutionGroup="comment" />
+
+</xs:schema>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/TestDescriptor.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/TestDescriptor.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/TestDescriptor.xml	(Revision 0)
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+    <Name>Tests for substitution groups with default namespace</Name>
+    <Author>Werner Guttmann</Author>
+    <Comment>Tests substitution group funtionality</Comment>
+    <Category>basic capability</Category>
+    <SourceGeneratorTest>
+        <Schema>test.xsd</Schema>
+        <Property_File>builder.properties</Property_File>
+        <Root_Object random="false" dump="true">PurchaseOrder</Root_Object>
+        <UnitTestCase>
+			<GenerateImported>true</GenerateImported>
+            <Name>TestPurchaseOrder</Name>
+            <Input>input.xml</Input>
+            <GoldFile/>
+        </UnitTestCase>
+    </SourceGeneratorTest>
+</TestDescriptor>
Index: xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/input.xml
===================================================================
--- xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/input.xml	(Revision 0)
+++ xmlctf/tests/MasterTestSuite/sourcegenerator/substitutionGroups/withDefaultNamespace/input.xml	(Revision 0)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<purchase-order xmlns="http://xmlbeans.apache.org/samples/substitutiongroup/easypo">
+  <invoice-header>
+    <ship-to>
+      <name>Any Inc.</name>
+      <address>AnyTown, AnyCity</address>
+    </ship-to>
+    <bill-to>
+      <name>Any Inc.</name>
+      <address>AnyTown, AnyCity</address>
+    </bill-to>
+    <book id="123">
+      <title>The Little Engine That Could</title>
+    </book>
+    <!-- 
+    <ship-comment>Please ship this to Any Inc. asap.</ship-comment>
+     -->
+  </invoice-header>
+
+  <invoice-header>
+    <ship-to>
+      <name>Some Corp.</name>
+      <address>SomeTown, SomeCity</address>
+    </ship-to>
+    <bill-to>
+      <name>This Corp.</name>
+      <address>ThisTown, ThisCity</address>
+    </bill-to>
+    <clothing id="456">
+      <color>green</color>
+    </clothing>
+    <comment>This is being billed to This Corp.</comment>
+  </invoice-header>
+
+
+</purchase-order>
Index: codegen/src/main/java/org/exolab/castor/builder/descriptors/DescriptorSourceFactory.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/descriptors/DescriptorSourceFactory.java	(Revision 6990)
+++ codegen/src/main/java/org/exolab/castor/builder/descriptors/DescriptorSourceFactory.java	(Arbeitskopie)
@@ -62,6 +62,7 @@
 import org.exolab.castor.builder.types.XSListType;
 import org.exolab.castor.builder.types.XSType;
 import org.exolab.castor.xml.XMLConstants;
+import org.exolab.castor.xml.XMLFieldDescriptor;
 import org.exolab.javasource.JClass;
 import org.exolab.javasource.JConstructor;
 import org.exolab.javasource.JField;
@@ -167,15 +168,15 @@
         // handle substitution groups
         List substitutionGroups = classInfo.getSubstitutionGroups();
         if (!substitutionGroups.isEmpty()) {
-            jsc.add("java.util.List substitutionGroupes = new java.util.ArrayList();");
+            jsc.add("java.util.List substitutionGroups = new java.util.ArrayList();");
             Iterator substitutionGroupIter = substitutionGroups.iterator();
             while (substitutionGroupIter.hasNext()) {
                 String substitutionGroup = (String) substitutionGroupIter.next();
-                jsc.add("substitutionGroupes.add(\"");
+                jsc.add("substitutionGroups.add(\"");
                 jsc.append(substitutionGroup);
                 jsc.append("\");");
             }
-            jsc.add("setSubstitutes(substitutionGroupes);");
+            jsc.add("setSubstitutes(substitutionGroups);");
         }
                 
         //-- To prevent compiler warnings...make sure