Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/anyAttribute/anyAttribute_Annotation.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/anyAttribute/anyAttribute_Annotation.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/anyAttribute/anyAttribute_Annotation.xsd	(working copy)
@@ -10,7 +10,7 @@
                 <xsd:element name="Body" type="xsd:string"/>
             </xsd:sequence>
             <xsd:anyAttribute namespace="##other" processContents="lax">
-                <!-- This annotation is lost in our processing and is counted as two differences -->
+                <!-- This annotation is lost in our processing ... this is probably a bug -->
                 <xsd:annotation>
                     <xsd:documentation>
                         Some docs
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/simpleType_namespace/simpleType_namespace.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/simpleType_namespace/simpleType_namespace.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/simpleType_namespace/simpleType_namespace.xsd	(working copy)
@@ -2,25 +2,26 @@
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="http://www.castor.org/tests/schema/simpleType_Namespace"
-           xmlns:castor= "http://www.castor.org/tests/schema/simpleType_Namespace">
-           
+            targetNamespace="http://www.castor.org/tests/schema/simpleType_Namespace"
+            xmlns:castor="http://www.castor.org/tests/schema/simpleType_Namespace">
+
    <xsd:element name="test1" type="castor:simpleType1"/>
    <xsd:element name="test2" type="castor:simpleType2"/>
-   
+
    <xsd:simpleType name="simpleType1">
        <xsd:restriction base='xsd:integer'>
-            <xsd:totalDigits value="10"/>
+            <xsd:totalDigits    value="10"/>
             <xsd:fractionDigits value="2"/>
-            <xsd:maxInclusive value="300"/>
-            <xsd:minInclusive value="1"/>
+            <xsd:maxInclusive   value="300"/>
+            <xsd:minInclusive   value="1"/>
        </xsd:restriction>
    </xsd:simpleType>
+
    <xsd:simpleType name="simpleType2">
        <xsd:restriction base='string'>
-            <enumeration value="A"/>
+            <enumeration  value="A"/>
             <minExclusive value="B"/>
        </xsd:restriction>
    </xsd:simpleType>
-   
-</xsd:schema>
\ No newline at end of file
+
+</xsd:schema>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/simpleType_namespace/simpleType_namespace_failure.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/simpleType_namespace/simpleType_namespace_failure.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/schema/simpleType_namespace/simpleType_namespace_failure.xsd	(working copy)
@@ -2,26 +2,26 @@
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:foo="http://www.castor.org/2001/XMLSchema"
-            targetNamespace="http://www.castor.org/tests/schema/simpleType_Namespace"     
-            xmlns:castor= "http://www.castor.org/tests/schema/simpleType_Namespace">
-        
-           
+            targetNamespace="http://www.castor.org/tests/schema/simpleType_Namespace"
+            xmlns:castor="http://www.castor.org/tests/schema/simpleType_Namespace">
+
    <xsd:element name="test1" type="castor:simpleType1"/>
    <xsd:element name="test2" type="castor:simpleType2"/>
-   
+
    <xsd:simpleType name="simpleType1">
        <xsd:restriction base='xsd:integer'>
-            <xsd:totalDigits value="10"/>
+            <xsd:totalDigits    value="10"/>
             <xsd:fractionDigits value="2"/>
-            <xsd:maxInclusive value="300"/>
-            <xsd:minInclusive value="1"/>
+            <xsd:maxInclusive   value="300"/>
+            <xsd:minInclusive   value="1"/>
        </xsd:restriction>
    </xsd:simpleType>
+
    <xsd:simpleType name="simpleType2">
        <xsd:restriction base='foo:string'>
-            <enumeration value="A"/>
+            <enumeration  value="A"/>
             <minExclusive value="B"/>
        </xsd:restriction>
    </xsd:simpleType>
-   
-</xsd:schema>
\ No newline at end of file
+
+</xsd:schema>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Annotations/SpecialCharacters/input.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Annotations/SpecialCharacters/input.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Annotations/SpecialCharacters/input.xml	(working copy)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<ProcessDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:noNamespaceSchemaLocation="test.xsd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<ProcessDefinition>
     <Classification value="blafasel" />
-</ProcessDefinition>
\ No newline at end of file
+</ProcessDefinition>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Annotations/SpecialCharacters/test.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Annotations/SpecialCharacters/test.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Annotations/SpecialCharacters/test.xsd	(working copy)
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-	<xs:element name="ProcessDefinition">
-		<xs:annotation>
-			<xs:documentation>Wurzelelement f�r alle Prozessdefinitionen</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Classification">
-					<xs:annotation>
-						<xs:documentation>
-							Die Prozessdefinition muss eine Classification enthalten. Diese gibt an
-							auf welchen Teilbaum des Produktmodells diese Prozessdefinition
-							angewendet werden kann. Die Classification ist dabei ein korrekter
-							Ausdruck der ePROTAS Pfadsprache (siehe Kapitel 4). Beispiele sind:
-							/pw6000|pw5000/*/vane /pw6000/pw6124/vane /*/*{type='Module'}
-						</xs:documentation>
-					</xs:annotation>
-					<xs:complexType>
-						<xs:attribute name="value" type="xs:string" use="required" />
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="unqualified">
+
+    <xs:element name="ProcessDefinition">
+        <xs:annotation>
+            <xs:documentation>Wurzelelement f�r alle Prozessdefinitionen</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="Classification">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Die Prozessdefinition muss eine Classification enthalten. Diese gibt an
+                            auf welchen Teilbaum des Produktmodells diese Prozessdefinition
+                            angewendet werden kann. Die Classification ist dabei ein korrekter
+                            Ausdruck der ePROTAS Pfadsprache (siehe Kapitel 4). Beispiele sind:
+                            /pw6000|pw5000/*/vane /pw6000/pw6124/vane /*/*{type='Module'}
+                        </xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:attribute name="value" type="xs:string" use="required"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 </xs:schema>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Facets/Decimal/NumberOfDigits/test.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Facets/Decimal/NumberOfDigits/test.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Facets/Decimal/NumberOfDigits/test.xsd	(working copy)
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<xsd:schema targetNamespace="http://www.castor.org/bug913i"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
 <xsd:simpleType name="amount">
   <xsd:restriction base="xsd:decimal">
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Facets/integer/input.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Facets/integer/input.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Facets/integer/input.xml	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<TestPrimitiveToWrapper
-	xmlns="http://www.castor.org/MasterTestSuite/xml/SourceGenerator/PrimitiveToWrapper"
-	intTestAtt="23" integerTestAtt="12">
-	<intTest>12</intTest>
-	<integerTest>325325</integerTest>
-</TestPrimitiveToWrapper>
+<IntegerTest
+    xmlns="http://www.castor.org/MasterTestSuite/xml/SourceGenerator/PrimitiveToWrapper"
+    intTestAtt="23" integerTestAtt="12">
+    <intTest>12</intTest>
+    <integerTest>325325</integerTest>
+</IntegerTest>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/binding.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/binding.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/binding.xml	(working copy)
@@ -1,15 +1,11 @@
 <binding defaultBindingType="type">
 
-	
-	<elementBinding name="complexType:pathType/item">
-		<member name="myItem" java-type="base.MyItem" handler="base.MyHandler"/>
-	</elementBinding>
-	
-	<elementBinding name="complexType:pathType/simpleItem">
-		<member name="mySimpleItem" java-type="java.awt.Color" handler="base.MySimpleHandler"/>
-	</elementBinding>
-	
-	
+    <elementBinding name="complexType:pathType/item">
+        <member name="myItem" java-type="base.MyItem" handler="base.MyHandler"/>
+    </elementBinding>
 
-	
+    <elementBinding name="complexType:pathType/simpleItem">
+        <member name="mySimpleItem" java-type="java.awt.Color" handler="base.MySimpleHandler"/>
+    </elementBinding>
+
 </binding>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/test.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/test.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/test.xsd	(working copy)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://test" xmlns="http://test"
-   xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
-   
+<xs:schema targetNamespace="http://test"
+           xmlns="http://test"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           attributeFormDefault="unqualified"
+           elementFormDefault="qualified">
+
    <!--xs:complexType name="itemType">
-	   <xs:attribute name="name" type="xs:string"/>
+       <xs:attribute name="name" type="xs:string"/>
    </xs:complexType-->
-   
+
    <xs:complexType name="pathType">
       <xs:sequence>
          <xs:element name="item" maxOccurs="unbounded" minOccurs="1">
-         	<xs:complexType>
-         		 <xs:attribute name="name" type="xs:string"/>
-         	</xs:complexType>
+             <xs:complexType>
+                  <xs:attribute name="name" type="xs:string"/>
+             </xs:complexType>
          </xs:element>
          <xs:element name="simpleItem" maxOccurs="unbounded" minOccurs="0" type="xs:string"/>
       </xs:sequence>
@@ -18,6 +21,5 @@
    </xs:complexType>
 
    <xs:element name="path" type="pathType" />
-   
+
 </xs:schema>
-   
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/TestDescriptor.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/TestDescriptor.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/JavaTypeBindingForComplexTypes/TestDescriptor.xml	(working copy)
@@ -2,7 +2,10 @@
 <TestDescriptor>
     <Name>Test java-type binding for complex types</Name>
     <Author>Werner Guttmann</Author>
-    <Comment>Test that ensures that the java-type of a binding for a complex type definition is actually used during source code generation</Comment>
+    <Comment>
+        Test that ensures that the java-type of a binding for a complex type
+        definition is actually used during source code generation.
+    </Comment>
     <Category>basic capability</Category>
     <SourceGeneratorTest>
         <Schema>test.xsd</Schema>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/MixedContent/bug1358.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/MixedContent/bug1358.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/MixedContent/bug1358.xsd	(working copy)
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-elementFormDefault="qualified">
+           elementFormDefault="qualified">
+
+    <xs:element name="base">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="i1" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="base">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="i1" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="i1">
-		<xs:complexType mixed="true">
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:element ref="i2"/>
-			</xs:choice>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="i2">
-		<xs:complexType mixed="true">
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:element ref="i"/>
-			</xs:choice>
-		</xs:complexType>
-	</xs:element>
-	
-	<xs:element name="i" type="xs:string"/>
-</xs:schema>
\ No newline at end of file
+    <xs:element name="i1">
+        <xs:complexType mixed="true">
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="i2"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="i2">
+        <xs:complexType mixed="true">
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="i"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="i" type="xs:string"/>
+</xs:schema>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/MixedContent/input.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/MixedContent/input.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/MixedContent/input.xml	(working copy)
@@ -1,9 +1,7 @@
 <?xml version='1.0'?>
-
-<base xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<i1>Leading<i2>more
-			<i>17</i> embedded</i2>
-		<i2>hereto<i>43</i>
-		</i2> trailing</i1>
+<base>
+    <i1>Leading<i2>more
+            <i>17</i> embedded</i2>
+        <i2>hereto<i>43</i>
+        </i2> trailing</i1>
 </base>
-  
\ No newline at end of file
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NameSpaces/bug1138/input.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NameSpaces/bug1138/input.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NameSpaces/bug1138/input.xml	(working copy)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<books xmlns="urn:bug1138-test-case">
+<Books xmlns="urn:bug1138-test-case">
     <book title="All about Castor bug 1138" edition="1" xmlns="">
         <isbn>123-4556</isbn>
     </book>
-</books>
+</Books>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NestedGroups/nested-group-input.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NestedGroups/nested-group-input.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NestedGroups/nested-group-input.xml	(working copy)
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <Report>
-   <Invoice Id="1">
+    <Invoice Id="1">
         <Toy>Bakasse</Toy>
         <Other>Roses</Other>
         <shipTo>
-           <Name>Job Mulet</Name>
-           <Street>Sophia</Street>
-           <ZipCode>10230</ZipCode>
-         </shipTo>  
-         <CreditCard>true</CreditCard>
-   </Invoice>
-   
-   <Invoice Id="2">
+            <Name>Job Mulet</Name>
+            <Street>Sophia</Street>
+            <ZipCode>10230</ZipCode>
+        </shipTo>
+        <CreditCard>true</CreditCard>
+    </Invoice>
+
+    <Invoice Id="2">
         <Toy>Handle</Toy>
         <DVD>DVD001</DVD>
         <Title>The Free-style song</Title>
@@ -16,14 +16,14 @@
         <DVD>DVD001</DVD>
         <Title>The Free-style song</Title>
         <shipTo>
-           <Name>DJ Le Flanc</Name>
-           <Street>somewhere</Street>
-           <ZipCode>34951</ZipCode>
-         </shipTo>
-         <Check>true</Check>
-   </Invoice>
-   
-   <Invoice Id="3">
+            <Name>DJ Le Flanc</Name>
+            <Street>somewhere</Street>
+            <ZipCode>34951</ZipCode>
+        </shipTo>
+        <Check>true</Check>
+    </Invoice>
+
+    <Invoice Id="3">
         <DVD>DVD002</DVD>
         <Title>Auto-Reject</Title>
         <Other>Soccer ball</Other>
@@ -29,15 +29,15 @@
         <Other>Soccer ball</Other>
         <Other>Zidane shirt</Other>
         <shipTo>
-           <Name>Cartonnasse</Name>
-           <Street>calle de Madrid</Street>
-           <ZipCode>49382</ZipCode>
-         </shipTo>  
+            <Name>Cartonnasse</Name>
+            <Street>calle de Madrid</Street>
+            <ZipCode>49382</ZipCode>
+        </shipTo>
          <CreditCard>true</CreditCard>
-         <billTo>
-           <Name>Russian Mafia</Name>
-           <Street>les petits humains</Street>
-           <ZipCode>49232</ZipCode>
-         </billTo>
-   </Invoice>
+        <billTo>
+            <Name>Russian Mafia</Name>
+            <Street>les petits humains</Street>
+            <ZipCode>49232</ZipCode>
+        </billTo>
+    </Invoice>
 </Report>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NestedGroups/nested-group.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NestedGroups/nested-group.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/NestedGroups/nested-group.xsd	(working copy)
@@ -1,47 +1,46 @@
 <?xml version='1.0'?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://www.castor.org/MasterTestSuite/xml/SourceGenerator/NestedGroup">
-	
-	<xsd:element name="Report">
-	    <xsd:complexType>
-		    <xsd:sequence>
-			    <xsd:element name="Invoice" maxOccurs="unbounded">
-			        <xsd:complexType>
-			            <xsd:sequence>
-			                 <xsd:choice  minOccurs="1" maxOccurs="unbounded">
-					             <xsd:element name="Toy" type="xsd:string"/>
-					             <xsd:sequence>
-					                 <xsd:element name="DVD" type="xsd:string"/>
-					                 <xsd:element name="Title" type="xsd:string"/>
-					             </xsd:sequence>
-					             <xsd:element name="Other" type="xsd:string"/>
-					         </xsd:choice>
-				             <xsd:group ref="shipAndBill" minOccurs='0' maxOccurs='unbounded'/>
-			     	    </xsd:sequence>
-			            <xsd:attribute name="Id" type="xsd:int"/>
-			         </xsd:complexType>
-			       </xsd:element>
-		       </xsd:sequence>
-		  </xsd:complexType>
-	</xsd:element>
-    
-	<xsd:group name="shipAndBill">
- 		<xsd:sequence>
- 			<xsd:element name="shipTo" type="AddressType" minOccurs='0'/>
- 			<xsd:choice>
- 			    <xsd:element name="CreditCard" type="xsd:boolean"/>
- 	    		<xsd:element name="Check" type="xsd:boolean"/>
- 			</xsd:choice>
- 			<xsd:element name="billTo" type="AddressType" minOccurs='0'/>
- 		</xsd:sequence>
- 	</xsd:group>
- 	
- 	<xsd:complexType name="AddressType">
-		<xsd:all>
-			<xsd:element name="Name" type="xsd:string"/>
-			<xsd:element name="Street" type="xsd:string"/>
-			<xsd:element name="ZipCode" type="xsd:string"/>
-		</xsd:all>
-	</xsd:complexType>
-	
-</xsd:schema>
\ No newline at end of file
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+    <xsd:element name="Report">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="Invoice" maxOccurs="unbounded">
+                    <xsd:complexType>
+                        <xsd:sequence>
+                            <xsd:choice  minOccurs="1" maxOccurs="unbounded">
+                                <xsd:element name="Toy" type="xsd:string"/>
+                                    <xsd:sequence>
+                                        <xsd:element name="DVD" type="xsd:string"/>
+                                        <xsd:element name="Title" type="xsd:string"/>
+                                    </xsd:sequence>
+                                <xsd:element name="Other" type="xsd:string"/>
+                            </xsd:choice>
+                            <xsd:group ref="shipAndBill" minOccurs='0' maxOccurs='unbounded'/>
+                        </xsd:sequence>
+                        <xsd:attribute name="Id" type="xsd:int"/>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:group name="shipAndBill">
+        <xsd:sequence>
+            <xsd:element name="shipTo" type="AddressType" minOccurs='0'/>
+                <xsd:choice>
+                    <xsd:element name="CreditCard" type="xsd:boolean"/>
+                    <xsd:element name="Check" type="xsd:boolean"/>
+                </xsd:choice>
+            <xsd:element name="billTo" type="AddressType" minOccurs='0'/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:complexType name="AddressType">
+        <xsd:all>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Street" type="xsd:string"/>
+            <xsd:element name="ZipCode" type="xsd:string"/>
+        </xsd:all>
+    </xsd:complexType>
+
+</xsd:schema>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/type-binding/test01/input.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/type-binding/test01/input.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/type-binding/test01/input.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Test1Type>
+<Test1Type xmlns="urn:test:namespace">
   <Test2>
      <Test3>Foo</Test3>
   </Test2>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/type-binding/test01/test.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/type-binding/test01/test.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/type-binding/test01/test.xsd	(working copy)
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema
-        targetNamespace="urn:test:namespace"
-        xmlns="http://www.w3.org/2001/XMLSchema"
-        elementFormDefault="qualified"
-        attributeFormDefault="unqualified">
+<xsd:schema targetNamespace="urn:test:namespace"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
 
-        <complexType name="Test1Type">
-                <sequence>
-                        <element name="Test2">
-                                <complexType>
-                                        <sequence>
-                                                <element name="Test3" type="string"/>
-                                        </sequence>
-                                </complexType>
-                        </element>
-                </sequence>
-        </complexType>
-</schema>
+    <xsd:complexType name="Test1Type">
+        <xsd:sequence>
+            <xsd:element name="Test2">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="Test3" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+</xsd:schema>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/Any/any-input.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/Any/any-input.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/Any/any-input.xml	(working copy)
@@ -1,34 +1,52 @@
-<test:purchaseReport
-  xmlns:test="http://www.castor.org/MasterTestSuite/xml/SourceGenerator/Any" period="P3M" >
-
- <test:regions>
-   Regions here
- </test:regions>
+<test:purchaseReport xmlns:test="http://www.castor.org/MasterTestSuite/xml/SourceGenerator/Any"
+                     period="P3M" >
 
- <test:parts>
-   parts here
- </test:parts>
+    <test:regions>Regions here</test:regions>
+    <test:parts>parts here</test:parts>
+    <test:htmlExample>
+        <xhtml:table xmlns:xhtml="http://www.w3.org/1999/xhtml"
+                     xhtml:border="0" xhtml:width="100%">
+            <xhtml:tr>
+                <xhtml:th align="left">Zip Code</xhtml:th>
+                <xhtml:th align="left">Part Number</xhtml:th>
+                <xhtml:th align="left">Quantity</xhtml:th>
+            </xhtml:tr>
+            <xhtml:tr>
+                <xhtml:td>95819</xhtml:td>
+                <xhtml:td> </xhtml:td>
+                <xhtml:td> </xhtml:td>
+            </xhtml:tr>
+            <xhtml:tr>
+                <xhtml:td> </xhtml:td>
+                <xhtml:td>872-AA</xhtml:td>
+                <xhtml:td>1</xhtml:td>
+            </xhtml:tr>
+            <xhtml:tr>
+                <xhtml:td> </xhtml:td>
+                <xhtml:td>926-AA</xhtml:td>
+                <xhtml:td>1</xhtml:td>
+            </xhtml:tr>
+            <xhtml:tr>
+                <xhtml:td> </xhtml:td>
+                <xhtml:td>833-AA</xhtml:td>
+                <xhtml:td>1</xhtml:td>
+            </xhtml:tr>
+            <xhtml:tr>
+                <xhtml:td> </xhtml:td>
+                <xhtml:td>455-BX</xhtml:td>
+                <xhtml:td>1</xhtml:td>
+            </xhtml:tr>
+            <xhtml:tr>
+                <xhtml:td>63143</xhtml:td>
+                <xhtml:td> </xhtml:td>
+                <xhtml:td> </xhtml:td>
+            </xhtml:tr>
+            <xhtml:tr>
+                <xhtml:td> </xhtml:td>
+                <xhtml:td>455-BX</xhtml:td>
+                <xhtml:td>4</xhtml:td>
+            </xhtml:tr>
+        </xhtml:table>
+    </test:htmlExample>
 
- <test:htmlExample>
-  <xhtml:table xmlns:xhtml="http://www.w3.org/1999/xhtml"
-               xhtml:border="0" test:width="100%">
-   <xhtml:tr>
-     <xhtml:th align="left">Zip Code</xhtml:th>
-     <xhtml:th align="left">Part Number</xhtml:th>
-     <xhtml:th align="left">Quantity</xhtml:th>
-   </xhtml:tr>
-   <xhtml:tr>
-       <xhtml:td>95819</xhtml:td>
-   
-   <!--td> </td><td> </td></tr>
-   <tr><td> </td><td>872-AA</td><td>1</td></tr>
-   <tr><td> </td><td>926-AA</td><td>1</td></tr>
-   <tr><td> </td><td>833-AA</td><td>1</td></tr>
-   <tr><td> </td><td>455-BX</td><td>1</td></tr>
-   <tr><td>63143</td><td> </td><td> </td></tr>
-   <tr><td> </td><td>455-BX</td><td>4</td-->
-   </xhtml:tr>
-  </xhtml:table>
- </test:htmlExample>
-
-</test:purchaseReport>
\ No newline at end of file
+</test:purchaseReport>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/Any/any.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/Any/any.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/Any/any.xsd	(working copy)
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	        targetNamespace="http://www.castor.org/MasterTestSuite/xml/SourceGenerator/Any"
+            targetNamespace="http://www.castor.org/MasterTestSuite/xml/SourceGenerator/Any"
             elementFormDefault="qualified">
 
-<!-- adapted from XMLSCHEMA-0 available at the W3C -->
-	<xsd:element name="purchaseReport">
-	 <xsd:complexType>
-	  <xsd:sequence>
-	   <xsd:element name="regions" type="xsd:string"/>
-	   <xsd:element name="parts"   type="xsd:string"/>
-	   <xsd:element name="htmlExample">
-	    <xsd:complexType>
-	     <xsd:sequence>
-	      <xsd:any namespace="http://www.w3.org/1999/xhtml"
-	           minOccurs="1" maxOccurs="unbounded"
-	           processContents="skip"/>
-	     </xsd:sequence> 
-	    </xsd:complexType>
-	   </xsd:element>
-	  </xsd:sequence>
-	  <xsd:attribute name="period"       type="xsd:duration"/>
-	  </xsd:complexType>
-	</xsd:element>
+    <!-- adapted from XMLSCHEMA-0 available at the W3C -->
+    <xsd:element name="purchaseReport">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="regions" type="xsd:string"/>
+                <xsd:element name="parts"   type="xsd:string"/>
+                <xsd:element name="htmlExample">
+                    <xsd:complexType>
+                        <xsd:sequence>
+                            <xsd:any namespace="http://www.w3.org/1999/xhtml"
+                                     minOccurs="1" maxOccurs="unbounded"
+                                     processContents="skip"/>
+                        </xsd:sequence>
+                    </xsd:complexType>
+                </xsd:element>
+           </xsd:sequence>
+           <xsd:attribute name="period"     type="xsd:duration"/>
+        </xsd:complexType>
+    </xsd:element>
 
-
-
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/AnyNode/input.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/AnyNode/input.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/AnyNode/input.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Extension>
+<Extension xmlns="urn:oasis:names:tc:wsrp:v1:types">
     <some-node>
       <nothing id="1" />
       <something>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/AnyNode/schema.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/AnyNode/schema.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/Wildcards/AnyNode/schema.xsd	(working copy)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified"
-            targetNamespace="urn:oasis:names:tc:wsrp:v1:types">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="urn:oasis:names:tc:wsrp:v1:types"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
 
   <xs:complexType name="Extension">
     <xs:sequence>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/xsi-type/input1.xml
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/xsi-type/input1.xml	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/xsi-type/input1.xml	(working copy)
@@ -1,7 +1,7 @@
-<tst:root    xmlns:tst="http://testspace"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<tst:Root xmlns:tst="http://testspace"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-     <tst:node id="1" typeAAttrib="an attribute" xsi:type="tst:NodeA"/>
+     <tst:node id="1" typeAAttrib="an attribute"      xsi:type="tst:NodeA"/>
      <tst:node id="2" typeBAttrib="another attribute" xsi:type="tst:NodeB" />
 
-</tst:root>
\ No newline at end of file
+</tst:Root>
Index: /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/xsi-type/xsiType.xsd
===================================================================
--- /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/xsi-type/xsiType.xsd	(revision 6731)
+++ /home/ekuns/workspace/castor-4/src/tests/xml/MasterTestSuite/sourcegenerator/xsi-type/xsiType.xsd	(working copy)
@@ -1,37 +1,36 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://testspace"
-            elementFormDefault="qualified"
-            version="1.0">
+           targetNamespace="http://testspace"
+           elementFormDefault="qualified"
+           version="1.0">
 
+    <xs:complexType name="Root">
+        <xs:sequence>
+            <xs:element name="node" type="AbstractNode" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
 
-   <xs:complexType name="Root">
-     <xs:sequence>
-       <xs:element name="node" type="AbstractNode" minOccurs="1" maxOccurs="unbounded"/>
-     </xs:sequence>
-   </xs:complexType>
+    <xs:complexType name="AbstractNode" abstract="true">
+        <xs:attribute name="id" type="xs:int" />
+    </xs:complexType>
 
-   <xs:complexType name="AbstractNode" abstract="true">
-     <xs:attribute name="id" type="xs:int" />
-   </xs:complexType>
+    <xs:element name="NodeA">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="AbstractNode">
+                    <xs:attribute name="typeAAttrib" type="xs:string" />
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+     </xs:element>
 
-   <xs:element name="NodeA">
-     <xs:complexType>
-     <xs:complexContent>
-       <xs:extension base="AbstractNode">
-         <xs:attribute name="typeAAttrib" type="xs:string" />
-       </xs:extension>
-     </xs:complexContent>
-     </xs:complexType>
+    <xs:element name="NodeB">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="AbstractNode">
+                    <xs:attribute name="typeBAttrib" type="xs:string" />
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
     </xs:element>
 
-   <xs:element name="NodeB">
-     <xs:complexType>
-     <xs:complexContent>
-       <xs:extension base="AbstractNode">
-         <xs:attribute name="typeBAttrib" type="xs:string" />
-       </xs:extension>
-     </xs:complexContent>
-     </xs:complexType>
-   </xs:element>
-
 </xs:schema>