Restructure project directory to Maven layout

git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1879063 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index 13d8079..ce0523c 100644
--- a/build.xml
+++ b/build.xml
@@ -24,6 +24,8 @@
     <property name="version.base" value="4.0.0"/>
     <property name="version.rc" value="rc0"/>
 
+    <property name="cases.location" location="src/test/resources"/>
+
     <property name="repository.m2" value="https://repo1.maven.org/maven2"/>
     <property environment="ENV"/>
 
@@ -88,7 +90,7 @@
     <path id="xmlbeans-test">
         <pathelement location="build/classes"/>
         <pathelement location="build/generated-resources"/>
-        <dirset dir="resources" includes="*" excludes="maven"/>
+        <dirset dir="src/main/resources" includes="*" excludes="maven"/>
         <pathelement location="${saxon.jar}"/>
         <pathelement location="test/lib/w3c_domts.jar"/>
         <pathelement location="${junit.jar}"/>
@@ -99,22 +101,8 @@
     </path>
 
     <path id="sources">
-        <pathelement location="src/xmlinputstream"/>
-        <pathelement location="src/xmlpublic"/>
-        <pathelement location="src/common"/>
-        <pathelement location="src/typestore"/>
-        <pathelement location="src/saaj_api"/>
-        <pathelement location="src/store"/>
-        <pathelement location="src/xpath_xquery"/>
+        <pathelement location="src/main/java"/>
         <!-- the next sources depend on the oldxbean.jar -->
-        <pathelement location="src/typeimpl"/>
-        <pathelement location="src/marshal"/>
-        <pathelement location="src/repackage"/>
-        <pathelement location="src/tools"/>
-        <pathelement location="src/toolschema"/>
-        <pathelement location="src/typestore"/>
-        <pathelement location="src/xmlcomp"/>
-        <pathelement location="src/xmlconfig"/>
         <pathelement location="build/generated-sources"/>
     </path>
 
@@ -209,7 +197,7 @@
         <sequential>
             <!-- if replaceHolder: copy TypeSystemHolder and replace package name, then compile -->
             <mkdir dir="@{srcDir}/org/apache/xmlbeans/metadata/system/@{schemaName}"/>
-            <copy file="src/typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java" todir="@{srcDir}/org/apache/xmlbeans/metadata/system/@{schemaName}">
+            <copy file="src/main/java/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java" todir="@{srcDir}/org/apache/xmlbeans/metadata/system/@{schemaName}">
                 <filterchain>
                     <replacestring from="package org.apache.xmlbeans.impl.schema" to="package org.apache.xmlbeans.metadata.system.@{schemaName}"/>
                 </filterchain>
@@ -228,10 +216,10 @@
         <attribute name="classpathref"/>
         <attribute name="dest"/>
         <sequential>
-            <schemaComp schemaName="sXMLLANG" src="src/xmlschema/schema" dest="@{dest}" classpathref="@{classpathref}"/>
-            <schemaComp schemaName="sXMLSCHEMA" src="src/xsdschema/schema" dest="@{dest}" classpathref="@{classpathref}"/>
-            <schemaComp schemaName="sXMLCONFIG" src="src/configschema/schema" dest="@{dest}" classpathref="@{classpathref}"/>
-            <schemaComp schemaName="sXMLTOOLS" src="src/toolschema" dest="@{dest}" classpathref="@{classpathref}"/>
+            <schemaComp schemaName="sXMLLANG" src="src/main/schema/xml" dest="@{dest}" classpathref="@{classpathref}"/>
+            <schemaComp schemaName="sXMLSCHEMA" src="src/main/schema/xsd" dest="@{dest}" classpathref="@{classpathref}"/>
+            <schemaComp schemaName="sXMLCONFIG" src="src/main/schema/config" dest="@{dest}" classpathref="@{classpathref}"/>
+            <schemaComp schemaName="sXMLTOOLS" src="src/main/schema/tools" dest="@{dest}" classpathref="@{classpathref}"/>
         </sequential>
     </macrodef>
 
@@ -260,7 +248,6 @@
         <javac destdir="build/classes" debug="true" debuglevel="lines,vars,source" includeantruntime="true">
             <src refid="sources"/>
             <src path="build/bootstrap/generated-sources"/>
-            <src path="src/typeholder"/>
             <classpath>
                 <path refid="oldxbean"/>
                 <pathelement location="${saxon.jar}"/>
@@ -280,7 +267,7 @@
         <path id="oldschemas">
             <pathelement location="build/classes"/>
             <pathelement location="build/bootstrap/generated-resources"/>
-            <dirset dir="resources" includes="*" excludes="maven"/>
+            <dirset dir="src/main/resources" includes="*" excludes="maven"/>
         </path>
 
         <schemaCompProd classpathref="oldschemas" dest="build"/>
@@ -311,14 +298,14 @@
         <pathconvert property="extensions-dir" pathsep=" ">
             <path>
                 <dirset dir="test/src/xmlobject/extensions/" includes="interfaceFeature/*,prePostFeature/readOnlyBean"/>
-                <dirset dir="test/cases/xbean/extensions/" includes="interfaceFeature/*,prePostFeature/readOnlyBean"/>
+                <dirset dir="${cases.location}/xbean/extensions/" includes="interfaceFeature/*,prePostFeature/readOnlyBean"/>
             </path>
         </pathconvert>
         <schemaComp schemaName="sEXTENSIONS" src="${extensions-dir}" dest="build/test-extensions" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sEXTENSIONS2" src="test/cases/xbean/extensions/prePostFeature/ValueRestriction test/src/xmlobject/extensions/prePostFeature/ValueRestriction" dest="build/test-extensions" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sEXTENSIONS2" src="${cases.location}/xbean/extensions/prePostFeature/ValueRestriction test/src/xmlobject/extensions/prePostFeature/ValueRestriction" dest="build/test-extensions" classpathref="xmlbeans-test"/>
         -->
 
-        <untar src="test/cases/xbean/tranxml.tar.bz2" dest="build/test-tranxml/schemas" compression="bzip2" overwrite="false">
+        <untar src="${cases.location}/xbean/tranxml.tar.bz2" dest="build/test-tranxml/schemas" compression="bzip2" overwrite="false">
             <patternset>
                 <include name="tranxml/Version4.0/schemas/StandAlone/CarLocationMessage_40_LX.xsd"/>
             </patternset>
@@ -326,17 +313,17 @@
         </untar>
         <schemaComp schemaName="sTRAN" src="build/test-tranxml/schemas" dest="build/test-tranxml" classpathref="xmlbeans-test"/>
         <schemaComp schemaName="sTOOLS" src="test/tools/lib/xsl" dest="build/test-tools" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sXMLCURSOR" src="test/cases/xbean/xmlcursor" dest="build/test-xmlcursor" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sDOM" src="test/cases/xbean/dom" dest="build/test-dom" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sSCOMP" src="test/cases/xbean/scomp" dest="build/test-scomp" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sSIMPLE" src="test/cases/xbean/simple" dest="build/test-simple" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sVALIDATE" src="test/cases/xbean/ValidatingStream" dest="build/test-validate" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sUSERTYPE" src="test/cases/xbean/usertype" dest="build/test-usertype" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sLAX" src="test/cases/xbean/compile/scomp/detailed" dest="build/test-lax" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sXMLCURSOR" src="${cases.location}/xbean/xmlcursor" dest="build/test-xmlcursor" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sDOM" src="${cases.location}/xbean/dom" dest="build/test-dom" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sSCOMP" src="${cases.location}/xbean/scomp" dest="build/test-scomp" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sSIMPLE" src="${cases.location}/xbean/simple" dest="build/test-simple" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sVALIDATE" src="${cases.location}/xbean/ValidatingStream" dest="build/test-validate" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sUSERTYPE" src="${cases.location}/xbean/usertype" dest="build/test-usertype" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sLAX" src="${cases.location}/xbean/compile/scomp/detailed" dest="build/test-lax" classpathref="xmlbeans-test"/>
 
         <pathconvert property="xmlobjects" pathsep=" ">
             <path>
-                <fileset dir="test/cases/xbean/xmlobject">
+                <fileset dir="${cases.location}/xbean/xmlobject">
                     <include name="CR192525.xsd"/>
                     <include name="defaults.xsd"/>
                     <include name="easypo.xsd*"/>
@@ -364,7 +351,7 @@
 
         <pathconvert property="miscs" pathsep=" ">
             <path>
-                <fileset dir="test/cases/xbean/misc/jira">
+                <fileset dir="${cases.location}/xbean/misc/jira">
                     <include name="xmlbeans_33b.xsd"/>
                     <include name="xmlbeans_46.xsd"/>
                     <include name="xmlbeans_48.xsd"/>
@@ -381,22 +368,21 @@
                     <include name="xmlbeans_307_maxallowedenum.xsd"/>
                     <include name="xmlbeans_307_morethanallowedenum.xsd"/>
                 </fileset>
-                <pathelement location="test/cases/xbean/xmltokensource"/>
+                <pathelement location="${cases.location}/xbean/xmltokensource"/>
             </path>
         </pathconvert>
         <schemaComp schemaName="sMISC" src="${miscs}" dest="build/test-misc" classpathref="xmlbeans-test"/>
 
         <!-- don't include in normal test classpath -->
-        <schemaComp schemaName="sSYSCACHE" src="test/cases/xbean/misc/syscachetest1.xsd" dest="build/test-syscache/1" classpathref="xmlbeans-test"/>
-        <schemaComp schemaName="sSYSCACHE" src="test/cases/xbean/misc/syscachetest2.xsd" dest="build/test-syscache/2" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sSYSCACHE" src="${cases.location}/xbean/misc/syscachetest1.xsd" dest="build/test-syscache/1" classpathref="xmlbeans-test"/>
+        <schemaComp schemaName="sSYSCACHE" src="${cases.location}/xbean/misc/syscachetest2.xsd" dest="build/test-syscache/2" classpathref="xmlbeans-test"/>
     </target>
 
 
 
     <target name="test-compile" depends="process-test-resources" description="Compile test sources and resources">
         <javac destdir="build/test-classes" debug="true" debuglevel="lines,vars,source" includeantruntime="true" classpathref="xmlbeans-test">
-            <src path="test/src"/>
-            <src path="test/tools/src"/>
+            <src path="src/test/java"/>
             <src>
                 <dirset dir="build" includes="test-*/generated-sources"/>
             </src>
@@ -416,7 +402,7 @@
         <junit printsummary="yes" showoutput="no" haltonerror="true" haltonfailure="true">
             <classpath refid="xmlbeans-test"/>
             <classpath>
-                <pathelement location="test/cases"/>
+                <pathelement location="${cases.location}"/>
                 <pathelement location="build/test-classes"/>
                 <dirset dir="build" includes="test-*/generated-resources"/>
             </classpath>
@@ -429,11 +415,11 @@
             <jvmarg value="-Djava.io.tmpdir=${basedir}/build/tmp"/>
 
             <!-- For tests that need to access case files directly -->
-            <sysproperty key="cases.location" path="${basedir}/test/cases"/>
+            <sysproperty key="cases.location" path="${basedir}/src/test/resources"/>
             <sysproperty key="xbean.rootdir" path="${basedir}"/>
 
             <batchtest fork="yes" todir="build/test-results">
-                <fileset dir="test/src">
+                <fileset dir="src/test/java">
                     <include name="**/*Tests.java"/>
                     <include name="**/*Test.java"/>
                     <exclude name="**/extensions/**"/>
@@ -471,7 +457,7 @@
             <fileset dir="." includes="LICENSE.txt,NOTICE.txt"/>
             <fileset dir="build/generated-resources"/>
             <mappedresources>
-                <fileset dir="resources" excludes="maven"/>
+                <fileset dir="src/main/resources" excludes="maven"/>
                 <cutdirsmapper dirs="1"/>
             </mappedresources>
             <manifest>
@@ -509,6 +495,9 @@
 
         <jar jarfile="build/xmlbeans-${version.base}-sources.jar" update="false" index="false" duplicate="preserve">
             <fileset dir="." includes="LICENSE.txt,NOTICE.txt"/>
+            <fileset dir="src/main/java"/>
+            <fileset dir="build/generated-sources"/>
+<!--
             <mappedresources>
                 <fileset dir="src" excludes="toolschema/**,shell/**"/>
                 <mapper refid="src-mapper"/>
@@ -518,6 +507,7 @@
                 <fileset dir="build" includes="generated-sources/**,generated-resources/**" excludes="**/*.xsb,**/*.class"/>
                 <mapper refid="src-mapper"/>
             </mappedresources>
+-->
 
             <manifest>
                 <section name="org/apache/xmlbeans/">
@@ -537,24 +527,24 @@
         <property name="prefix" value="xmlbeans-${version.base}"/>
 
         <zip destfile="build/xmlbeans-src-${version.base}-${tstamp.dist}.zip" update="false">
-            <zipfileset dir="." excludes="build/**,tmp/**,.idea/**,bin/**,lib/**,/src/shell/**,.settings/**,.project,build.javacheck.xml,release-guide.txt" prefix="${prefix}"/>
-        	<zipfileset dir="src/shell" prefix="${prefix}/bin" />
+            <zipfileset dir="." excludes="build/**,tmp/**,.idea/**,bin/**,lib/**,/src/main/shell/**,.settings/**,.project,build.javacheck.xml,release-guide.txt" prefix="${prefix}"/>
+        	<zipfileset dir="src/main/shell" prefix="${prefix}/bin" />
             <zipfileset dir="build/javadocs" prefix="${prefix}/javadocs" />
         </zip>
         <tar destfile="build/xmlbeans-src-${version.base}-${tstamp.dist}.tgz" compression="gzip">
-            <tarfileset dir="." excludes="build/**,tmp/**,.idea/**,bin/**,lib/**,/src/shell/**,.settings/**,.project,build.javacheck.xml,release-guide.txt" prefix="${prefix}"/>
-        	<tarfileset dir="src/shell" prefix="${prefix}/bin" />
+            <tarfileset dir="." excludes="build/**,tmp/**,.idea/**,bin/**,lib/**,/src/main/shell/**,.settings/**,.project,build.javacheck.xml,release-guide.txt" prefix="${prefix}"/>
+        	<tarfileset dir="src/main/shell" prefix="${prefix}/bin" />
             <tarfileset dir="build/javadocs" prefix="${prefix}/javadocs" />
         </tar>
 
         <zip destfile="build/xmlbeans-bin-${version.base}-${tstamp.dist}.zip" update="false">
             <zipfileset dir="." includes="LICENSE.txt,NOTICE.txt,docs/**" prefix="${prefix}"/>
             <zipfileset dir="samples" includes="Any/**,DateTime/**,MixedContent/**,OrderMatters/**,SchemaEnum/**,Validation/**,XQueryXPath/**,XsdConfig/**" prefix="${prefix}/samples"/>
-            <zipfileset dir="src/shell" prefix="${prefix}/bin"/>
+            <zipfileset dir="src/main/shell" prefix="${prefix}/bin"/>
             <zipfileset dir="xkit" prefix="${prefix}"/>
-            <zipfileset dir="src/xsdschema/schema" includes="*.xsd" prefix="${prefix}/schemas/s4s"/>
-            <zipfileset dir="src/xmlschema/schema" includes="*.xsd" prefix="${prefix}/schemas/s4s"/>
-            <zipfileset dir="test/cases/xbean/xmlobject" includes="numerals.xsd,easypo.xsd*,nameworld.xsd" prefix="${prefix}/schemas"/>
+            <zipfileset dir="src/main/schema/xsd" includes="*.xsd" prefix="${prefix}/schemas/s4s"/>
+            <zipfileset dir="src/main/schema/xml" includes="*.xsd" prefix="${prefix}/schemas/s4s"/>
+            <zipfileset dir="${cases.location}/xbean/xmlobject" includes="numerals.xsd,easypo.xsd*,nameworld.xsd" prefix="${prefix}/schemas"/>
             <zipfileset dir="build" prefix="${prefix}/lib">
                 <include name="xmlbeans-${version.base}.jar"/>
                 <include name="xmlbeans-${version.base}-javadoc.jar"/>
@@ -564,11 +554,11 @@
         <tar destfile="build/xmlbeans-bin-${version.base}-${tstamp.dist}.tgz" compression="gzip">
             <tarfileset dir="." includes="LICENSE.txt,NOTICE.txt,docs/**" prefix="${prefix}"/>
             <tarfileset dir="samples" includes="Any/**,DateTime/**,MixedContent/**,OrderMatters/**,SchemaEnum/**,Validation/**,XQueryXPath/**,XsdConfig/**" prefix="${prefix}/samples"/>
-            <tarfileset dir="src/shell" prefix="${prefix}/bin"/>
+            <tarfileset dir="src/main/shell" prefix="${prefix}/bin"/>
             <tarfileset dir="xkit" prefix="${prefix}"/>
-            <tarfileset dir="src/xsdschema/schema" includes="*.xsd" prefix="${prefix}/schemas/s4s"/>
-            <tarfileset dir="src/xmlschema/schema" includes="*.xsd" prefix="${prefix}/schemas/s4s"/>
-            <tarfileset dir="test/cases/xbean/xmlobject" includes="numerals.xsd,easypo.xsd*,nameworld.xsd" prefix="${prefix}/schemas"/>
+            <tarfileset dir="src/main/schema/xsd" includes="*.xsd" prefix="${prefix}/schemas/s4s"/>
+            <tarfileset dir="src/main/schema/xml" includes="*.xsd" prefix="${prefix}/schemas/s4s"/>
+            <tarfileset dir="${cases.location}/xbean/xmlobject" includes="numerals.xsd,easypo.xsd*,nameworld.xsd" prefix="${prefix}/schemas"/>
             <tarfileset dir="build" prefix="${prefix}/lib">
                 <include name="xmlbeans-${version.base}.jar"/>
                 <include name="xmlbeans-${version.base}-javadoc.jar"/>
@@ -592,7 +582,7 @@
                 <exclude name="**/XML.xsd"/>
                 <exclude name="**/XMLSchema.xsd"/>
             </fileset>
-            <fileset dir="resources">
+            <fileset dir="src/main/resources">
                 <exclude name="**/META-INF/services/**"/>
             </fileset>
         </rat:report>
@@ -666,7 +656,7 @@
     </target>
 
     <target name="mvn-install" depends="maven.ant.tasks-check,package" description="Install XmlBeans artifacts into the local repository. Equivalent of 'mvn install'">
-        <copy file="${basedir}/resources/maven/pom.xml" todir="${basedir}/build" filtering="true">
+        <copy file="${basedir}/main/resources/maven/pom.xml" todir="${basedir}/build" filtering="true">
             <filterset>
                 <filter token="VERSION" value="${version.base}"/>
             </filterset>
diff --git a/src/xmlpublic/org/apache/xmlbeans/BindingConfig.java b/src/main/java/org/apache/xmlbeans/BindingConfig.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/BindingConfig.java
rename to src/main/java/org/apache/xmlbeans/BindingConfig.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/CDataBookmark.java b/src/main/java/org/apache/xmlbeans/CDataBookmark.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/CDataBookmark.java
rename to src/main/java/org/apache/xmlbeans/CDataBookmark.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java b/src/main/java/org/apache/xmlbeans/DelegateXmlObject.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/DelegateXmlObject.java
rename to src/main/java/org/apache/xmlbeans/DelegateXmlObject.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/Filer.java b/src/main/java/org/apache/xmlbeans/Filer.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/Filer.java
rename to src/main/java/org/apache/xmlbeans/Filer.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/FilterXmlObject.java b/src/main/java/org/apache/xmlbeans/FilterXmlObject.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/FilterXmlObject.java
rename to src/main/java/org/apache/xmlbeans/FilterXmlObject.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/GDate.java b/src/main/java/org/apache/xmlbeans/GDate.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/GDate.java
rename to src/main/java/org/apache/xmlbeans/GDate.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java b/src/main/java/org/apache/xmlbeans/GDateBuilder.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java
rename to src/main/java/org/apache/xmlbeans/GDateBuilder.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/GDateSpecification.java b/src/main/java/org/apache/xmlbeans/GDateSpecification.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/GDateSpecification.java
rename to src/main/java/org/apache/xmlbeans/GDateSpecification.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/GDuration.java b/src/main/java/org/apache/xmlbeans/GDuration.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/GDuration.java
rename to src/main/java/org/apache/xmlbeans/GDuration.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java b/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
rename to src/main/java/org/apache/xmlbeans/GDurationBuilder.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/GDurationSpecification.java b/src/main/java/org/apache/xmlbeans/GDurationSpecification.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/GDurationSpecification.java
rename to src/main/java/org/apache/xmlbeans/GDurationSpecification.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/InterfaceExtension.java b/src/main/java/org/apache/xmlbeans/InterfaceExtension.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/InterfaceExtension.java
rename to src/main/java/org/apache/xmlbeans/InterfaceExtension.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/ObjectFactory.java b/src/main/java/org/apache/xmlbeans/ObjectFactory.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/ObjectFactory.java
rename to src/main/java/org/apache/xmlbeans/ObjectFactory.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/PrePostExtension.java b/src/main/java/org/apache/xmlbeans/PrePostExtension.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/PrePostExtension.java
rename to src/main/java/org/apache/xmlbeans/PrePostExtension.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/QNameCache.java b/src/main/java/org/apache/xmlbeans/QNameCache.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/QNameCache.java
rename to src/main/java/org/apache/xmlbeans/QNameCache.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/QNameSet.java b/src/main/java/org/apache/xmlbeans/QNameSet.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/QNameSet.java
rename to src/main/java/org/apache/xmlbeans/QNameSet.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/QNameSetBuilder.java b/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/QNameSetBuilder.java
rename to src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/QNameSetSpecification.java b/src/main/java/org/apache/xmlbeans/QNameSetSpecification.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/QNameSetSpecification.java
rename to src/main/java/org/apache/xmlbeans/QNameSetSpecification.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/ResourceLoader.java b/src/main/java/org/apache/xmlbeans/ResourceLoader.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/ResourceLoader.java
rename to src/main/java/org/apache/xmlbeans/ResourceLoader.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotated.java b/src/main/java/org/apache/xmlbeans/SchemaAnnotated.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaAnnotated.java
rename to src/main/java/org/apache/xmlbeans/SchemaAnnotated.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java b/src/main/java/org/apache/xmlbeans/SchemaAnnotation.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaAnnotation.java
rename to src/main/java/org/apache/xmlbeans/SchemaAnnotation.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaAttributeGroup.java b/src/main/java/org/apache/xmlbeans/SchemaAttributeGroup.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaAttributeGroup.java
rename to src/main/java/org/apache/xmlbeans/SchemaAttributeGroup.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaAttributeModel.java b/src/main/java/org/apache/xmlbeans/SchemaAttributeModel.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaAttributeModel.java
rename to src/main/java/org/apache/xmlbeans/SchemaAttributeModel.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaBookmark.java b/src/main/java/org/apache/xmlbeans/SchemaBookmark.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaBookmark.java
rename to src/main/java/org/apache/xmlbeans/SchemaBookmark.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java b/src/main/java/org/apache/xmlbeans/SchemaCodePrinter.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaCodePrinter.java
rename to src/main/java/org/apache/xmlbeans/SchemaCodePrinter.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaComponent.java b/src/main/java/org/apache/xmlbeans/SchemaComponent.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaComponent.java
rename to src/main/java/org/apache/xmlbeans/SchemaComponent.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaField.java b/src/main/java/org/apache/xmlbeans/SchemaField.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaField.java
rename to src/main/java/org/apache/xmlbeans/SchemaField.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaGlobalAttribute.java b/src/main/java/org/apache/xmlbeans/SchemaGlobalAttribute.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaGlobalAttribute.java
rename to src/main/java/org/apache/xmlbeans/SchemaGlobalAttribute.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaGlobalElement.java b/src/main/java/org/apache/xmlbeans/SchemaGlobalElement.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaGlobalElement.java
rename to src/main/java/org/apache/xmlbeans/SchemaGlobalElement.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaIdentityConstraint.java b/src/main/java/org/apache/xmlbeans/SchemaIdentityConstraint.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaIdentityConstraint.java
rename to src/main/java/org/apache/xmlbeans/SchemaIdentityConstraint.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaLocalAttribute.java b/src/main/java/org/apache/xmlbeans/SchemaLocalAttribute.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaLocalAttribute.java
rename to src/main/java/org/apache/xmlbeans/SchemaLocalAttribute.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaLocalElement.java b/src/main/java/org/apache/xmlbeans/SchemaLocalElement.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaLocalElement.java
rename to src/main/java/org/apache/xmlbeans/SchemaLocalElement.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaModelGroup.java b/src/main/java/org/apache/xmlbeans/SchemaModelGroup.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaModelGroup.java
rename to src/main/java/org/apache/xmlbeans/SchemaModelGroup.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaParticle.java b/src/main/java/org/apache/xmlbeans/SchemaParticle.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaParticle.java
rename to src/main/java/org/apache/xmlbeans/SchemaParticle.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaProperty.java b/src/main/java/org/apache/xmlbeans/SchemaProperty.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaProperty.java
rename to src/main/java/org/apache/xmlbeans/SchemaProperty.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaStringEnumEntry.java b/src/main/java/org/apache/xmlbeans/SchemaStringEnumEntry.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaStringEnumEntry.java
rename to src/main/java/org/apache/xmlbeans/SchemaStringEnumEntry.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaType.java b/src/main/java/org/apache/xmlbeans/SchemaType.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaType.java
rename to src/main/java/org/apache/xmlbeans/SchemaType.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaTypeElementSequencer.java b/src/main/java/org/apache/xmlbeans/SchemaTypeElementSequencer.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaTypeElementSequencer.java
rename to src/main/java/org/apache/xmlbeans/SchemaTypeElementSequencer.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaTypeLoader.java b/src/main/java/org/apache/xmlbeans/SchemaTypeLoader.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaTypeLoader.java
rename to src/main/java/org/apache/xmlbeans/SchemaTypeLoader.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaTypeLoaderException.java b/src/main/java/org/apache/xmlbeans/SchemaTypeLoaderException.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaTypeLoaderException.java
rename to src/main/java/org/apache/xmlbeans/SchemaTypeLoaderException.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SchemaTypeSystem.java b/src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SchemaTypeSystem.java
rename to src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SimpleValue.java b/src/main/java/org/apache/xmlbeans/SimpleValue.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SimpleValue.java
rename to src/main/java/org/apache/xmlbeans/SimpleValue.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/StringEnumAbstractBase.java b/src/main/java/org/apache/xmlbeans/StringEnumAbstractBase.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/StringEnumAbstractBase.java
rename to src/main/java/org/apache/xmlbeans/StringEnumAbstractBase.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/SystemProperties.java b/src/main/java/org/apache/xmlbeans/SystemProperties.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/SystemProperties.java
rename to src/main/java/org/apache/xmlbeans/SystemProperties.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/ThreadLocalUtil.java b/src/main/java/org/apache/xmlbeans/ThreadLocalUtil.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/ThreadLocalUtil.java
rename to src/main/java/org/apache/xmlbeans/ThreadLocalUtil.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/UserType.java b/src/main/java/org/apache/xmlbeans/UserType.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/UserType.java
rename to src/main/java/org/apache/xmlbeans/UserType.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XMLStreamValidationException.java b/src/main/java/org/apache/xmlbeans/XMLStreamValidationException.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XMLStreamValidationException.java
rename to src/main/java/org/apache/xmlbeans/XMLStreamValidationException.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlAnySimpleType.java b/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlAnySimpleType.java
rename to src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlAnyURI.java b/src/main/java/org/apache/xmlbeans/XmlAnyURI.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlAnyURI.java
rename to src/main/java/org/apache/xmlbeans/XmlAnyURI.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlBase64Binary.java b/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlBase64Binary.java
rename to src/main/java/org/apache/xmlbeans/XmlBase64Binary.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlBeans.java b/src/main/java/org/apache/xmlbeans/XmlBeans.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlBeans.java
rename to src/main/java/org/apache/xmlbeans/XmlBeans.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlBoolean.java b/src/main/java/org/apache/xmlbeans/XmlBoolean.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlBoolean.java
rename to src/main/java/org/apache/xmlbeans/XmlBoolean.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlByte.java b/src/main/java/org/apache/xmlbeans/XmlByte.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlByte.java
rename to src/main/java/org/apache/xmlbeans/XmlByte.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlCalendar.java b/src/main/java/org/apache/xmlbeans/XmlCalendar.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlCalendar.java
rename to src/main/java/org/apache/xmlbeans/XmlCalendar.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlCursor.java b/src/main/java/org/apache/xmlbeans/XmlCursor.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlCursor.java
rename to src/main/java/org/apache/xmlbeans/XmlCursor.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlDate.java b/src/main/java/org/apache/xmlbeans/XmlDate.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlDate.java
rename to src/main/java/org/apache/xmlbeans/XmlDate.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlDateTime.java b/src/main/java/org/apache/xmlbeans/XmlDateTime.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlDateTime.java
rename to src/main/java/org/apache/xmlbeans/XmlDateTime.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlDecimal.java b/src/main/java/org/apache/xmlbeans/XmlDecimal.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlDecimal.java
rename to src/main/java/org/apache/xmlbeans/XmlDecimal.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlDocumentProperties.java b/src/main/java/org/apache/xmlbeans/XmlDocumentProperties.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlDocumentProperties.java
rename to src/main/java/org/apache/xmlbeans/XmlDocumentProperties.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlDouble.java b/src/main/java/org/apache/xmlbeans/XmlDouble.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlDouble.java
rename to src/main/java/org/apache/xmlbeans/XmlDouble.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlDuration.java b/src/main/java/org/apache/xmlbeans/XmlDuration.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlDuration.java
rename to src/main/java/org/apache/xmlbeans/XmlDuration.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlENTITIES.java b/src/main/java/org/apache/xmlbeans/XmlENTITIES.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlENTITIES.java
rename to src/main/java/org/apache/xmlbeans/XmlENTITIES.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlENTITY.java b/src/main/java/org/apache/xmlbeans/XmlENTITY.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlENTITY.java
rename to src/main/java/org/apache/xmlbeans/XmlENTITY.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlError.java b/src/main/java/org/apache/xmlbeans/XmlError.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlError.java
rename to src/main/java/org/apache/xmlbeans/XmlError.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java b/src/main/java/org/apache/xmlbeans/XmlErrorCodes.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlErrorCodes.java
rename to src/main/java/org/apache/xmlbeans/XmlErrorCodes.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlException.java b/src/main/java/org/apache/xmlbeans/XmlException.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlException.java
rename to src/main/java/org/apache/xmlbeans/XmlException.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlFactoryHook.java b/src/main/java/org/apache/xmlbeans/XmlFactoryHook.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlFactoryHook.java
rename to src/main/java/org/apache/xmlbeans/XmlFactoryHook.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlFloat.java b/src/main/java/org/apache/xmlbeans/XmlFloat.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlFloat.java
rename to src/main/java/org/apache/xmlbeans/XmlFloat.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlGDay.java b/src/main/java/org/apache/xmlbeans/XmlGDay.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlGDay.java
rename to src/main/java/org/apache/xmlbeans/XmlGDay.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlGMonth.java b/src/main/java/org/apache/xmlbeans/XmlGMonth.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlGMonth.java
rename to src/main/java/org/apache/xmlbeans/XmlGMonth.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlGMonthDay.java b/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlGMonthDay.java
rename to src/main/java/org/apache/xmlbeans/XmlGMonthDay.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlGYear.java b/src/main/java/org/apache/xmlbeans/XmlGYear.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlGYear.java
rename to src/main/java/org/apache/xmlbeans/XmlGYear.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlGYearMonth.java b/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlGYearMonth.java
rename to src/main/java/org/apache/xmlbeans/XmlGYearMonth.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlHexBinary.java b/src/main/java/org/apache/xmlbeans/XmlHexBinary.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlHexBinary.java
rename to src/main/java/org/apache/xmlbeans/XmlHexBinary.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlID.java b/src/main/java/org/apache/xmlbeans/XmlID.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlID.java
rename to src/main/java/org/apache/xmlbeans/XmlID.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlIDREF.java b/src/main/java/org/apache/xmlbeans/XmlIDREF.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlIDREF.java
rename to src/main/java/org/apache/xmlbeans/XmlIDREF.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlIDREFS.java b/src/main/java/org/apache/xmlbeans/XmlIDREFS.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlIDREFS.java
rename to src/main/java/org/apache/xmlbeans/XmlIDREFS.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlInt.java b/src/main/java/org/apache/xmlbeans/XmlInt.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlInt.java
rename to src/main/java/org/apache/xmlbeans/XmlInt.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlInteger.java b/src/main/java/org/apache/xmlbeans/XmlInteger.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlInteger.java
rename to src/main/java/org/apache/xmlbeans/XmlInteger.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlLanguage.java b/src/main/java/org/apache/xmlbeans/XmlLanguage.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlLanguage.java
rename to src/main/java/org/apache/xmlbeans/XmlLanguage.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlLineNumber.java b/src/main/java/org/apache/xmlbeans/XmlLineNumber.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlLineNumber.java
rename to src/main/java/org/apache/xmlbeans/XmlLineNumber.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlLong.java b/src/main/java/org/apache/xmlbeans/XmlLong.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlLong.java
rename to src/main/java/org/apache/xmlbeans/XmlLong.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlNCName.java b/src/main/java/org/apache/xmlbeans/XmlNCName.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlNCName.java
rename to src/main/java/org/apache/xmlbeans/XmlNCName.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlNMTOKEN.java b/src/main/java/org/apache/xmlbeans/XmlNMTOKEN.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlNMTOKEN.java
rename to src/main/java/org/apache/xmlbeans/XmlNMTOKEN.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlNMTOKENS.java b/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlNMTOKENS.java
rename to src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlNOTATION.java b/src/main/java/org/apache/xmlbeans/XmlNOTATION.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlNOTATION.java
rename to src/main/java/org/apache/xmlbeans/XmlNOTATION.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlName.java b/src/main/java/org/apache/xmlbeans/XmlName.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlName.java
rename to src/main/java/org/apache/xmlbeans/XmlName.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlNegativeInteger.java b/src/main/java/org/apache/xmlbeans/XmlNegativeInteger.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlNegativeInteger.java
rename to src/main/java/org/apache/xmlbeans/XmlNegativeInteger.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlNonNegativeInteger.java b/src/main/java/org/apache/xmlbeans/XmlNonNegativeInteger.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlNonNegativeInteger.java
rename to src/main/java/org/apache/xmlbeans/XmlNonNegativeInteger.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlNonPositiveInteger.java b/src/main/java/org/apache/xmlbeans/XmlNonPositiveInteger.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlNonPositiveInteger.java
rename to src/main/java/org/apache/xmlbeans/XmlNonPositiveInteger.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlNormalizedString.java b/src/main/java/org/apache/xmlbeans/XmlNormalizedString.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlNormalizedString.java
rename to src/main/java/org/apache/xmlbeans/XmlNormalizedString.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlObject.java b/src/main/java/org/apache/xmlbeans/XmlObject.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlObject.java
rename to src/main/java/org/apache/xmlbeans/XmlObject.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlOptionCharEscapeMap.java b/src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlOptionCharEscapeMap.java
rename to src/main/java/org/apache/xmlbeans/XmlOptionCharEscapeMap.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlOptions.java b/src/main/java/org/apache/xmlbeans/XmlOptions.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlOptions.java
rename to src/main/java/org/apache/xmlbeans/XmlOptions.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlOptionsBean.java b/src/main/java/org/apache/xmlbeans/XmlOptionsBean.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlOptionsBean.java
rename to src/main/java/org/apache/xmlbeans/XmlOptionsBean.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlPositiveInteger.java b/src/main/java/org/apache/xmlbeans/XmlPositiveInteger.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlPositiveInteger.java
rename to src/main/java/org/apache/xmlbeans/XmlPositiveInteger.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlQName.java b/src/main/java/org/apache/xmlbeans/XmlQName.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlQName.java
rename to src/main/java/org/apache/xmlbeans/XmlQName.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlRuntimeException.java b/src/main/java/org/apache/xmlbeans/XmlRuntimeException.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlRuntimeException.java
rename to src/main/java/org/apache/xmlbeans/XmlRuntimeException.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlSaxHandler.java b/src/main/java/org/apache/xmlbeans/XmlSaxHandler.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlSaxHandler.java
rename to src/main/java/org/apache/xmlbeans/XmlSaxHandler.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlShort.java b/src/main/java/org/apache/xmlbeans/XmlShort.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlShort.java
rename to src/main/java/org/apache/xmlbeans/XmlShort.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlSimpleList.java b/src/main/java/org/apache/xmlbeans/XmlSimpleList.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlSimpleList.java
rename to src/main/java/org/apache/xmlbeans/XmlSimpleList.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlString.java b/src/main/java/org/apache/xmlbeans/XmlString.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlString.java
rename to src/main/java/org/apache/xmlbeans/XmlString.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlTime.java b/src/main/java/org/apache/xmlbeans/XmlTime.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlTime.java
rename to src/main/java/org/apache/xmlbeans/XmlTime.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlToken.java b/src/main/java/org/apache/xmlbeans/XmlToken.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlToken.java
rename to src/main/java/org/apache/xmlbeans/XmlToken.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlTokenSource.java b/src/main/java/org/apache/xmlbeans/XmlTokenSource.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlTokenSource.java
rename to src/main/java/org/apache/xmlbeans/XmlTokenSource.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlUnsignedByte.java b/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlUnsignedByte.java
rename to src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlUnsignedInt.java b/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlUnsignedInt.java
rename to src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlUnsignedLong.java b/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlUnsignedLong.java
rename to src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlUnsignedShort.java b/src/main/java/org/apache/xmlbeans/XmlUnsignedShort.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlUnsignedShort.java
rename to src/main/java/org/apache/xmlbeans/XmlUnsignedShort.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java b/src/main/java/org/apache/xmlbeans/XmlValidationError.java
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/XmlValidationError.java
rename to src/main/java/org/apache/xmlbeans/XmlValidationError.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/DefaultClassLoaderResourceLoader.java b/src/main/java/org/apache/xmlbeans/impl/common/DefaultClassLoaderResourceLoader.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/DefaultClassLoaderResourceLoader.java
rename to src/main/java/org/apache/xmlbeans/impl/common/DefaultClassLoaderResourceLoader.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/DocumentHelper.java b/src/main/java/org/apache/xmlbeans/impl/common/DocumentHelper.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/DocumentHelper.java
rename to src/main/java/org/apache/xmlbeans/impl/common/DocumentHelper.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/EncodingMap.java b/src/main/java/org/apache/xmlbeans/impl/common/EncodingMap.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/EncodingMap.java
rename to src/main/java/org/apache/xmlbeans/impl/common/EncodingMap.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/GenericXmlInputStream.java b/src/main/java/org/apache/xmlbeans/impl/common/GenericXmlInputStream.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/GenericXmlInputStream.java
rename to src/main/java/org/apache/xmlbeans/impl/common/GenericXmlInputStream.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/GlobalLock.java b/src/main/java/org/apache/xmlbeans/impl/common/GlobalLock.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/GlobalLock.java
rename to src/main/java/org/apache/xmlbeans/impl/common/GlobalLock.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/IOUtil.java b/src/main/java/org/apache/xmlbeans/impl/common/IOUtil.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/IOUtil.java
rename to src/main/java/org/apache/xmlbeans/impl/common/IOUtil.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/IdentityConstraint.java b/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/IdentityConstraint.java
rename to src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/InvalidLexicalValueException.java b/src/main/java/org/apache/xmlbeans/impl/common/InvalidLexicalValueException.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/InvalidLexicalValueException.java
rename to src/main/java/org/apache/xmlbeans/impl/common/InvalidLexicalValueException.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/JarHelper.java b/src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/JarHelper.java
rename to src/main/java/org/apache/xmlbeans/impl/common/JarHelper.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/Levenshtein.java b/src/main/java/org/apache/xmlbeans/impl/common/Levenshtein.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/Levenshtein.java
rename to src/main/java/org/apache/xmlbeans/impl/common/Levenshtein.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/LoadSaveUtils.java b/src/main/java/org/apache/xmlbeans/impl/common/LoadSaveUtils.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/LoadSaveUtils.java
rename to src/main/java/org/apache/xmlbeans/impl/common/LoadSaveUtils.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/Mutex.java b/src/main/java/org/apache/xmlbeans/impl/common/Mutex.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/Mutex.java
rename to src/main/java/org/apache/xmlbeans/impl/common/Mutex.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/NameUtil.java b/src/main/java/org/apache/xmlbeans/impl/common/NameUtil.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/NameUtil.java
rename to src/main/java/org/apache/xmlbeans/impl/common/NameUtil.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/NullLogger.java b/src/main/java/org/apache/xmlbeans/impl/common/NullLogger.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/NullLogger.java
rename to src/main/java/org/apache/xmlbeans/impl/common/NullLogger.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/PrefixResolver.java b/src/main/java/org/apache/xmlbeans/impl/common/PrefixResolver.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/PrefixResolver.java
rename to src/main/java/org/apache/xmlbeans/impl/common/PrefixResolver.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/PushedInputStream.java b/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/PushedInputStream.java
rename to src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/QNameHelper.java b/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/QNameHelper.java
rename to src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/ReaderInputStream.java b/src/main/java/org/apache/xmlbeans/impl/common/ReaderInputStream.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/ReaderInputStream.java
rename to src/main/java/org/apache/xmlbeans/impl/common/ReaderInputStream.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/ResolverUtil.java b/src/main/java/org/apache/xmlbeans/impl/common/ResolverUtil.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/ResolverUtil.java
rename to src/main/java/org/apache/xmlbeans/impl/common/ResolverUtil.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/SAXHelper.java b/src/main/java/org/apache/xmlbeans/impl/common/SAXHelper.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/SAXHelper.java
rename to src/main/java/org/apache/xmlbeans/impl/common/SAXHelper.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/Sax2Dom.java b/src/main/java/org/apache/xmlbeans/impl/common/Sax2Dom.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/Sax2Dom.java
rename to src/main/java/org/apache/xmlbeans/impl/common/Sax2Dom.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java b/src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java
rename to src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlInputStream.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/SniffedXmlReader.java b/src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlReader.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/SniffedXmlReader.java
rename to src/main/java/org/apache/xmlbeans/impl/common/SniffedXmlReader.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/SoftCache.java b/src/main/java/org/apache/xmlbeans/impl/common/SoftCache.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/SoftCache.java
rename to src/main/java/org/apache/xmlbeans/impl/common/SoftCache.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/StaxHelper.java b/src/main/java/org/apache/xmlbeans/impl/common/StaxHelper.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/StaxHelper.java
rename to src/main/java/org/apache/xmlbeans/impl/common/StaxHelper.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/SystemCache.java b/src/main/java/org/apache/xmlbeans/impl/common/SystemCache.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/SystemCache.java
rename to src/main/java/org/apache/xmlbeans/impl/common/SystemCache.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/ValidationContext.java b/src/main/java/org/apache/xmlbeans/impl/common/ValidationContext.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/ValidationContext.java
rename to src/main/java/org/apache/xmlbeans/impl/common/ValidationContext.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/ValidatorListener.java b/src/main/java/org/apache/xmlbeans/impl/common/ValidatorListener.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/ValidatorListener.java
rename to src/main/java/org/apache/xmlbeans/impl/common/ValidatorListener.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XBLogFactory.java b/src/main/java/org/apache/xmlbeans/impl/common/XBLogFactory.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XBLogFactory.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XBLogFactory.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XBLogger.java b/src/main/java/org/apache/xmlbeans/impl/common/XBLogger.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XBLogger.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XBLogger.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XBeanDebug.java b/src/main/java/org/apache/xmlbeans/impl/common/XBeanDebug.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XBeanDebug.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XBeanDebug.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XMLBeansConstants.java b/src/main/java/org/apache/xmlbeans/impl/common/XMLBeansConstants.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XMLBeansConstants.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XMLBeansConstants.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XMLChar.java b/src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XMLChar.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XMLChar.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XMLNameHelper.java b/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XMLNameHelper.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XPath.java b/src/main/java/org/apache/xmlbeans/impl/common/XPath.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XPath.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XPath.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlEncodingSniffer.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlErrorPrinter.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlErrorPrinter.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlErrorPrinter.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlErrorPrinter.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlErrorWatcher.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlErrorWatcher.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlErrorWatcher.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlErrorWatcher.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlEventBase.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlEventBase.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlEventBase.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlEventBase.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlLocale.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlLocale.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlLocale.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlLocale.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlNameImpl.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlNameImpl.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlNameImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlNameImpl.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlObjectList.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlObjectList.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlObjectList.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlObjectList.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlReaderToWriter.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlStreamUtils.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/XmlWhitespace.java b/src/main/java/org/apache/xmlbeans/impl/common/XmlWhitespace.java
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/XmlWhitespace.java
rename to src/main/java/org/apache/xmlbeans/impl/common/XmlWhitespace.java
diff --git a/src/common/org/apache/xmlbeans/impl/common/readme.txt b/src/main/java/org/apache/xmlbeans/impl/common/readme.txt
similarity index 100%
rename from src/common/org/apache/xmlbeans/impl/common/readme.txt
rename to src/main/java/org/apache/xmlbeans/impl/common/readme.txt
diff --git a/src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java b/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
similarity index 100%
rename from src/xmlconfig/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
diff --git a/src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java b/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
similarity index 100%
rename from src/xmlconfig/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
diff --git a/src/xmlconfig/org/apache/xmlbeans/impl/config/NameSet.java b/src/main/java/org/apache/xmlbeans/impl/config/NameSet.java
similarity index 100%
rename from src/xmlconfig/org/apache/xmlbeans/impl/config/NameSet.java
rename to src/main/java/org/apache/xmlbeans/impl/config/NameSet.java
diff --git a/src/xmlconfig/org/apache/xmlbeans/impl/config/NameSetBuilder.java b/src/main/java/org/apache/xmlbeans/impl/config/NameSetBuilder.java
similarity index 100%
rename from src/xmlconfig/org/apache/xmlbeans/impl/config/NameSetBuilder.java
rename to src/main/java/org/apache/xmlbeans/impl/config/NameSetBuilder.java
diff --git a/src/xmlconfig/org/apache/xmlbeans/impl/config/Parser.java b/src/main/java/org/apache/xmlbeans/impl/config/Parser.java
similarity index 100%
rename from src/xmlconfig/org/apache/xmlbeans/impl/config/Parser.java
rename to src/main/java/org/apache/xmlbeans/impl/config/Parser.java
diff --git a/src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java b/src/main/java/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java
similarity index 100%
rename from src/xmlconfig/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/config/PrePostExtensionImpl.java
diff --git a/src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java b/src/main/java/org/apache/xmlbeans/impl/config/UserTypeImpl.java
similarity index 100%
rename from src/xmlconfig/org/apache/xmlbeans/impl/config/UserTypeImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/config/UserTypeImpl.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2XsdOptions.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/RussianDollStrategy.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/SalamiSliceStrategy.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/VenetianBlindStrategy.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/XsdGenStrategy.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/XsdGenStrategy.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/XsdGenStrategy.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/XsdGenStrategy.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Attribute.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/Element.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Element.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/util/Element.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Element.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/Type.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Type.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/util/Type.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/Type.java
diff --git a/src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java b/src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/inst2xsd/util/TypeSystemHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/BMPattern.java b/src/main/java/org/apache/xmlbeans/impl/regex/BMPattern.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/BMPattern.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/BMPattern.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/Match.java b/src/main/java/org/apache/xmlbeans/impl/regex/Match.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/Match.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/Match.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/Op.java b/src/main/java/org/apache/xmlbeans/impl/regex/Op.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/Op.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/Op.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/ParseException.java b/src/main/java/org/apache/xmlbeans/impl/regex/ParseException.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/ParseException.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/ParseException.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java b/src/main/java/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/ParserForXMLSchema.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/README.txt b/src/main/java/org/apache/xmlbeans/impl/regex/README.txt
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/README.txt
rename to src/main/java/org/apache/xmlbeans/impl/regex/README.txt
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/REUtil.java b/src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/REUtil.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/REUtil.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/RangeToken.java b/src/main/java/org/apache/xmlbeans/impl/regex/RangeToken.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/RangeToken.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/RangeToken.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/RegexParser.java b/src/main/java/org/apache/xmlbeans/impl/regex/RegexParser.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/RegexParser.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/RegexParser.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java b/src/main/java/org/apache/xmlbeans/impl/regex/RegularExpression.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/RegularExpression.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/RegularExpression.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java b/src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/SchemaRegularExpression.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/regex/Token.java b/src/main/java/org/apache/xmlbeans/impl/regex/Token.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/regex/Token.java
rename to src/main/java/org/apache/xmlbeans/impl/regex/Token.java
diff --git a/src/repackage/org/apache/xmlbeans/impl/repackage/EditBuildScript.java b/src/main/java/org/apache/xmlbeans/impl/repackage/EditBuildScript.java
similarity index 100%
rename from src/repackage/org/apache/xmlbeans/impl/repackage/EditBuildScript.java
rename to src/main/java/org/apache/xmlbeans/impl/repackage/EditBuildScript.java
diff --git a/src/repackage/org/apache/xmlbeans/impl/repackage/Repackage.java b/src/main/java/org/apache/xmlbeans/impl/repackage/Repackage.java
similarity index 100%
rename from src/repackage/org/apache/xmlbeans/impl/repackage/Repackage.java
rename to src/main/java/org/apache/xmlbeans/impl/repackage/Repackage.java
diff --git a/src/repackage/org/apache/xmlbeans/impl/repackage/Repackager.java b/src/main/java/org/apache/xmlbeans/impl/repackage/Repackager.java
similarity index 100%
rename from src/repackage/org/apache/xmlbeans/impl/repackage/Repackager.java
rename to src/main/java/org/apache/xmlbeans/impl/repackage/Repackager.java
diff --git a/src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExt.java b/src/main/java/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExt.java
similarity index 100%
rename from src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExt.java
rename to src/main/java/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExt.java
diff --git a/src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java b/src/main/java/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java
similarity index 100%
rename from src/marshal/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/richParser/XMLStreamReaderExtImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java b/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/ClassLoaderResourceLoader.java b/src/main/java/org/apache/xmlbeans/impl/schema/ClassLoaderResourceLoader.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/ClassLoaderResourceLoader.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/ClassLoaderResourceLoader.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/FileResourceLoader.java b/src/main/java/org/apache/xmlbeans/impl/schema/FileResourceLoader.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/FileResourceLoader.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/FileResourceLoader.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/PathResourceLoader.java b/src/main/java/org/apache/xmlbeans/impl/schema/PathResourceLoader.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/PathResourceLoader.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/PathResourceLoader.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaAnnotationImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAttributeGroupImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeGroupImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAttributeGroupImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeGroupImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaAttributeModelImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaContainer.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaContainer.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaContainer.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaContainer.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaDependencies.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaDependencies.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaDependencies.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaGlobalAttributeImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaGlobalAttributeImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaGlobalAttributeImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaGlobalAttributeImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaGlobalElementImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaGlobalElementImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaGlobalElementImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaGlobalElementImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaIdentityConstraintImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaIdentityConstraintImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaIdentityConstraintImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaIdentityConstraintImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaLocalAttributeImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaLocalAttributeImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaLocalAttributeImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaLocalAttributeImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaLocalElementImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaLocalElementImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaLocalElementImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaLocalElementImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaModelGroupImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaModelGroupImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaModelGroupImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaModelGroupImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaParticleImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaParticleImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaParticleImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaParticleImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaPropertyImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaPropertyImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaPropertyImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaPropertyImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaStringEnumEntryImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaStringEnumEntryImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaStringEnumEntryImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaStringEnumEntryImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderBase.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeVisitorImpl.java b/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeVisitorImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeVisitorImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeVisitorImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/SoapEncSchemaTypeSystem.java b/src/main/java/org/apache/xmlbeans/impl/schema/SoapEncSchemaTypeSystem.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/SoapEncSchemaTypeSystem.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/SoapEncSchemaTypeSystem.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/StscChecker.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscChecker.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/StscChecker.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/StscChecker.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/StscComplexTypeResolver.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscImporter.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/StscImporter.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/StscImporter.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/StscJavaizer.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscJavaizer.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/StscJavaizer.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/StscJavaizer.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscResolver.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/StscResolver.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/StscResolver.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/StscState.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/StscState.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java b/src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/StscTranslator.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/StscTranslator.java
diff --git a/src/typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java b/src/main/java/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java
similarity index 100%
rename from src/typeholder/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/TypeSystemHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java b/src/main/java/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/XQuerySchemaTypeSystem.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/schema/XmlValueRef.java b/src/main/java/org/apache/xmlbeans/impl/schema/XmlValueRef.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/schema/XmlValueRef.java
rename to src/main/java/org/apache/xmlbeans/impl/schema/XmlValueRef.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/AttachmentPart.java b/src/main/java/org/apache/xmlbeans/impl/soap/AttachmentPart.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/AttachmentPart.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/AttachmentPart.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/Detail.java b/src/main/java/org/apache/xmlbeans/impl/soap/Detail.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/Detail.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/Detail.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/DetailEntry.java b/src/main/java/org/apache/xmlbeans/impl/soap/DetailEntry.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/DetailEntry.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/DetailEntry.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java b/src/main/java/org/apache/xmlbeans/impl/soap/FactoryFinder.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/FactoryFinder.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/FactoryFinder.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/MessageFactory.java b/src/main/java/org/apache/xmlbeans/impl/soap/MessageFactory.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/MessageFactory.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/MessageFactory.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/MimeHeader.java b/src/main/java/org/apache/xmlbeans/impl/soap/MimeHeader.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/MimeHeader.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/MimeHeader.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/MimeHeaders.java b/src/main/java/org/apache/xmlbeans/impl/soap/MimeHeaders.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/MimeHeaders.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/MimeHeaders.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/Name.java b/src/main/java/org/apache/xmlbeans/impl/soap/Name.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/Name.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/Name.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/Node.java b/src/main/java/org/apache/xmlbeans/impl/soap/Node.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/Node.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/Node.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPBody.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPBody.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPBody.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPBody.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPBodyElement.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPBodyElement.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPBodyElement.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPBodyElement.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPConnection.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPConnection.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPConnection.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPConnection.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPConnectionFactory.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPConnectionFactory.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPConnectionFactory.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPConnectionFactory.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPConstants.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPConstants.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPConstants.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPConstants.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPElement.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPElement.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPElement.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPElement.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPElementFactory.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPElementFactory.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPElementFactory.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPElementFactory.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPEnvelope.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPEnvelope.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPEnvelope.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPEnvelope.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPException.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPException.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPException.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPException.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPFactory.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPFactory.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPFactory.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPFactory.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPFault.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPFault.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPFault.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPFault.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPFaultElement.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPFaultElement.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPFaultElement.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPFaultElement.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPHeader.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPHeader.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPHeader.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPHeader.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPHeaderElement.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPHeaderElement.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPHeaderElement.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPHeaderElement.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPMessage.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPMessage.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPMessage.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPMessage.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPPart.java b/src/main/java/org/apache/xmlbeans/impl/soap/SOAPPart.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/SOAPPart.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/SOAPPart.java
diff --git a/src/saaj_api/org/apache/xmlbeans/impl/soap/Text.java b/src/main/java/org/apache/xmlbeans/impl/soap/Text.java
similarity index 100%
rename from src/saaj_api/org/apache/xmlbeans/impl/soap/Text.java
rename to src/main/java/org/apache/xmlbeans/impl/soap/Text.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/AttrIdXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/AttrIdXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/AttrIdXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/AttrIdXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/AttrXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/AttrXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/AttrXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/AttrXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Bookmark.java b/src/main/java/org/apache/xmlbeans/impl/store/Bookmark.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Bookmark.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Bookmark.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/CdataNode.java b/src/main/java/org/apache/xmlbeans/impl/store/CdataNode.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/CdataNode.java
rename to src/main/java/org/apache/xmlbeans/impl/store/CdataNode.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/CharNode.java b/src/main/java/org/apache/xmlbeans/impl/store/CharNode.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/CharNode.java
rename to src/main/java/org/apache/xmlbeans/impl/store/CharNode.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/CharUtil.java b/src/main/java/org/apache/xmlbeans/impl/store/CharUtil.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/CharUtil.java
rename to src/main/java/org/apache/xmlbeans/impl/store/CharUtil.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/CommentXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/CommentXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/CommentXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/CommentXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Cur.java b/src/main/java/org/apache/xmlbeans/impl/store/Cur.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Cur.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Cur.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Cursor.java b/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Cursor.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/DetailEntryXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/DetailEntryXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/DetailEntryXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/DetailEntryXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/DetailXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/DetailXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/DetailXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/DetailXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/DocumentFragXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/DocumentFragXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/DocumentFragXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/DocumentFragXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/DocumentXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/DocumentXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/DocumentXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/DocumentXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/DomImpl.java b/src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/DomImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/store/DomImpl.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/DomSaver.java b/src/main/java/org/apache/xmlbeans/impl/store/DomSaver.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/DomSaver.java
rename to src/main/java/org/apache/xmlbeans/impl/store/DomSaver.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/ElementAttributes.java b/src/main/java/org/apache/xmlbeans/impl/store/ElementAttributes.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/ElementAttributes.java
rename to src/main/java/org/apache/xmlbeans/impl/store/ElementAttributes.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/ElementXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/ElementXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/ElementXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/ElementXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Jsr173.java b/src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Jsr173.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Jsr173.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Locale.java b/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Locale.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Locale.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/NamedNodeXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/NamedNodeXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/NamedNodeXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/NamedNodeXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/NodeXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/NodeXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/NodeXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/NodeXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Path.java b/src/main/java/org/apache/xmlbeans/impl/store/Path.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Path.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Path.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/PathDelegate.java b/src/main/java/org/apache/xmlbeans/impl/store/PathDelegate.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/PathDelegate.java
rename to src/main/java/org/apache/xmlbeans/impl/store/PathDelegate.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/ProcInstXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/ProcInstXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/ProcInstXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/ProcInstXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Public2.java b/src/main/java/org/apache/xmlbeans/impl/store/Public2.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Public2.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Public2.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/QNameFactory.java b/src/main/java/org/apache/xmlbeans/impl/store/QNameFactory.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/QNameFactory.java
rename to src/main/java/org/apache/xmlbeans/impl/store/QNameFactory.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Query.java b/src/main/java/org/apache/xmlbeans/impl/store/Query.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Query.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Query.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/QueryDelegate.java b/src/main/java/org/apache/xmlbeans/impl/store/QueryDelegate.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/QueryDelegate.java
rename to src/main/java/org/apache/xmlbeans/impl/store/QueryDelegate.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Saaj.java b/src/main/java/org/apache/xmlbeans/impl/store/Saaj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Saaj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Saaj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SaajCdataNode.java b/src/main/java/org/apache/xmlbeans/impl/store/SaajCdataNode.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SaajCdataNode.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SaajCdataNode.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SaajTextNode.java b/src/main/java/org/apache/xmlbeans/impl/store/SaajTextNode.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SaajTextNode.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SaajTextNode.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Saver.java b/src/main/java/org/apache/xmlbeans/impl/store/Saver.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Saver.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Saver.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapBodyElementXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapBodyElementXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapBodyElementXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapBodyElementXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapBodyXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapBodyXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapBodyXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapBodyXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapElementXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapElementXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapElementXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapElementXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapEnvelopeXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapEnvelopeXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapEnvelopeXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapEnvelopeXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapFaultElementXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapFaultElementXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapFaultElementXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapFaultElementXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapFaultXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapFaultXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapFaultXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapFaultXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapHeaderElementXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapHeaderElementXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapHeaderElementXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapHeaderElementXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapHeaderXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapHeaderXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapHeaderXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapHeaderXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapPartDocXobj.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapPartDocXobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapPartDocXobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapPartDocXobj.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/SoapPartDom.java b/src/main/java/org/apache/xmlbeans/impl/store/SoapPartDom.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/SoapPartDom.java
rename to src/main/java/org/apache/xmlbeans/impl/store/SoapPartDom.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/TextNode.java b/src/main/java/org/apache/xmlbeans/impl/store/TextNode.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/TextNode.java
rename to src/main/java/org/apache/xmlbeans/impl/store/TextNode.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Validate.java b/src/main/java/org/apache/xmlbeans/impl/store/Validate.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Validate.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Validate.java
diff --git a/src/store/org/apache/xmlbeans/impl/store/Xobj.java b/src/main/java/org/apache/xmlbeans/impl/store/Xobj.java
similarity index 100%
rename from src/store/org/apache/xmlbeans/impl/store/Xobj.java
rename to src/main/java/org/apache/xmlbeans/impl/store/Xobj.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java b/src/main/java/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/BaseSchemaResourceManager.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/CodeGenUtil.java b/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java b/src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/CommandLine.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java b/src/main/java/org/apache/xmlbeans/impl/tool/Diff.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/Diff.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/Diff.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/Extension.java b/src/main/java/org/apache/xmlbeans/impl/tool/Extension.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/Extension.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/Extension.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java b/src/main/java/org/apache/xmlbeans/impl/tool/FactorImports.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/FactorImports.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/FactorImports.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/InstanceValidator.java b/src/main/java/org/apache/xmlbeans/impl/tool/InstanceValidator.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/InstanceValidator.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/InstanceValidator.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/PrettyPrinter.java b/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/PrettyPrinter.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/RunXQuery.java b/src/main/java/org/apache/xmlbeans/impl/tool/RunXQuery.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/RunXQuery.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/RunXQuery.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java b/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java b/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompilerExtension.java b/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCompilerExtension.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompilerExtension.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/SchemaCompilerExtension.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java b/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCopy.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCopy.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/SchemaCopy.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java b/src/main/java/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java b/src/main/java/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/SchemaResourceManager.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java b/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java b/src/main/java/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java b/src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBeanXSTCHarness.java b/src/main/java/org/apache/xmlbeans/impl/tool/XMLBeanXSTCHarness.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBeanXSTCHarness.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/XMLBeanXSTCHarness.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java b/src/main/java/org/apache/xmlbeans/impl/tool/XSTCTester.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/XSTCTester.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/XSTCTester.java
diff --git a/src/xmlcomp/org/apache/xmlbeans/impl/tool/XsbDumper.java b/src/main/java/org/apache/xmlbeans/impl/tool/XsbDumper.java
similarity index 100%
rename from src/xmlcomp/org/apache/xmlbeans/impl/tool/XsbDumper.java
rename to src/main/java/org/apache/xmlbeans/impl/tool/XsbDumper.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java b/src/main/java/org/apache/xmlbeans/impl/util/Base64.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/util/Base64.java
rename to src/main/java/org/apache/xmlbeans/impl/util/Base64.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/util/Diff.java b/src/main/java/org/apache/xmlbeans/impl/util/Diff.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/util/Diff.java
rename to src/main/java/org/apache/xmlbeans/impl/util/Diff.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/util/FilerImpl.java b/src/main/java/org/apache/xmlbeans/impl/util/FilerImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/util/FilerImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/util/FilerImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java b/src/main/java/org/apache/xmlbeans/impl/util/HexBin.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/util/HexBin.java
rename to src/main/java/org/apache/xmlbeans/impl/util/HexBin.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/util/XsTypeConverter.java b/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/util/XsTypeConverter.java
rename to src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java b/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java
rename to src/main/java/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java b/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java
rename to src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLInputStream.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java b/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
rename to src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/validator/Validator.java b/src/main/java/org/apache/xmlbeans/impl/validator/Validator.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/validator/Validator.java
rename to src/main/java/org/apache/xmlbeans/impl/validator/Validator.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatorUtil.java b/src/main/java/org/apache/xmlbeans/impl/validator/ValidatorUtil.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/validator/ValidatorUtil.java
rename to src/main/java/org/apache/xmlbeans/impl/validator/ValidatorUtil.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaBase64Holder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaBase64Holder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaBase64Holder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaBase64Holder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaBase64HolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaBase64HolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaBase64HolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaBase64HolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaBooleanHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaBooleanHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaBooleanHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaBooleanHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaBooleanHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaBooleanHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaBooleanHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaBooleanHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaDoubleHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaDoubleHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaDoubleHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaDoubleHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaDoubleHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaDoubleHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaDoubleHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaDoubleHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaFloatHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaFloatHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaFloatHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaFloatHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaFloatHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaFloatHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaFloatHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaFloatHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaGDateHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaGDateHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaGDateHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaGDateHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaGDurationHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaGDurationHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaGDurationHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaGDurationHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaHexBinaryHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaHexBinaryHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaHexBinaryHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaHexBinaryHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaHexBinaryHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaHexBinaryHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaHexBinaryHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaHexBinaryHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntegerHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaIntegerHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaLongHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaLongHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaNotationHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaNotationHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaNotationHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaNotationHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaNotationHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaNotationHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaNotationHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaNotationHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaQNameHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaQNameHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaQNameHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaQNameHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringEnumerationHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaStringEnumerationHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringEnumerationHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaStringEnumerationHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaStringHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaStringHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaStringHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaStringHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaStringHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaUriHolder.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaUriHolder.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaUriHolder.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaUriHolder.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/JavaUriHolderEx.java b/src/main/java/org/apache/xmlbeans/impl/values/JavaUriHolderEx.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/JavaUriHolderEx.java
rename to src/main/java/org/apache/xmlbeans/impl/values/JavaUriHolderEx.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/NamespaceContext.java b/src/main/java/org/apache/xmlbeans/impl/values/NamespaceContext.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/NamespaceContext.java
rename to src/main/java/org/apache/xmlbeans/impl/values/NamespaceContext.java
diff --git a/src/typestore/org/apache/xmlbeans/impl/values/NamespaceManager.java b/src/main/java/org/apache/xmlbeans/impl/values/NamespaceManager.java
similarity index 100%
rename from src/typestore/org/apache/xmlbeans/impl/values/NamespaceManager.java
rename to src/main/java/org/apache/xmlbeans/impl/values/NamespaceManager.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/StringEnumValue.java b/src/main/java/org/apache/xmlbeans/impl/values/StringEnumValue.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/StringEnumValue.java
rename to src/main/java/org/apache/xmlbeans/impl/values/StringEnumValue.java
diff --git a/src/typestore/org/apache/xmlbeans/impl/values/TypeStore.java b/src/main/java/org/apache/xmlbeans/impl/values/TypeStore.java
similarity index 100%
rename from src/typestore/org/apache/xmlbeans/impl/values/TypeStore.java
rename to src/main/java/org/apache/xmlbeans/impl/values/TypeStore.java
diff --git a/src/typestore/org/apache/xmlbeans/impl/values/TypeStoreUser.java b/src/main/java/org/apache/xmlbeans/impl/values/TypeStoreUser.java
similarity index 100%
rename from src/typestore/org/apache/xmlbeans/impl/values/TypeStoreUser.java
rename to src/main/java/org/apache/xmlbeans/impl/values/TypeStoreUser.java
diff --git a/src/typestore/org/apache/xmlbeans/impl/values/TypeStoreUserFactory.java b/src/main/java/org/apache/xmlbeans/impl/values/TypeStoreUserFactory.java
similarity index 100%
rename from src/typestore/org/apache/xmlbeans/impl/values/TypeStoreUserFactory.java
rename to src/main/java/org/apache/xmlbeans/impl/values/TypeStoreUserFactory.java
diff --git a/src/typestore/org/apache/xmlbeans/impl/values/TypeStoreVisitor.java b/src/main/java/org/apache/xmlbeans/impl/values/TypeStoreVisitor.java
similarity index 100%
rename from src/typestore/org/apache/xmlbeans/impl/values/TypeStoreVisitor.java
rename to src/main/java/org/apache/xmlbeans/impl/values/TypeStoreVisitor.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnyTypeImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlAnyTypeImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnyTypeImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlAnyTypeImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnyUriImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlAnyUriImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnyUriImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlAnyUriImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnyUriRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlAnyUriRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlAnyUriRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlAnyUriRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlBase64BinaryImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlBase64BinaryImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlBase64BinaryImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlBase64BinaryImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlBase64BinaryRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlBase64BinaryRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlBase64BinaryRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlBase64BinaryRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlBooleanImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlBooleanImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlBooleanImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlBooleanImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlBooleanRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlBooleanRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlBooleanRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlBooleanRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlByteImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlByteImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlByteImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlByteImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlComplexContentImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlComplexContentImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlComplexContentImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlComplexContentImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlDateImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlDateImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlDateImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlDateImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlDateTimeImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlDateTimeImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlDateTimeImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlDateTimeImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlDecimalImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlDecimalImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlDecimalImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlDecimalImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlDecimalRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlDecimalRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlDecimalRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlDecimalRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlDoubleImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlDoubleImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlDoubleImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlDoubleImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlDoubleRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlDoubleRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlDoubleRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlDoubleRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlDurationImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlDurationImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlDurationImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlDurationImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlEntitiesImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlEntitiesImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlEntitiesImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlEntitiesImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlEntityImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlEntityImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlEntityImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlEntityImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlFloatImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlFloatImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlFloatImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlFloatImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlFloatRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlFloatRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlFloatRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlFloatRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlGDayImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlGDayImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlGDayImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlGDayImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlGMonthDayImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlGMonthDayImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlGMonthDayImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlGMonthDayImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlGMonthImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlGMonthImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlGMonthImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlGMonthImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlGYearImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlGYearImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlGYearImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlGYearImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlGYearMonthImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlGYearMonthImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlGYearMonthImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlGYearMonthImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlHexBinaryImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlHexBinaryImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlHexBinaryImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlHexBinaryImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlHexBinaryRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlHexBinaryRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlHexBinaryRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlHexBinaryRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlIdImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlIdImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlIdImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlIdImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlIdRefImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlIdRefImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlIdRefImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlIdRefImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlIdRefsImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlIdRefsImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlIdRefsImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlIdRefsImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlIntImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlIntImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlIntImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlIntImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlIntRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlIntRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlIntRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlIntRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlIntegerImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlIntegerImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlIntegerImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlIntegerImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlIntegerRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlIntegerRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlIntegerRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlIntegerRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlLanguageImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlLanguageImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlLanguageImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlLanguageImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlListImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlListImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlListImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlListImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlLongImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlLongImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlLongImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlLongImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlLongRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlLongRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlLongRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlLongRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNCNameImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNCNameImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNCNameImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNCNameImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNameImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNameImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNameImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNameImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNegativeIntegerImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNegativeIntegerImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNegativeIntegerImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNegativeIntegerImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNmTokenImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNmTokenImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNmTokenImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNmTokenImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNmTokensImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNmTokensImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNmTokensImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNmTokensImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNonNegativeIntegerImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNonNegativeIntegerImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNonNegativeIntegerImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNonNegativeIntegerImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNonPositiveIntegerImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNonPositiveIntegerImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNonPositiveIntegerImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNonPositiveIntegerImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNormalizedStringImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNormalizedStringImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNormalizedStringImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNormalizedStringImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNotationImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNotationImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNotationImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNotationImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlNotationRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlNotationRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlNotationRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlNotationRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlObjectBase.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlObjectBase.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlPositiveIntegerImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlPositiveIntegerImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlPositiveIntegerImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlPositiveIntegerImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlQNameImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlQNameImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlQNameImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlQNameImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlQNameRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlQNameRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlQNameRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlQNameRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlShortImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlShortImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlShortImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlShortImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlStringEnumeration.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlStringEnumeration.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlStringEnumeration.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlStringEnumeration.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlStringImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlStringImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlStringImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlStringImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlStringRestriction.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlStringRestriction.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlStringRestriction.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlStringRestriction.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlTimeImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlTimeImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlTimeImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlTimeImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlTokenImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlTokenImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlTokenImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlTokenImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnionImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlUnionImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnionImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlUnionImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnsignedByteImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlUnsignedByteImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnsignedByteImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlUnsignedByteImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnsignedIntImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlUnsignedIntImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnsignedIntImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlUnsignedIntImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnsignedLongImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlUnsignedLongImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnsignedLongImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlUnsignedLongImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnsignedShortImpl.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlUnsignedShortImpl.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlUnsignedShortImpl.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlUnsignedShortImpl.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlValueDisconnectedException.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlValueDisconnectedException.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlValueDisconnectedException.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlValueDisconnectedException.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlValueNotNillableException.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlValueNotNillableException.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlValueNotNillableException.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlValueNotNillableException.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlValueNotSupportedException.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlValueNotSupportedException.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlValueNotSupportedException.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlValueNotSupportedException.java
diff --git a/src/typeimpl/org/apache/xmlbeans/impl/values/XmlValueOutOfRangeException.java b/src/main/java/org/apache/xmlbeans/impl/values/XmlValueOutOfRangeException.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/impl/values/XmlValueOutOfRangeException.java
rename to src/main/java/org/apache/xmlbeans/impl/values/XmlValueOutOfRangeException.java
diff --git a/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java b/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java
similarity index 100%
rename from src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java
rename to src/main/java/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java
diff --git a/src/tools/org/apache/xmlbeans/impl/xpathgen/XPathGenerationException.java b/src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerationException.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/xpathgen/XPathGenerationException.java
rename to src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerationException.java
diff --git a/src/tools/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java b/src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java
rename to src/main/java/org/apache/xmlbeans/impl/xpathgen/XPathGenerator.java
diff --git a/src/xpath_xquery/org/apache/xmlbeans/impl/xquery/saxon/XBeansXQuery.java b/src/main/java/org/apache/xmlbeans/impl/xquery/saxon/XBeansXQuery.java
similarity index 100%
rename from src/xpath_xquery/org/apache/xmlbeans/impl/xquery/saxon/XBeansXQuery.java
rename to src/main/java/org/apache/xmlbeans/impl/xquery/saxon/XBeansXQuery.java
diff --git a/src/tools/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java b/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
rename to src/main/java/org/apache/xmlbeans/impl/xsd2inst/SampleXmlUtil.java
diff --git a/src/tools/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java b/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java
similarity index 100%
rename from src/tools/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java
rename to src/main/java/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java
diff --git a/src/xmlpublic/org/apache/xmlbeans/package.html b/src/main/java/org/apache/xmlbeans/package.html
similarity index 100%
rename from src/xmlpublic/org/apache/xmlbeans/package.html
rename to src/main/java/org/apache/xmlbeans/package.html
diff --git a/src/typeimpl/org/apache/xmlbeans/soap/SOAPArrayType.java b/src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/soap/SOAPArrayType.java
rename to src/main/java/org/apache/xmlbeans/soap/SOAPArrayType.java
diff --git a/src/typeimpl/org/apache/xmlbeans/soap/SchemaWSDLArrayType.java b/src/main/java/org/apache/xmlbeans/soap/SchemaWSDLArrayType.java
similarity index 100%
rename from src/typeimpl/org/apache/xmlbeans/soap/SchemaWSDLArrayType.java
rename to src/main/java/org/apache/xmlbeans/soap/SchemaWSDLArrayType.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/Attribute.java b/src/main/java/org/apache/xmlbeans/xml/stream/Attribute.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/Attribute.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/Attribute.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/AttributeIterator.java b/src/main/java/org/apache/xmlbeans/xml/stream/AttributeIterator.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/AttributeIterator.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/AttributeIterator.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/BufferedXMLInputStream.java b/src/main/java/org/apache/xmlbeans/xml/stream/BufferedXMLInputStream.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/BufferedXMLInputStream.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/BufferedXMLInputStream.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/ChangePrefixMapping.java b/src/main/java/org/apache/xmlbeans/xml/stream/ChangePrefixMapping.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/ChangePrefixMapping.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/ChangePrefixMapping.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/CharacterData.java b/src/main/java/org/apache/xmlbeans/xml/stream/CharacterData.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/CharacterData.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/CharacterData.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/Comment.java b/src/main/java/org/apache/xmlbeans/xml/stream/Comment.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/Comment.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/Comment.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/ElementFilter.java b/src/main/java/org/apache/xmlbeans/xml/stream/ElementFilter.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/ElementFilter.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/ElementFilter.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/EndDocument.java b/src/main/java/org/apache/xmlbeans/xml/stream/EndDocument.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/EndDocument.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/EndDocument.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/EndElement.java b/src/main/java/org/apache/xmlbeans/xml/stream/EndElement.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/EndElement.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/EndElement.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/EndPrefixMapping.java b/src/main/java/org/apache/xmlbeans/xml/stream/EndPrefixMapping.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/EndPrefixMapping.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/EndPrefixMapping.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/EntityReference.java b/src/main/java/org/apache/xmlbeans/xml/stream/EntityReference.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/EntityReference.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/EntityReference.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/Location.java b/src/main/java/org/apache/xmlbeans/xml/stream/Location.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/Location.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/Location.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/ProcessingInstruction.java b/src/main/java/org/apache/xmlbeans/xml/stream/ProcessingInstruction.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/ProcessingInstruction.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/ProcessingInstruction.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/ReferenceResolver.java b/src/main/java/org/apache/xmlbeans/xml/stream/ReferenceResolver.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/ReferenceResolver.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/ReferenceResolver.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/Space.java b/src/main/java/org/apache/xmlbeans/xml/stream/Space.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/Space.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/Space.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/StartDocument.java b/src/main/java/org/apache/xmlbeans/xml/stream/StartDocument.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/StartDocument.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/StartDocument.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/StartElement.java b/src/main/java/org/apache/xmlbeans/xml/stream/StartElement.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/StartElement.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/StartElement.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/StartPrefixMapping.java b/src/main/java/org/apache/xmlbeans/xml/stream/StartPrefixMapping.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/StartPrefixMapping.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/StartPrefixMapping.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/XMLEvent.java b/src/main/java/org/apache/xmlbeans/xml/stream/XMLEvent.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/XMLEvent.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/XMLEvent.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/XMLInputStream.java b/src/main/java/org/apache/xmlbeans/xml/stream/XMLInputStream.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/XMLInputStream.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/XMLInputStream.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/XMLName.java b/src/main/java/org/apache/xmlbeans/xml/stream/XMLName.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/XMLName.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/XMLName.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/XMLStreamException.java b/src/main/java/org/apache/xmlbeans/xml/stream/XMLStreamException.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/XMLStreamException.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/XMLStreamException.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/events/ElementTypeNames.java b/src/main/java/org/apache/xmlbeans/xml/stream/events/ElementTypeNames.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/events/ElementTypeNames.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/events/ElementTypeNames.java
diff --git a/src/xmlinputstream/org/apache/xmlbeans/xml/stream/utils/NestedThrowable.java b/src/main/java/org/apache/xmlbeans/xml/stream/utils/NestedThrowable.java
similarity index 100%
rename from src/xmlinputstream/org/apache/xmlbeans/xml/stream/utils/NestedThrowable.java
rename to src/main/java/org/apache/xmlbeans/xml/stream/utils/NestedThrowable.java
diff --git a/resources/maven/pom.xml b/src/main/resources/maven/pom.xml
similarity index 100%
rename from resources/maven/pom.xml
rename to src/main/resources/maven/pom.xml
diff --git a/resources/typeimpl/org/apache/xmlbeans/impl/regex/message.properties b/src/main/resources/typeimpl/org/apache/xmlbeans/impl/regex/message.properties
similarity index 100%
rename from resources/typeimpl/org/apache/xmlbeans/impl/regex/message.properties
rename to src/main/resources/typeimpl/org/apache/xmlbeans/impl/regex/message.properties
diff --git a/resources/typeimpl/org/apache/xmlbeans/impl/regex/message_fr.properties b/src/main/resources/typeimpl/org/apache/xmlbeans/impl/regex/message_fr.properties
similarity index 100%
rename from resources/typeimpl/org/apache/xmlbeans/impl/regex/message_fr.properties
rename to src/main/resources/typeimpl/org/apache/xmlbeans/impl/regex/message_fr.properties
diff --git a/resources/typeimpl/org/apache/xmlbeans/impl/regex/message_ja.properties b/src/main/resources/typeimpl/org/apache/xmlbeans/impl/regex/message_ja.properties
similarity index 100%
rename from resources/typeimpl/org/apache/xmlbeans/impl/regex/message_ja.properties
rename to src/main/resources/typeimpl/org/apache/xmlbeans/impl/regex/message_ja.properties
diff --git a/resources/xmlpublic/org/apache/xmlbeans/message.properties b/src/main/resources/xmlpublic/org/apache/xmlbeans/message.properties
similarity index 100%
rename from resources/xmlpublic/org/apache/xmlbeans/message.properties
rename to src/main/resources/xmlpublic/org/apache/xmlbeans/message.properties
diff --git a/resources/xpath_xquery/META-INF/services/org.apache.xmlbeans.impl.store.PathDelegate.SelectPathInterface b/src/main/resources/xpath_xquery/META-INF/services/org.apache.xmlbeans.impl.store.PathDelegate.SelectPathInterface
similarity index 100%
rename from resources/xpath_xquery/META-INF/services/org.apache.xmlbeans.impl.store.PathDelegate.SelectPathInterface
rename to src/main/resources/xpath_xquery/META-INF/services/org.apache.xmlbeans.impl.store.PathDelegate.SelectPathInterface
diff --git a/resources/xpath_xquery/META-INF/services/org.apache.xmlbeans.impl.store.QueryDelegate.QueryInterface b/src/main/resources/xpath_xquery/META-INF/services/org.apache.xmlbeans.impl.store.QueryDelegate.QueryInterface
similarity index 100%
rename from resources/xpath_xquery/META-INF/services/org.apache.xmlbeans.impl.store.QueryDelegate.QueryInterface
rename to src/main/resources/xpath_xquery/META-INF/services/org.apache.xmlbeans.impl.store.QueryDelegate.QueryInterface
diff --git a/src/configschema/schema/xmlconfig.xsd b/src/main/schema/config/xmlconfig.xsd
similarity index 100%
rename from src/configschema/schema/xmlconfig.xsd
rename to src/main/schema/config/xmlconfig.xsd
diff --git a/src/configschema/schema/xmlconfig.xsdconfig b/src/main/schema/config/xmlconfig.xsdconfig
similarity index 100%
rename from src/configschema/schema/xmlconfig.xsdconfig
rename to src/main/schema/config/xmlconfig.xsdconfig
diff --git a/src/toolschema/ltgfmt.xsd b/src/main/schema/tools/ltgfmt.xsd
similarity index 100%
rename from src/toolschema/ltgfmt.xsd
rename to src/main/schema/tools/ltgfmt.xsd
diff --git a/src/toolschema/ltgfmt.xsdconfig b/src/main/schema/tools/ltgfmt.xsdconfig
similarity index 100%
rename from src/toolschema/ltgfmt.xsdconfig
rename to src/main/schema/tools/ltgfmt.xsdconfig
diff --git a/src/toolschema/substwsdl.xsd b/src/main/schema/tools/substwsdl.xsd
similarity index 100%
rename from src/toolschema/substwsdl.xsd
rename to src/main/schema/tools/substwsdl.xsd
diff --git a/src/toolschema/substwsdl.xsdconfig b/src/main/schema/tools/substwsdl.xsdconfig
similarity index 100%
rename from src/toolschema/substwsdl.xsdconfig
rename to src/main/schema/tools/substwsdl.xsdconfig
diff --git a/src/toolschema/xsdownload.xsd b/src/main/schema/tools/xsdownload.xsd
similarity index 100%
rename from src/toolschema/xsdownload.xsd
rename to src/main/schema/tools/xsdownload.xsd
diff --git a/src/toolschema/xsdownload.xsdconfig b/src/main/schema/tools/xsdownload.xsdconfig
similarity index 100%
rename from src/toolschema/xsdownload.xsdconfig
rename to src/main/schema/tools/xsdownload.xsdconfig
diff --git a/src/xmlschema/schema/XML.xsd b/src/main/schema/xml/XML.xsd
similarity index 100%
rename from src/xmlschema/schema/XML.xsd
rename to src/main/schema/xml/XML.xsd
diff --git a/src/xmlschema/schema/XML.xsdconfig b/src/main/schema/xml/XML.xsdconfig
similarity index 100%
rename from src/xmlschema/schema/XML.xsdconfig
rename to src/main/schema/xml/XML.xsdconfig
diff --git a/src/xsdschema/schema/XMLSchema.xsd b/src/main/schema/xsd/XMLSchema.xsd
similarity index 100%
rename from src/xsdschema/schema/XMLSchema.xsd
rename to src/main/schema/xsd/XMLSchema.xsd
diff --git a/src/xsdschema/schema/XMLSchema.xsdconfig b/src/main/schema/xsd/XMLSchema.xsdconfig
similarity index 100%
rename from src/xsdschema/schema/XMLSchema.xsdconfig
rename to src/main/schema/xsd/XMLSchema.xsdconfig
diff --git a/src/shell/_setlib b/src/main/shell/_setlib
similarity index 100%
rename from src/shell/_setlib
rename to src/main/shell/_setlib
diff --git a/src/shell/_setlib.cmd b/src/main/shell/_setlib.cmd
similarity index 100%
rename from src/shell/_setlib.cmd
rename to src/main/shell/_setlib.cmd
diff --git a/src/shell/dumpxsb b/src/main/shell/dumpxsb
similarity index 100%
rename from src/shell/dumpxsb
rename to src/main/shell/dumpxsb
diff --git a/src/shell/dumpxsb.cmd b/src/main/shell/dumpxsb.cmd
similarity index 100%
rename from src/shell/dumpxsb.cmd
rename to src/main/shell/dumpxsb.cmd
diff --git a/src/shell/inst2xsd b/src/main/shell/inst2xsd
similarity index 100%
rename from src/shell/inst2xsd
rename to src/main/shell/inst2xsd
diff --git a/src/shell/inst2xsd.cmd b/src/main/shell/inst2xsd.cmd
similarity index 100%
rename from src/shell/inst2xsd.cmd
rename to src/main/shell/inst2xsd.cmd
diff --git a/src/shell/scomp b/src/main/shell/scomp
similarity index 100%
rename from src/shell/scomp
rename to src/main/shell/scomp
diff --git a/src/shell/scomp.cmd b/src/main/shell/scomp.cmd
similarity index 100%
rename from src/shell/scomp.cmd
rename to src/main/shell/scomp.cmd
diff --git a/src/shell/scopy.cmd b/src/main/shell/scopy.cmd
similarity index 100%
rename from src/shell/scopy.cmd
rename to src/main/shell/scopy.cmd
diff --git a/src/shell/sdownload b/src/main/shell/sdownload
similarity index 100%
rename from src/shell/sdownload
rename to src/main/shell/sdownload
diff --git a/src/shell/sdownload.cmd b/src/main/shell/sdownload.cmd
similarity index 100%
rename from src/shell/sdownload.cmd
rename to src/main/shell/sdownload.cmd
diff --git a/src/shell/sfactor b/src/main/shell/sfactor
similarity index 100%
rename from src/shell/sfactor
rename to src/main/shell/sfactor
diff --git a/src/shell/sfactor.cmd b/src/main/shell/sfactor.cmd
similarity index 100%
rename from src/shell/sfactor.cmd
rename to src/main/shell/sfactor.cmd
diff --git a/src/shell/svalidate b/src/main/shell/svalidate
similarity index 100%
rename from src/shell/svalidate
rename to src/main/shell/svalidate
diff --git a/src/shell/svalidate.cmd b/src/main/shell/svalidate.cmd
similarity index 100%
rename from src/shell/svalidate.cmd
rename to src/main/shell/svalidate.cmd
diff --git a/src/shell/validate b/src/main/shell/validate
similarity index 100%
rename from src/shell/validate
rename to src/main/shell/validate
diff --git a/src/shell/validate.cmd b/src/main/shell/validate.cmd
similarity index 100%
rename from src/shell/validate.cmd
rename to src/main/shell/validate.cmd
diff --git a/src/shell/xpretty b/src/main/shell/xpretty
similarity index 100%
rename from src/shell/xpretty
rename to src/main/shell/xpretty
diff --git a/src/shell/xpretty.cmd b/src/main/shell/xpretty.cmd
similarity index 100%
rename from src/shell/xpretty.cmd
rename to src/main/shell/xpretty.cmd
diff --git a/src/shell/xsd2inst b/src/main/shell/xsd2inst
similarity index 100%
rename from src/shell/xsd2inst
rename to src/main/shell/xsd2inst
diff --git a/src/shell/xsd2inst.cmd b/src/main/shell/xsd2inst.cmd
similarity index 100%
rename from src/shell/xsd2inst.cmd
rename to src/main/shell/xsd2inst.cmd
diff --git a/src/shell/xsdtree b/src/main/shell/xsdtree
similarity index 100%
rename from src/shell/xsdtree
rename to src/main/shell/xsdtree
diff --git a/src/shell/xsdtree.cmd b/src/main/shell/xsdtree.cmd
similarity index 100%
rename from src/shell/xsdtree.cmd
rename to src/main/shell/xsdtree.cmd
diff --git a/src/shell/xstc b/src/main/shell/xstc
similarity index 100%
rename from src/shell/xstc
rename to src/main/shell/xstc
diff --git a/src/shell/xstc.cmd b/src/main/shell/xstc.cmd
similarity index 100%
rename from src/shell/xstc.cmd
rename to src/main/shell/xstc.cmd
diff --git a/test/src/ValidatingXSRTests/checkin/TestUriValidation.java b/src/test/java/ValidatingXSRTests/checkin/TestUriValidation.java
similarity index 100%
rename from test/src/ValidatingXSRTests/checkin/TestUriValidation.java
rename to src/test/java/ValidatingXSRTests/checkin/TestUriValidation.java
diff --git a/test/src/ValidatingXSRTests/checkin/ValidatingXMLStreamReaderTests.java b/src/test/java/ValidatingXSRTests/checkin/ValidatingXMLStreamReaderTests.java
similarity index 100%
rename from test/src/ValidatingXSRTests/checkin/ValidatingXMLStreamReaderTests.java
rename to src/test/java/ValidatingXSRTests/checkin/ValidatingXMLStreamReaderTests.java
diff --git a/test/src/ValidatingXSRTests/common/TestPrefixResolver.java b/src/test/java/ValidatingXSRTests/common/TestPrefixResolver.java
similarity index 100%
rename from test/src/ValidatingXSRTests/common/TestPrefixResolver.java
rename to src/test/java/ValidatingXSRTests/common/TestPrefixResolver.java
diff --git a/test/src/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java b/src/test/java/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java
similarity index 100%
rename from test/src/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java
rename to src/test/java/ValidatingXSRTests/detailed/ValidatingXmlStreamReaderTests.java
diff --git a/test/src/ValidatingXSRTests/detailed/ValidatorUtilTests.java b/src/test/java/ValidatingXSRTests/detailed/ValidatorUtilTests.java
similarity index 100%
rename from test/src/ValidatingXSRTests/detailed/ValidatorUtilTests.java
rename to src/test/java/ValidatingXSRTests/detailed/ValidatorUtilTests.java
diff --git a/test/src/common/Common.java b/src/test/java/common/Common.java
similarity index 98%
rename from test/src/common/Common.java
rename to src/test/java/common/Common.java
index 27a47dd..f417af2 100644
--- a/test/src/common/Common.java
+++ b/src/test/java/common/Common.java
@@ -63,17 +63,16 @@
 

     /**

      * If System.property for 'cases.location' == null

-     * use '.' as basePath and add test/cases/xbea'.'

+     * use '.' as basePath and add src/test/resources.

      * should be where the build.xml file lives

      *

-     * @return

      * @throws IllegalStateException

      */

     public static String getCaseLocation() throws IllegalStateException

     {

         String baseDir = System.getProperty("cases.location");

         if (baseDir == null) {

-            return new File("." + P + "test" + P + "cases").getAbsolutePath();

+            return new File("." + P + "src" + P + "test" + P + "resources").getAbsolutePath();

         } else {

             return new File(baseDir).getAbsolutePath();

         }

diff --git a/test/src/compile/scomp/checkin/CompilationTests.java b/src/test/java/compile/scomp/checkin/CompilationTests.java
similarity index 96%
rename from test/src/compile/scomp/checkin/CompilationTests.java
rename to src/test/java/compile/scomp/checkin/CompilationTests.java
index b04cc9f..4db897f 100644
--- a/test/src/compile/scomp/checkin/CompilationTests.java
+++ b/src/test/java/compile/scomp/checkin/CompilationTests.java
@@ -15,6 +15,8 @@
 
 package compile.scomp.checkin;
 
+import common.Common;
+import compile.scomp.common.CompileCommon;
 import org.apache.xmlbeans.*;
 import org.apache.xmlbeans.impl.common.QNameHelper;
 import org.apache.xmlbeans.impl.tool.CodeGenUtil;
@@ -40,6 +42,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static common.Common.getRootFile;
 import static org.junit.Assert.*;
 
 
@@ -218,7 +221,7 @@
         assertTrue("Build failed", SchemaCompiler.compile(params));
 
         // Then, compile java classes
-        File javasrc = new File("test/src/scomp/simple");
+        File javasrc = new File(CompileCommon.fileLocation+"/simple");
         File javaclasses = xbeanOutput("compile/scomp/simple/javaclasses");
         javaclasses.mkdirs();
         List<File> testcp = new ArrayList<File>(Arrays.asList(CodeGenUtil.systemClasspath()));
@@ -398,12 +401,12 @@
 
     //TESTENV:
 
-    private static File fwroot = getRootFile();
-    private static File caseroot = new File(fwroot, "test/cases");
+    private static final File fwroot = new File(getRootFile());
+    private static final File caseroot = new File(Common.getCaseLocation());
 
     //location of files under "cases folder"
-    static String fileLocation = "/xbean/compile/scomp/";
-    private static File outputroot = new File(fwroot, "build/test/output");
+    private static final String fileLocation = CompileCommon.fileLocation;
+    private static final File outputroot = new File(fwroot, "build/test/output");
 
     private static void dumpErrors(List errors, PrintWriter out) {
         // Display the errors
@@ -414,16 +417,8 @@
         }
     }
 
-    private static File getRootFile() throws IllegalStateException {
-        try {
-            return new File(System.getProperty("xbean.rootdir")).getCanonicalFile();
-        } catch (IOException e) {
-            throw new IllegalStateException(e.toString());
-        }
-    }
-
     private static File xbeanCase(String str) {
-        return (new File(caseroot.getPath() + fileLocation, str));
+        return new File(fileLocation, str);
     }
 
     private static File xbeanOutput(String str) {
diff --git a/test/src/compile/scomp/checkin/XmlBeansCompCheckinTests.java b/src/test/java/compile/scomp/checkin/XmlBeansCompCheckinTests.java
similarity index 100%
rename from test/src/compile/scomp/checkin/XmlBeansCompCheckinTests.java
rename to src/test/java/compile/scomp/checkin/XmlBeansCompCheckinTests.java
diff --git a/test/src/compile/scomp/common/CompileCommon.java b/src/test/java/compile/scomp/common/CompileCommon.java
similarity index 100%
rename from test/src/compile/scomp/common/CompileCommon.java
rename to src/test/java/compile/scomp/common/CompileCommon.java
diff --git a/test/src/compile/scomp/common/CompileTestBase.java b/src/test/java/compile/scomp/common/CompileTestBase.java
similarity index 100%
rename from test/src/compile/scomp/common/CompileTestBase.java
rename to src/test/java/compile/scomp/common/CompileTestBase.java
diff --git a/test/src/compile/scomp/common/mockobj/TestBindingConfig.java b/src/test/java/compile/scomp/common/mockobj/TestBindingConfig.java
similarity index 100%
rename from test/src/compile/scomp/common/mockobj/TestBindingConfig.java
rename to src/test/java/compile/scomp/common/mockobj/TestBindingConfig.java
diff --git a/test/src/compile/scomp/common/mockobj/TestFiler.java b/src/test/java/compile/scomp/common/mockobj/TestFiler.java
similarity index 100%
rename from test/src/compile/scomp/common/mockobj/TestFiler.java
rename to src/test/java/compile/scomp/common/mockobj/TestFiler.java
diff --git a/test/src/compile/scomp/detailed/DetailedCompTests.java b/src/test/java/compile/scomp/detailed/DetailedCompTests.java
similarity index 100%
rename from test/src/compile/scomp/detailed/DetailedCompTests.java
rename to src/test/java/compile/scomp/detailed/DetailedCompTests.java
diff --git a/test/src/compile/scomp/detailed/SchemaCompilerTests.java b/src/test/java/compile/scomp/detailed/SchemaCompilerTests.java
similarity index 100%
rename from test/src/compile/scomp/detailed/SchemaCompilerTests.java
rename to src/test/java/compile/scomp/detailed/SchemaCompilerTests.java
diff --git a/test/src/compile/scomp/detailed/XmlBeanCompilationTests.java b/src/test/java/compile/scomp/detailed/XmlBeanCompilationTests.java
similarity index 98%
rename from test/src/compile/scomp/detailed/XmlBeanCompilationTests.java
rename to src/test/java/compile/scomp/detailed/XmlBeanCompilationTests.java
index 1126ea0..473ea46 100644
--- a/test/src/compile/scomp/detailed/XmlBeanCompilationTests.java
+++ b/src/test/java/compile/scomp/detailed/XmlBeanCompilationTests.java
@@ -59,8 +59,8 @@
         TestFiler f = new TestFiler();

         //initialize all of the values

         String extCaseDir = XBEAN_CASE_ROOT + P + "extensions" + P;

-        String extSrcDir = CASEROOT + P +

-                           ".." + P + "src" + P + "xmlobject" + P + "extensions" + P;

+        String extSrcDir = getRootFile() + P +

+                           "src" + P + "test" + P + "java" + P + "xmlobject" + P + "extensions" + P;

         File[] cPath = CompileTestBase.getClassPath();

         String dir = extCaseDir + P + "interfaceFeature" + P + "averageCase";

         String dir2 = extCaseDir + P + "prePostFeature" + P +

diff --git a/test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java b/src/test/java/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java
similarity index 100%
rename from test/src/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java
rename to src/test/java/compile/scomp/incr/schemaCompile/detailed/IncrCompilationTests.java
diff --git a/test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java b/src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
similarity index 100%
rename from test/src/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
rename to src/test/java/compile/scomp/incr/schemaCompile/detailed/ModelGroupTests.java
diff --git a/test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java b/src/test/java/compile/scomp/incr/schemaCompile/detailed/PerfTests.java
similarity index 100%
rename from test/src/compile/scomp/incr/schemaCompile/detailed/PerfTests.java
rename to src/test/java/compile/scomp/incr/schemaCompile/detailed/PerfTests.java
diff --git a/test/src/compile/scomp/som/checkin/PartialSOMCheckinTest.java b/src/test/java/compile/scomp/som/checkin/PartialSOMCheckinTest.java
similarity index 100%
rename from test/src/compile/scomp/som/checkin/PartialSOMCheckinTest.java
rename to src/test/java/compile/scomp/som/checkin/PartialSOMCheckinTest.java
diff --git a/test/src/compile/scomp/som/common/SomTestBase.java b/src/test/java/compile/scomp/som/common/SomTestBase.java
similarity index 100%
rename from test/src/compile/scomp/som/common/SomTestBase.java
rename to src/test/java/compile/scomp/som/common/SomTestBase.java
diff --git a/test/src/compile/scomp/som/detailed/PartialSOMDetailedTest.java b/src/test/java/compile/scomp/som/detailed/PartialSOMDetailedTest.java
similarity index 100%
rename from test/src/compile/scomp/som/detailed/PartialSOMDetailedTest.java
rename to src/test/java/compile/scomp/som/detailed/PartialSOMDetailedTest.java
diff --git a/test/src/dom/checkin/AttributeSyncTest.java b/src/test/java/dom/checkin/AttributeSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/AttributeSyncTest.java
rename to src/test/java/dom/checkin/AttributeSyncTest.java
diff --git a/test/src/dom/checkin/AttributeTest.java b/src/test/java/dom/checkin/AttributeTest.java
similarity index 100%
rename from test/src/dom/checkin/AttributeTest.java
rename to src/test/java/dom/checkin/AttributeTest.java
diff --git a/test/src/dom/checkin/CDataSectionSyncTest.java b/src/test/java/dom/checkin/CDataSectionSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/CDataSectionSyncTest.java
rename to src/test/java/dom/checkin/CDataSectionSyncTest.java
diff --git a/test/src/dom/checkin/CDataSectionTest.java b/src/test/java/dom/checkin/CDataSectionTest.java
similarity index 100%
rename from test/src/dom/checkin/CDataSectionTest.java
rename to src/test/java/dom/checkin/CDataSectionTest.java
diff --git a/test/src/dom/checkin/CommentSyncTest.java b/src/test/java/dom/checkin/CommentSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/CommentSyncTest.java
rename to src/test/java/dom/checkin/CommentSyncTest.java
diff --git a/test/src/dom/checkin/CommentTest.java b/src/test/java/dom/checkin/CommentTest.java
similarity index 100%
rename from test/src/dom/checkin/CommentTest.java
rename to src/test/java/dom/checkin/CommentTest.java
diff --git a/test/src/dom/checkin/DirtyCacheTests.java b/src/test/java/dom/checkin/DirtyCacheTests.java
similarity index 100%
rename from test/src/dom/checkin/DirtyCacheTests.java
rename to src/test/java/dom/checkin/DirtyCacheTests.java
diff --git a/test/src/dom/checkin/DocumentFragmentSyncTest.java b/src/test/java/dom/checkin/DocumentFragmentSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/DocumentFragmentSyncTest.java
rename to src/test/java/dom/checkin/DocumentFragmentSyncTest.java
diff --git a/test/src/dom/checkin/DocumentFragmentTest.java b/src/test/java/dom/checkin/DocumentFragmentTest.java
similarity index 100%
rename from test/src/dom/checkin/DocumentFragmentTest.java
rename to src/test/java/dom/checkin/DocumentFragmentTest.java
diff --git a/test/src/dom/checkin/DocumentSyncTest.java b/src/test/java/dom/checkin/DocumentSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/DocumentSyncTest.java
rename to src/test/java/dom/checkin/DocumentSyncTest.java
diff --git a/test/src/dom/checkin/DocumentTest.java b/src/test/java/dom/checkin/DocumentTest.java
similarity index 100%
rename from test/src/dom/checkin/DocumentTest.java
rename to src/test/java/dom/checkin/DocumentTest.java
diff --git a/test/src/dom/checkin/DomImplementationSyncTest.java b/src/test/java/dom/checkin/DomImplementationSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/DomImplementationSyncTest.java
rename to src/test/java/dom/checkin/DomImplementationSyncTest.java
diff --git a/test/src/dom/checkin/DomImplementationTest.java b/src/test/java/dom/checkin/DomImplementationTest.java
similarity index 100%
rename from test/src/dom/checkin/DomImplementationTest.java
rename to src/test/java/dom/checkin/DomImplementationTest.java
diff --git a/test/src/dom/checkin/DomTests.java b/src/test/java/dom/checkin/DomTests.java
similarity index 100%
rename from test/src/dom/checkin/DomTests.java
rename to src/test/java/dom/checkin/DomTests.java
diff --git a/test/src/dom/checkin/ElementSyncTest.java b/src/test/java/dom/checkin/ElementSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/ElementSyncTest.java
rename to src/test/java/dom/checkin/ElementSyncTest.java
diff --git a/test/src/dom/checkin/ElementTest.java b/src/test/java/dom/checkin/ElementTest.java
similarity index 100%
rename from test/src/dom/checkin/ElementTest.java
rename to src/test/java/dom/checkin/ElementTest.java
diff --git a/test/src/dom/checkin/NamedNodeMapSyncTest.java b/src/test/java/dom/checkin/NamedNodeMapSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/NamedNodeMapSyncTest.java
rename to src/test/java/dom/checkin/NamedNodeMapSyncTest.java
diff --git a/test/src/dom/checkin/NamedNodeMapTest.java b/src/test/java/dom/checkin/NamedNodeMapTest.java
similarity index 100%
rename from test/src/dom/checkin/NamedNodeMapTest.java
rename to src/test/java/dom/checkin/NamedNodeMapTest.java
diff --git a/test/src/dom/checkin/NodeListSyncTest.java b/src/test/java/dom/checkin/NodeListSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/NodeListSyncTest.java
rename to src/test/java/dom/checkin/NodeListSyncTest.java
diff --git a/test/src/dom/checkin/NodeListTest.java b/src/test/java/dom/checkin/NodeListTest.java
similarity index 100%
rename from test/src/dom/checkin/NodeListTest.java
rename to src/test/java/dom/checkin/NodeListTest.java
diff --git a/test/src/dom/checkin/PISyncTest.java b/src/test/java/dom/checkin/PISyncTest.java
similarity index 100%
rename from test/src/dom/checkin/PISyncTest.java
rename to src/test/java/dom/checkin/PISyncTest.java
diff --git a/test/src/dom/checkin/PITest.java b/src/test/java/dom/checkin/PITest.java
similarity index 100%
rename from test/src/dom/checkin/PITest.java
rename to src/test/java/dom/checkin/PITest.java
diff --git a/test/src/dom/checkin/ParserTest.java b/src/test/java/dom/checkin/ParserTest.java
similarity index 100%
rename from test/src/dom/checkin/ParserTest.java
rename to src/test/java/dom/checkin/ParserTest.java
diff --git a/test/src/dom/checkin/TextSyncTest.java b/src/test/java/dom/checkin/TextSyncTest.java
similarity index 100%
rename from test/src/dom/checkin/TextSyncTest.java
rename to src/test/java/dom/checkin/TextSyncTest.java
diff --git a/test/src/dom/checkin/TextTest.java b/src/test/java/dom/checkin/TextTest.java
similarity index 100%
rename from test/src/dom/checkin/TextTest.java
rename to src/test/java/dom/checkin/TextTest.java
diff --git a/test/src/dom/common/CharacterDataTest.java b/src/test/java/dom/common/CharacterDataTest.java
similarity index 100%
rename from test/src/dom/common/CharacterDataTest.java
rename to src/test/java/dom/common/CharacterDataTest.java
diff --git a/test/src/dom/common/DomUtils.java b/src/test/java/dom/common/DomUtils.java
similarity index 100%
rename from test/src/dom/common/DomUtils.java
rename to src/test/java/dom/common/DomUtils.java
diff --git a/test/src/dom/common/Loader.java b/src/test/java/dom/common/Loader.java
similarity index 100%
rename from test/src/dom/common/Loader.java
rename to src/test/java/dom/common/Loader.java
diff --git a/test/src/dom/common/NewLoader.java b/src/test/java/dom/common/NewLoader.java
similarity index 100%
rename from test/src/dom/common/NewLoader.java
rename to src/test/java/dom/common/NewLoader.java
diff --git a/test/src/dom/common/NodeTest.java b/src/test/java/dom/common/NodeTest.java
similarity index 100%
rename from test/src/dom/common/NodeTest.java
rename to src/test/java/dom/common/NodeTest.java
diff --git a/test/src/dom/common/NodeWithChildrenTest.java b/src/test/java/dom/common/NodeWithChildrenTest.java
similarity index 100%
rename from test/src/dom/common/NodeWithChildrenTest.java
rename to src/test/java/dom/common/NodeWithChildrenTest.java
diff --git a/test/src/dom/common/TestSetup.java b/src/test/java/dom/common/TestSetup.java
similarity index 100%
rename from test/src/dom/common/TestSetup.java
rename to src/test/java/dom/common/TestSetup.java
diff --git a/test/src/dom/detailed/AttrNamespaceTest.java b/src/test/java/dom/detailed/AttrNamespaceTest.java
similarity index 100%
rename from test/src/dom/detailed/AttrNamespaceTest.java
rename to src/test/java/dom/detailed/AttrNamespaceTest.java
diff --git a/test/src/dom/detailed/IDTest.java b/src/test/java/dom/detailed/IDTest.java
similarity index 100%
rename from test/src/dom/detailed/IDTest.java
rename to src/test/java/dom/detailed/IDTest.java
diff --git a/test/src/dom/detailed/ImportUnsupportedNodesTest.java b/src/test/java/dom/detailed/ImportUnsupportedNodesTest.java
similarity index 100%
rename from test/src/dom/detailed/ImportUnsupportedNodesTest.java
rename to src/test/java/dom/detailed/ImportUnsupportedNodesTest.java
diff --git a/test/src/dom/detailed/InsertDeleteNodesTest.java b/src/test/java/dom/detailed/InsertDeleteNodesTest.java
similarity index 100%
rename from test/src/dom/detailed/InsertDeleteNodesTest.java
rename to src/test/java/dom/detailed/InsertDeleteNodesTest.java
diff --git a/test/src/dom/detailed/MoveImportNodeTest.java b/src/test/java/dom/detailed/MoveImportNodeTest.java
similarity index 100%
rename from test/src/dom/detailed/MoveImportNodeTest.java
rename to src/test/java/dom/detailed/MoveImportNodeTest.java
diff --git a/test/src/dom/detailed/MultipleDocsTest.java b/src/test/java/dom/detailed/MultipleDocsTest.java
similarity index 100%
rename from test/src/dom/detailed/MultipleDocsTest.java
rename to src/test/java/dom/detailed/MultipleDocsTest.java
diff --git a/test/src/dom/detailed/TextInsertDeleteTest.java b/src/test/java/dom/detailed/TextInsertDeleteTest.java
similarity index 100%
rename from test/src/dom/detailed/TextInsertDeleteTest.java
rename to src/test/java/dom/detailed/TextInsertDeleteTest.java
diff --git a/test/src/dom/detailed/TextTest.java b/src/test/java/dom/detailed/TextTest.java
similarity index 100%
rename from test/src/dom/detailed/TextTest.java
rename to src/test/java/dom/detailed/TextTest.java
diff --git a/test/src/dom/detailed/w3c/alltests.java b/src/test/java/dom/detailed/w3c/alltests.java
similarity index 100%
rename from test/src/dom/detailed/w3c/alltests.java
rename to src/test/java/dom/detailed/w3c/alltests.java
diff --git a/test/src/dom/detailed/w3c/ibmtests.java b/src/test/java/dom/detailed/w3c/ibmtests.java
similarity index 100%
rename from test/src/dom/detailed/w3c/ibmtests.java
rename to src/test/java/dom/detailed/w3c/ibmtests.java
diff --git a/test/src/drt/drtcases/BindingTests.java b/src/test/java/drt/drtcases/BindingTests.java
similarity index 100%
rename from test/src/drt/drtcases/BindingTests.java
rename to src/test/java/drt/drtcases/BindingTests.java
diff --git a/test/src/drt/drtcases/MarshalTests.java b/src/test/java/drt/drtcases/MarshalTests.java
similarity index 100%
rename from test/src/drt/drtcases/MarshalTests.java
rename to src/test/java/drt/drtcases/MarshalTests.java
diff --git a/test/src/drt/drtcases/TestEnv.java b/src/test/java/drt/drtcases/TestEnv.java
similarity index 100%
rename from test/src/drt/drtcases/TestEnv.java
rename to src/test/java/drt/drtcases/TestEnv.java
diff --git a/test/src/misc/checkin/CharUtilTests.java b/src/test/java/misc/checkin/CharUtilTests.java
similarity index 100%
rename from test/src/misc/checkin/CharUtilTests.java
rename to src/test/java/misc/checkin/CharUtilTests.java
diff --git a/test/src/misc/checkin/ErrorCodeTest.java b/src/test/java/misc/checkin/ErrorCodeTest.java
similarity index 100%
rename from test/src/misc/checkin/ErrorCodeTest.java
rename to src/test/java/misc/checkin/ErrorCodeTest.java
diff --git a/test/src/misc/checkin/RichParserTests.java b/src/test/java/misc/checkin/RichParserTests.java
similarity index 100%
rename from test/src/misc/checkin/RichParserTests.java
rename to src/test/java/misc/checkin/RichParserTests.java
diff --git a/test/src/misc/checkin/RuntimeSchemaLoaderTest.java b/src/test/java/misc/checkin/RuntimeSchemaLoaderTest.java
similarity index 100%
rename from test/src/misc/checkin/RuntimeSchemaLoaderTest.java
rename to src/test/java/misc/checkin/RuntimeSchemaLoaderTest.java
diff --git a/test/src/misc/checkin/ThreadingTest.java b/src/test/java/misc/checkin/ThreadingTest.java
similarity index 100%
rename from test/src/misc/checkin/ThreadingTest.java
rename to src/test/java/misc/checkin/ThreadingTest.java
diff --git a/test/src/misc/checkin/VersionTest.java b/src/test/java/misc/checkin/VersionTest.java
similarity index 100%
rename from test/src/misc/checkin/VersionTest.java
rename to src/test/java/misc/checkin/VersionTest.java
diff --git a/test/src/misc/checkin/XMLBEANS412Test.java b/src/test/java/misc/checkin/XMLBEANS412Test.java
similarity index 100%
rename from test/src/misc/checkin/XMLBEANS412Test.java
rename to src/test/java/misc/checkin/XMLBEANS412Test.java
diff --git a/test/src/misc/checkin/XmlDocumentPropertiesTest.java b/src/test/java/misc/checkin/XmlDocumentPropertiesTest.java
similarity index 100%
rename from test/src/misc/checkin/XmlDocumentPropertiesTest.java
rename to src/test/java/misc/checkin/XmlDocumentPropertiesTest.java
diff --git a/test/src/misc/common/JiraTestBase.java b/src/test/java/misc/common/JiraTestBase.java
similarity index 100%
rename from test/src/misc/common/JiraTestBase.java
rename to src/test/java/misc/common/JiraTestBase.java
diff --git a/test/src/misc/common/ParsersBase.java b/src/test/java/misc/common/ParsersBase.java
similarity index 100%
rename from test/src/misc/common/ParsersBase.java
rename to src/test/java/misc/common/ParsersBase.java
diff --git a/test/src/misc/detailed/CharEncodingTest.java b/src/test/java/misc/detailed/CharEncodingTest.java
similarity index 100%
rename from test/src/misc/detailed/CharEncodingTest.java
rename to src/test/java/misc/detailed/CharEncodingTest.java
diff --git a/test/src/misc/detailed/CharEscapeTest.java b/src/test/java/misc/detailed/CharEscapeTest.java
similarity index 100%
rename from test/src/misc/detailed/CharEscapeTest.java
rename to src/test/java/misc/detailed/CharEscapeTest.java
diff --git a/test/src/misc/detailed/ClassLoadingTest.java b/src/test/java/misc/detailed/ClassLoadingTest.java
similarity index 100%
rename from test/src/misc/detailed/ClassLoadingTest.java
rename to src/test/java/misc/detailed/ClassLoadingTest.java
diff --git a/test/src/misc/detailed/JiraRegression151_200Test.java b/src/test/java/misc/detailed/JiraRegression151_200Test.java
similarity index 100%
rename from test/src/misc/detailed/JiraRegression151_200Test.java
rename to src/test/java/misc/detailed/JiraRegression151_200Test.java
diff --git a/test/src/misc/detailed/JiraRegression1_50Test.java b/src/test/java/misc/detailed/JiraRegression1_50Test.java
similarity index 100%
rename from test/src/misc/detailed/JiraRegression1_50Test.java
rename to src/test/java/misc/detailed/JiraRegression1_50Test.java
diff --git a/test/src/misc/detailed/JiraRegression201_250Test.java b/src/test/java/misc/detailed/JiraRegression201_250Test.java
similarity index 100%
rename from test/src/misc/detailed/JiraRegression201_250Test.java
rename to src/test/java/misc/detailed/JiraRegression201_250Test.java
diff --git a/test/src/misc/detailed/JiraRegression251_300Test.java b/src/test/java/misc/detailed/JiraRegression251_300Test.java
similarity index 100%
rename from test/src/misc/detailed/JiraRegression251_300Test.java
rename to src/test/java/misc/detailed/JiraRegression251_300Test.java
diff --git a/test/src/misc/detailed/JiraRegression50_100Test.java b/src/test/java/misc/detailed/JiraRegression50_100Test.java
similarity index 100%
rename from test/src/misc/detailed/JiraRegression50_100Test.java
rename to src/test/java/misc/detailed/JiraRegression50_100Test.java
diff --git a/test/src/misc/detailed/JiraRegressionSchemaCompilerTest.java b/src/test/java/misc/detailed/JiraRegressionSchemaCompilerTest.java
similarity index 100%
rename from test/src/misc/detailed/JiraRegressionSchemaCompilerTest.java
rename to src/test/java/misc/detailed/JiraRegressionSchemaCompilerTest.java
diff --git a/test/src/misc/detailed/JiraRegressionTest101_150.java b/src/test/java/misc/detailed/JiraRegressionTest101_150.java
similarity index 100%
rename from test/src/misc/detailed/JiraRegressionTest101_150.java
rename to src/test/java/misc/detailed/JiraRegressionTest101_150.java
diff --git a/test/src/misc/detailed/LargeEnumTest.java b/src/test/java/misc/detailed/LargeEnumTest.java
similarity index 100%
rename from test/src/misc/detailed/LargeEnumTest.java
rename to src/test/java/misc/detailed/LargeEnumTest.java
diff --git a/src/test/java/misc/detailed/SampleRunner.java b/src/test/java/misc/detailed/SampleRunner.java
new file mode 100644
index 0000000..e95b00a
--- /dev/null
+++ b/src/test/java/misc/detailed/SampleRunner.java
@@ -0,0 +1,302 @@
+/*   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.

+ */

+package misc.detailed;

+

+import org.apache.tools.ant.*;

+import org.junit.Before;

+import org.junit.Test;

+

+import java.io.File;

+import java.io.FilenameFilter;

+import java.io.PrintStream;

+import java.util.ArrayList;

+

+/**

+ * Date: Feb 8, 2005

+ * Time: 11:30:24 AM

+ */

+public class SampleRunner {

+

+    private ArrayList samples;

+    private Project proj;

+    private Target target;

+    private String XMLBEANS_HOME;

+    private SamplesBuildFileTest runSampleTest;

+

+

+    @Before

+    protected void setUp() throws Exception {

+        proj = new Project();

+        proj.setName("Samples Task Tests");

+        XMLBEANS_HOME = proj.getBaseDir().getAbsolutePath();

+        samples = new ArrayList();

+        runSampleTest = new SamplesBuildFileTest();

+    }

+

+    @Test

+    public void testSamples() throws Exception {

+        loadSampleDirs(new File("./samples"));

+        ArrayList exceptions = new ArrayList();

+        for (int i = 0; i < samples.size(); i++)

+        {

+

+            runSampleTest.call_samples_task(

+                ((File) samples.get(i)).getAbsolutePath()

+                , "test");

+            BuildException e;

+            if ((e = runSampleTest.getAnyExceptions()) != null)

+            {

+                exceptions.add(((File) samples.get(i)).getAbsolutePath());

+                exceptions.add(e.getException());

+            }

+        }

+        if (exceptions.size() != 0)

+            throw new RuntimeException(getMessageFromExceptions(exceptions));

+

+    }

+

+    private String getMessageFromExceptions(ArrayList ex)

+    {

+        StringBuilder sb = new StringBuilder();

+        for (int i = 0; i < ex.size(); i += 2)

+        {

+            sb.append("\n\nFILE:" + (String) ex.get(i));

+            sb.append(

+                "\n **Error: " + ((BuildException) ex.get(i + 1)).getMessage());

+        }

+        return sb.toString();

+    }

+

+    private void loadSampleDirs(File dir)

+    {

+        assert dir != null && dir.exists();

+        File[] files = dir.listFiles(new BuildFilter());

+        assert files.length == 1;

+        samples.add(files[0]);

+

+    }

+

+    private class BuildFilter

+        implements FilenameFilter

+    {

+        public boolean accept(File file, String name)

+        {

+            return name.equals("build.xml");

+        }

+    }

+

+    private class SamplesBuildFileTest extends BuildFileTest {

+        public void call_samples_task(String projectPath, String taskName)

+        {

+            configureProject(projectPath);

+            Project proj = getProject();

+            proj.setProperty("xmlbeans.home", XMLBEANS_HOME);

+            executeTarget(proj.getDefaultTarget());

+        }

+

+        public BuildException getAnyExceptions()

+            throws Exception

+        {

+            return this.getBuildException();

+        }

+    }

+}

+

+abstract class BuildFileTest {

+

+    protected Project project;

+

+    private StringBuilder logBuffer;

+    private StringBuilder fullLogBuffer;

+    private StringBuilder outBuffer;

+    private StringBuilder errBuffer;

+    private BuildException buildException;

+

+    protected String getOutput() {

+        return cleanBuffer(outBuffer);

+    }

+

+    protected String getError() {

+        return cleanBuffer(errBuffer);

+    }

+

+    protected BuildException getBuildException() {

+        return buildException;

+    }

+

+    private String cleanBuffer(StringBuilder buffer) {

+        StringBuilder cleanedBuffer = new StringBuilder();

+        boolean cr = false;

+        for (int i = 0; i < buffer.length(); i++) {

+            char ch = buffer.charAt(i);

+            if (ch == '\r') {

+                cr = true;

+                continue;

+            }

+

+            if (!cr) {

+                cleanedBuffer.append(ch);

+            } else {

+                if (ch == '\n') {

+                    cleanedBuffer.append(ch);

+                } else {

+                    cleanedBuffer.append('\r').append(ch);

+                }

+            }

+        }

+        return cleanedBuffer.toString();

+    }

+

+    /**

+     *  set up to run the named project

+     *

+     * @param  filename name of project file to run

+     */

+    protected void configureProject(String filename) throws BuildException {

+        logBuffer = new StringBuilder();

+        fullLogBuffer = new StringBuilder();

+        project = new Project();

+        project.init();

+        project.setUserProperty( "ant.file" , new File(filename).getAbsolutePath() );

+        project.addBuildListener(new BuildFileTest.AntTestListener());

+        //ProjectHelper.configureProject(project, new File(filename));

+        ProjectHelper.getProjectHelper().parse(project, new File(filename));

+    }

+

+    /**

+     *  execute a target we have set up

+     * @pre configureProject has been called

+     * @param  targetName  target to run

+     */

+    protected void executeTarget(String targetName) {

+        PrintStream sysOut = System.out;

+        PrintStream sysErr = System.err;

+        try {

+            sysOut.flush();

+            sysErr.flush();

+            outBuffer = new StringBuilder();

+            PrintStream out = new PrintStream(new BuildFileTest.AntOutputStream());

+            System.setOut(out);

+            errBuffer = new StringBuilder();

+            PrintStream err = new PrintStream(new BuildFileTest.AntOutputStream());

+            System.setErr(err);

+            logBuffer = new StringBuilder();

+            fullLogBuffer = new StringBuilder();

+            buildException = null;

+            project.executeTarget(targetName);

+        } finally {

+            System.setOut(sysOut);

+            System.setErr(sysErr);

+            // rajus: 2004/04/07

+            System.out.println("STDOUT+STDERR:\n" + getOutput() + getError());

+            System.out.println("END STDOUT+STDERR:");

+        }

+

+    }

+

+    /**

+     * Get the project which has been configured for a test.

+     *

+     * @return the Project instance for this test.

+     */

+    protected Project getProject() {

+        return project;

+    }

+

+    /**

+     * an output stream which saves stuff to our buffer.

+     */

+    private class AntOutputStream extends java.io.OutputStream {

+        public void write(int b) {

+            outBuffer.append((char)b);

+        }

+    }

+

+    /**

+     * our own personal build listener

+     */

+    private class AntTestListener implements BuildListener {

+        /**

+         *  Fired before any targets are started.

+         */

+        public void buildStarted(BuildEvent event) {

+        }

+

+        /**

+         *  Fired after the last target has finished. This event

+         *  will still be thrown if an error occured during the build.

+         *

+         *  @see BuildEvent#getException()

+         */

+        public void buildFinished(BuildEvent event) {

+        }

+

+        /**

+         *  Fired when a target is started.

+         *

+         *  @see BuildEvent#getTarget()

+         */

+        public void targetStarted(BuildEvent event) {

+            //System.out.println("targetStarted " + event.getTarget().getName());

+        }

+

+        /**

+         *  Fired when a target has finished. This event will

+         *  still be thrown if an error occured during the build.

+         *

+         *  @see BuildEvent#getException()

+         */

+        public void targetFinished(BuildEvent event) {

+            //System.out.println("targetFinished " + event.getTarget().getName());

+        }

+

+        /**

+         *  Fired when a task is started.

+         *

+         *  @see BuildEvent#getTask()

+         */

+        public void taskStarted(BuildEvent event) {

+            //System.out.println("taskStarted " + event.getTask().getTaskName());

+        }

+

+        /**

+         *  Fired when a task has finished. This event will still

+         *  be throw if an error occured during the build.

+         *

+         *  @see BuildEvent#getException()

+         */

+        public void taskFinished(BuildEvent event) {

+            //System.out.println("taskFinished " + event.getTask().getTaskName());

+        }

+

+        /**

+         *  Fired whenever a message is logged.

+         *

+         *  @see BuildEvent#getMessage()

+         *  @see BuildEvent#getPriority()

+         */

+        public void messageLogged(BuildEvent event) {

+            if (event.getPriority() == Project.MSG_INFO ||

+                event.getPriority() == Project.MSG_WARN ||

+                event.getPriority() == Project.MSG_ERR) {

+                logBuffer.append(event.getMessage());

+            }

+            fullLogBuffer.append(event.getMessage());

+

+        }

+    }

+

+

+}

diff --git a/test/src/misc/detailed/SystemCacheClassloadersTest.java b/src/test/java/misc/detailed/SystemCacheClassloadersTest.java
similarity index 100%
rename from test/src/misc/detailed/SystemCacheClassloadersTest.java
rename to src/test/java/misc/detailed/SystemCacheClassloadersTest.java
diff --git a/test/src/misc/detailed/SystemCacheTestImpl.java b/src/test/java/misc/detailed/SystemCacheTestImpl.java
similarity index 100%
rename from test/src/misc/detailed/SystemCacheTestImpl.java
rename to src/test/java/misc/detailed/SystemCacheTestImpl.java
diff --git a/test/src/misc/detailed/SystemCacheTests.java b/src/test/java/misc/detailed/SystemCacheTests.java
similarity index 100%
rename from test/src/misc/detailed/SystemCacheTests.java
rename to src/test/java/misc/detailed/SystemCacheTests.java
diff --git a/test/src/misc/detailed/ThreadLocalUtilTest.java b/src/test/java/misc/detailed/ThreadLocalUtilTest.java
similarity index 100%
rename from test/src/misc/detailed/ThreadLocalUtilTest.java
rename to src/test/java/misc/detailed/ThreadLocalUtilTest.java
diff --git a/test/src/misc/detailed/XMLStreamReaderTest.java b/src/test/java/misc/detailed/XMLStreamReaderTest.java
similarity index 100%
rename from test/src/misc/detailed/XMLStreamReaderTest.java
rename to src/test/java/misc/detailed/XMLStreamReaderTest.java
diff --git a/test/src/random/checkin/RandomTest.java b/src/test/java/random/checkin/RandomTest.java
similarity index 100%
rename from test/src/random/checkin/RandomTest.java
rename to src/test/java/random/checkin/RandomTest.java
diff --git a/test/src/random/common/Random.java b/src/test/java/random/common/Random.java
similarity index 100%
rename from test/src/random/common/Random.java
rename to src/test/java/random/common/Random.java
diff --git a/test/src/scomp/attributes/detailed/AttrGroupTest.java b/src/test/java/scomp/attributes/detailed/AttrGroupTest.java
similarity index 100%
rename from test/src/scomp/attributes/detailed/AttrGroupTest.java
rename to src/test/java/scomp/attributes/detailed/AttrGroupTest.java
diff --git a/test/src/scomp/attributes/detailed/GlobalAttrDefault.java b/src/test/java/scomp/attributes/detailed/GlobalAttrDefault.java
similarity index 100%
rename from test/src/scomp/attributes/detailed/GlobalAttrDefault.java
rename to src/test/java/scomp/attributes/detailed/GlobalAttrDefault.java
diff --git a/test/src/scomp/attributes/detailed/GlobalAttrFixed.java b/src/test/java/scomp/attributes/detailed/GlobalAttrFixed.java
similarity index 100%
rename from test/src/scomp/attributes/detailed/GlobalAttrFixed.java
rename to src/test/java/scomp/attributes/detailed/GlobalAttrFixed.java
diff --git a/test/src/scomp/attributes/detailed/GlobalAttrIdTest.java b/src/test/java/scomp/attributes/detailed/GlobalAttrIdTest.java
similarity index 100%
rename from test/src/scomp/attributes/detailed/GlobalAttrIdTest.java
rename to src/test/java/scomp/attributes/detailed/GlobalAttrIdTest.java
diff --git a/test/src/scomp/attributes/detailed/GlobalAttrType.java b/src/test/java/scomp/attributes/detailed/GlobalAttrType.java
similarity index 100%
rename from test/src/scomp/attributes/detailed/GlobalAttrType.java
rename to src/test/java/scomp/attributes/detailed/GlobalAttrType.java
diff --git a/test/src/scomp/attributes/detailed/LocalAttrFixedDefault.java b/src/test/java/scomp/attributes/detailed/LocalAttrFixedDefault.java
similarity index 100%
rename from test/src/scomp/attributes/detailed/LocalAttrFixedDefault.java
rename to src/test/java/scomp/attributes/detailed/LocalAttrFixedDefault.java
diff --git a/test/src/scomp/attributes/detailed/LocalAttrForm.java b/src/test/java/scomp/attributes/detailed/LocalAttrForm.java
similarity index 100%
rename from test/src/scomp/attributes/detailed/LocalAttrForm.java
rename to src/test/java/scomp/attributes/detailed/LocalAttrForm.java
diff --git a/test/src/scomp/attributes/detailed/LocalAttrUse.java b/src/test/java/scomp/attributes/detailed/LocalAttrUse.java
similarity index 100%
rename from test/src/scomp/attributes/detailed/LocalAttrUse.java
rename to src/test/java/scomp/attributes/detailed/LocalAttrUse.java
diff --git a/test/src/scomp/common/BaseCase.java b/src/test/java/scomp/common/BaseCase.java
similarity index 100%
rename from test/src/scomp/common/BaseCase.java
rename to src/test/java/scomp/common/BaseCase.java
diff --git a/test/src/scomp/contentType/complex/detailed/AnonymousTest.java b/src/test/java/scomp/contentType/complex/detailed/AnonymousTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/detailed/AnonymousTest.java
rename to src/test/java/scomp/contentType/complex/detailed/AnonymousTest.java
diff --git a/test/src/scomp/contentType/complex/detailed/ComplexContentTest.java b/src/test/java/scomp/contentType/complex/detailed/ComplexContentTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/detailed/ComplexContentTest.java
rename to src/test/java/scomp/contentType/complex/detailed/ComplexContentTest.java
diff --git a/test/src/scomp/contentType/complex/detailed/ElementOnlyContentTest.java b/src/test/java/scomp/contentType/complex/detailed/ElementOnlyContentTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/detailed/ElementOnlyContentTest.java
rename to src/test/java/scomp/contentType/complex/detailed/ElementOnlyContentTest.java
diff --git a/test/src/scomp/contentType/complex/detailed/EmptyContentTest.java b/src/test/java/scomp/contentType/complex/detailed/EmptyContentTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/detailed/EmptyContentTest.java
rename to src/test/java/scomp/contentType/complex/detailed/EmptyContentTest.java
diff --git a/test/src/scomp/contentType/complex/detailed/MixedContentTest.java b/src/test/java/scomp/contentType/complex/detailed/MixedContentTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/detailed/MixedContentTest.java
rename to src/test/java/scomp/contentType/complex/detailed/MixedContentTest.java
diff --git a/test/src/scomp/contentType/complex/detailed/NamedTest.java b/src/test/java/scomp/contentType/complex/detailed/NamedTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/detailed/NamedTest.java
rename to src/test/java/scomp/contentType/complex/detailed/NamedTest.java
diff --git a/test/src/scomp/contentType/complex/modelGroup/detailed/AllTest.java b/src/test/java/scomp/contentType/complex/modelGroup/detailed/AllTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/modelGroup/detailed/AllTest.java
rename to src/test/java/scomp/contentType/complex/modelGroup/detailed/AllTest.java
diff --git a/test/src/scomp/contentType/complex/modelGroup/detailed/ChoiceTest.java b/src/test/java/scomp/contentType/complex/modelGroup/detailed/ChoiceTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/modelGroup/detailed/ChoiceTest.java
rename to src/test/java/scomp/contentType/complex/modelGroup/detailed/ChoiceTest.java
diff --git a/test/src/scomp/contentType/complex/modelGroup/detailed/NestSequenceChoiceTest.java b/src/test/java/scomp/contentType/complex/modelGroup/detailed/NestSequenceChoiceTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/modelGroup/detailed/NestSequenceChoiceTest.java
rename to src/test/java/scomp/contentType/complex/modelGroup/detailed/NestSequenceChoiceTest.java
diff --git a/test/src/scomp/contentType/complex/modelGroup/detailed/SequenceTest.java b/src/test/java/scomp/contentType/complex/modelGroup/detailed/SequenceTest.java
similarity index 100%
rename from test/src/scomp/contentType/complex/modelGroup/detailed/SequenceTest.java
rename to src/test/java/scomp/contentType/complex/modelGroup/detailed/SequenceTest.java
diff --git a/test/src/scomp/contentType/simple/detailed/BuiltInType.java b/src/test/java/scomp/contentType/simple/detailed/BuiltInType.java
similarity index 100%
rename from test/src/scomp/contentType/simple/detailed/BuiltInType.java
rename to src/test/java/scomp/contentType/simple/detailed/BuiltInType.java
diff --git a/test/src/scomp/contentType/simple/detailed/ListType.java b/src/test/java/scomp/contentType/simple/detailed/ListType.java
similarity index 100%
rename from test/src/scomp/contentType/simple/detailed/ListType.java
rename to src/test/java/scomp/contentType/simple/detailed/ListType.java
diff --git a/test/src/scomp/contentType/simple/detailed/SimpleType.java b/src/test/java/scomp/contentType/simple/detailed/SimpleType.java
similarity index 100%
rename from test/src/scomp/contentType/simple/detailed/SimpleType.java
rename to src/test/java/scomp/contentType/simple/detailed/SimpleType.java
diff --git a/test/src/scomp/contentType/simple/detailed/UnionType.java b/src/test/java/scomp/contentType/simple/detailed/UnionType.java
similarity index 100%
rename from test/src/scomp/contentType/simple/detailed/UnionType.java
rename to src/test/java/scomp/contentType/simple/detailed/UnionType.java
diff --git a/test/src/scomp/derivation/detailed/AbstractTest.java b/src/test/java/scomp/derivation/detailed/AbstractTest.java
similarity index 100%
rename from test/src/scomp/derivation/detailed/AbstractTest.java
rename to src/test/java/scomp/derivation/detailed/AbstractTest.java
diff --git a/test/src/scomp/derivation/detailed/BlockTest.java b/src/test/java/scomp/derivation/detailed/BlockTest.java
similarity index 100%
rename from test/src/scomp/derivation/detailed/BlockTest.java
rename to src/test/java/scomp/derivation/detailed/BlockTest.java
diff --git a/test/src/scomp/derivation/extension/detailed/AttributeExtensionTest.java b/src/test/java/scomp/derivation/extension/detailed/AttributeExtensionTest.java
similarity index 100%
rename from test/src/scomp/derivation/extension/detailed/AttributeExtensionTest.java
rename to src/test/java/scomp/derivation/extension/detailed/AttributeExtensionTest.java
diff --git a/test/src/scomp/derivation/extension/detailed/AttributeWCExtension.java b/src/test/java/scomp/derivation/extension/detailed/AttributeWCExtension.java
similarity index 100%
rename from test/src/scomp/derivation/extension/detailed/AttributeWCExtension.java
rename to src/test/java/scomp/derivation/extension/detailed/AttributeWCExtension.java
diff --git a/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java b/src/test/java/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java
similarity index 100%
rename from test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java
rename to src/test/java/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java
diff --git a/test/src/scomp/derivation/extension/detailed/EmptyContentExtension.java b/src/test/java/scomp/derivation/extension/detailed/EmptyContentExtension.java
similarity index 100%
rename from test/src/scomp/derivation/extension/detailed/EmptyContentExtension.java
rename to src/test/java/scomp/derivation/extension/detailed/EmptyContentExtension.java
diff --git a/test/src/scomp/derivation/extension/detailed/MixedContentExtension.java b/src/test/java/scomp/derivation/extension/detailed/MixedContentExtension.java
similarity index 100%
rename from test/src/scomp/derivation/extension/detailed/MixedContentExtension.java
rename to src/test/java/scomp/derivation/extension/detailed/MixedContentExtension.java
diff --git a/test/src/scomp/derivation/extension/detailed/SimpleTypeExtensionTest.java b/src/test/java/scomp/derivation/extension/detailed/SimpleTypeExtensionTest.java
similarity index 100%
rename from test/src/scomp/derivation/extension/detailed/SimpleTypeExtensionTest.java
rename to src/test/java/scomp/derivation/extension/detailed/SimpleTypeExtensionTest.java
diff --git a/test/src/scomp/derivation/restriction/detailed/AttrWCRestriction.java b/src/test/java/scomp/derivation/restriction/detailed/AttrWCRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/AttrWCRestriction.java
rename to src/test/java/scomp/derivation/restriction/detailed/AttrWCRestriction.java
diff --git a/test/src/scomp/derivation/restriction/detailed/AttributeRestriction.java b/src/test/java/scomp/derivation/restriction/detailed/AttributeRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/AttributeRestriction.java
rename to src/test/java/scomp/derivation/restriction/detailed/AttributeRestriction.java
diff --git a/test/src/scomp/derivation/restriction/detailed/ElementRestriction.java b/src/test/java/scomp/derivation/restriction/detailed/ElementRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/ElementRestriction.java
rename to src/test/java/scomp/derivation/restriction/detailed/ElementRestriction.java
diff --git a/test/src/scomp/derivation/restriction/detailed/ElementWCRestriction.java b/src/test/java/scomp/derivation/restriction/detailed/ElementWCRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/ElementWCRestriction.java
rename to src/test/java/scomp/derivation/restriction/detailed/ElementWCRestriction.java
diff --git a/test/src/scomp/derivation/restriction/detailed/EmptyContentRestriction.java b/src/test/java/scomp/derivation/restriction/detailed/EmptyContentRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/EmptyContentRestriction.java
rename to src/test/java/scomp/derivation/restriction/detailed/EmptyContentRestriction.java
diff --git a/test/src/scomp/derivation/restriction/detailed/EnumTest.java b/src/test/java/scomp/derivation/restriction/detailed/EnumTest.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/EnumTest.java
rename to src/test/java/scomp/derivation/restriction/detailed/EnumTest.java
diff --git a/test/src/scomp/derivation/restriction/detailed/GroupRestrictionTest.java b/src/test/java/scomp/derivation/restriction/detailed/GroupRestrictionTest.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/GroupRestrictionTest.java
rename to src/test/java/scomp/derivation/restriction/detailed/GroupRestrictionTest.java
diff --git a/test/src/scomp/derivation/restriction/detailed/MixedContentRestriction.java b/src/test/java/scomp/derivation/restriction/detailed/MixedContentRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/MixedContentRestriction.java
rename to src/test/java/scomp/derivation/restriction/detailed/MixedContentRestriction.java
diff --git a/test/src/scomp/derivation/restriction/detailed/SimpleContentRestrictionTest.java b/src/test/java/scomp/derivation/restriction/detailed/SimpleContentRestrictionTest.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/SimpleContentRestrictionTest.java
rename to src/test/java/scomp/derivation/restriction/detailed/SimpleContentRestrictionTest.java
diff --git a/test/src/scomp/derivation/restriction/detailed/SimpleTypeRestriction.java b/src/test/java/scomp/derivation/restriction/detailed/SimpleTypeRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/SimpleTypeRestriction.java
rename to src/test/java/scomp/derivation/restriction/detailed/SimpleTypeRestriction.java
diff --git a/test/src/scomp/derivation/restriction/detailed/SubstitutionTest.java b/src/test/java/scomp/derivation/restriction/detailed/SubstitutionTest.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/detailed/SubstitutionTest.java
rename to src/test/java/scomp/derivation/restriction/detailed/SubstitutionTest.java
diff --git a/test/src/scomp/derivation/restriction/facets/detailed/FacetRestrictionTest.java b/src/test/java/scomp/derivation/restriction/facets/detailed/FacetRestrictionTest.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/facets/detailed/FacetRestrictionTest.java
rename to src/test/java/scomp/derivation/restriction/facets/detailed/FacetRestrictionTest.java
diff --git a/test/src/scomp/derivation/restriction/facets/detailed/FacetsTest.java b/src/test/java/scomp/derivation/restriction/facets/detailed/FacetsTest.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/facets/detailed/FacetsTest.java
rename to src/test/java/scomp/derivation/restriction/facets/detailed/FacetsTest.java
diff --git a/test/src/scomp/derivation/restriction/facets/detailed/ListRestriction.java b/src/test/java/scomp/derivation/restriction/facets/detailed/ListRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/facets/detailed/ListRestriction.java
rename to src/test/java/scomp/derivation/restriction/facets/detailed/ListRestriction.java
diff --git a/test/src/scomp/derivation/restriction/facets/detailed/UnionRestriction.java b/src/test/java/scomp/derivation/restriction/facets/detailed/UnionRestriction.java
similarity index 100%
rename from test/src/scomp/derivation/restriction/facets/detailed/UnionRestriction.java
rename to src/test/java/scomp/derivation/restriction/facets/detailed/UnionRestriction.java
diff --git a/test/src/scomp/elements/detailed/AnyTest.java b/src/test/java/scomp/elements/detailed/AnyTest.java
similarity index 100%
rename from test/src/scomp/elements/detailed/AnyTest.java
rename to src/test/java/scomp/elements/detailed/AnyTest.java
diff --git a/test/src/scomp/elements/detailed/GlobalEltDefault.java b/src/test/java/scomp/elements/detailed/GlobalEltDefault.java
similarity index 100%
rename from test/src/scomp/elements/detailed/GlobalEltDefault.java
rename to src/test/java/scomp/elements/detailed/GlobalEltDefault.java
diff --git a/test/src/scomp/elements/detailed/GlobalEltFixed.java b/src/test/java/scomp/elements/detailed/GlobalEltFixed.java
similarity index 100%
rename from test/src/scomp/elements/detailed/GlobalEltFixed.java
rename to src/test/java/scomp/elements/detailed/GlobalEltFixed.java
diff --git a/test/src/scomp/elements/detailed/GlobalEltId.java b/src/test/java/scomp/elements/detailed/GlobalEltId.java
similarity index 100%
rename from test/src/scomp/elements/detailed/GlobalEltId.java
rename to src/test/java/scomp/elements/detailed/GlobalEltId.java
diff --git a/test/src/scomp/elements/detailed/GlobalEltNillable.java b/src/test/java/scomp/elements/detailed/GlobalEltNillable.java
similarity index 100%
rename from test/src/scomp/elements/detailed/GlobalEltNillable.java
rename to src/test/java/scomp/elements/detailed/GlobalEltNillable.java
diff --git a/test/src/scomp/elements/detailed/LocalEltMinMaxOccurs.java b/src/test/java/scomp/elements/detailed/LocalEltMinMaxOccurs.java
similarity index 100%
rename from test/src/scomp/elements/detailed/LocalEltMinMaxOccurs.java
rename to src/test/java/scomp/elements/detailed/LocalEltMinMaxOccurs.java
diff --git a/test/src/scomp/elements/detailed/NamedModelGroupsTest.java b/src/test/java/scomp/elements/detailed/NamedModelGroupsTest.java
similarity index 100%
rename from test/src/scomp/elements/detailed/NamedModelGroupsTest.java
rename to src/test/java/scomp/elements/detailed/NamedModelGroupsTest.java
diff --git a/test/src/scomp/elements/detailed/NillTest.java b/src/test/java/scomp/elements/detailed/NillTest.java
similarity index 100%
rename from test/src/scomp/elements/detailed/NillTest.java
rename to src/test/java/scomp/elements/detailed/NillTest.java
diff --git a/test/src/scomp/idConstraint/detailed/KeyKeyref.java b/src/test/java/scomp/idConstraint/detailed/KeyKeyref.java
similarity index 100%
rename from test/src/scomp/idConstraint/detailed/KeyKeyref.java
rename to src/test/java/scomp/idConstraint/detailed/KeyKeyref.java
diff --git a/test/src/scomp/namespace/checkin/PreserveNamespaces.java b/src/test/java/scomp/namespace/checkin/PreserveNamespaces.java
similarity index 100%
rename from test/src/scomp/namespace/checkin/PreserveNamespaces.java
rename to src/test/java/scomp/namespace/checkin/PreserveNamespaces.java
diff --git a/test/src/scomp/namespace/detailed/AttrFormDefault.java b/src/test/java/scomp/namespace/detailed/AttrFormDefault.java
similarity index 100%
rename from test/src/scomp/namespace/detailed/AttrFormDefault.java
rename to src/test/java/scomp/namespace/detailed/AttrFormDefault.java
diff --git a/test/src/scomp/namespace/detailed/AttributeWC.java b/src/test/java/scomp/namespace/detailed/AttributeWC.java
similarity index 100%
rename from test/src/scomp/namespace/detailed/AttributeWC.java
rename to src/test/java/scomp/namespace/detailed/AttributeWC.java
diff --git a/test/src/scomp/namespace/detailed/ElementFormDefault.java b/src/test/java/scomp/namespace/detailed/ElementFormDefault.java
similarity index 100%
rename from test/src/scomp/namespace/detailed/ElementFormDefault.java
rename to src/test/java/scomp/namespace/detailed/ElementFormDefault.java
diff --git a/test/src/scomp/namespace/detailed/ElementWC.java b/src/test/java/scomp/namespace/detailed/ElementWC.java
similarity index 100%
rename from test/src/scomp/namespace/detailed/ElementWC.java
rename to src/test/java/scomp/namespace/detailed/ElementWC.java
diff --git a/test/src/scomp/redefine/detailed/AttrGroupRedefine.java b/src/test/java/scomp/redefine/detailed/AttrGroupRedefine.java
similarity index 100%
rename from test/src/scomp/redefine/detailed/AttrGroupRedefine.java
rename to src/test/java/scomp/redefine/detailed/AttrGroupRedefine.java
diff --git a/test/src/scomp/redefine/detailed/GroupRedefine.java b/src/test/java/scomp/redefine/detailed/GroupRedefine.java
similarity index 100%
rename from test/src/scomp/redefine/detailed/GroupRedefine.java
rename to src/test/java/scomp/redefine/detailed/GroupRedefine.java
diff --git a/test/src/scomp/redefine/detailed/MultipleRedefines.java b/src/test/java/scomp/redefine/detailed/MultipleRedefines.java
similarity index 100%
rename from test/src/scomp/redefine/detailed/MultipleRedefines.java
rename to src/test/java/scomp/redefine/detailed/MultipleRedefines.java
diff --git a/test/src/scomp/redefine/detailed/SimpleRedefine.java b/src/test/java/scomp/redefine/detailed/SimpleRedefine.java
similarity index 100%
rename from test/src/scomp/redefine/detailed/SimpleRedefine.java
rename to src/test/java/scomp/redefine/detailed/SimpleRedefine.java
diff --git a/test/src/scomp/simple/SimplePersonTest.java b/src/test/java/scomp/simple/SimplePersonTest.java
similarity index 100%
rename from test/src/scomp/simple/SimplePersonTest.java
rename to src/test/java/scomp/simple/SimplePersonTest.java
diff --git a/test/src/scomp/substGroup/detailed/Deep.java b/src/test/java/scomp/substGroup/detailed/Deep.java
similarity index 100%
rename from test/src/scomp/substGroup/detailed/Deep.java
rename to src/test/java/scomp/substGroup/detailed/Deep.java
diff --git a/test/src/scomp/substGroup/detailed/OneLevel.java b/src/test/java/scomp/substGroup/detailed/OneLevel.java
similarity index 100%
rename from test/src/scomp/substGroup/detailed/OneLevel.java
rename to src/test/java/scomp/substGroup/detailed/OneLevel.java
diff --git a/test/src/scomp/substGroup/detailed/UserReportedTest.java b/src/test/java/scomp/substGroup/detailed/UserReportedTest.java
similarity index 100%
rename from test/src/scomp/substGroup/detailed/UserReportedTest.java
rename to src/test/java/scomp/substGroup/detailed/UserReportedTest.java
diff --git a/test/src/scomp/substGroup/detailed/Wide.java b/src/test/java/scomp/substGroup/detailed/Wide.java
similarity index 100%
rename from test/src/scomp/substGroup/detailed/Wide.java
rename to src/test/java/scomp/substGroup/detailed/Wide.java
diff --git a/test/src/scomp/substGroup/restriction/detailed/Abstract.java b/src/test/java/scomp/substGroup/restriction/detailed/Abstract.java
similarity index 100%
rename from test/src/scomp/substGroup/restriction/detailed/Abstract.java
rename to src/test/java/scomp/substGroup/restriction/detailed/Abstract.java
diff --git a/test/src/scomp/substGroup/restriction/detailed/Block.java b/src/test/java/scomp/substGroup/restriction/detailed/Block.java
similarity index 100%
rename from test/src/scomp/substGroup/restriction/detailed/Block.java
rename to src/test/java/scomp/substGroup/restriction/detailed/Block.java
diff --git a/test/src/scomp/substGroup/restriction/detailed/Final.java b/src/test/java/scomp/substGroup/restriction/detailed/Final.java
similarity index 100%
rename from test/src/scomp/substGroup/restriction/detailed/Final.java
rename to src/test/java/scomp/substGroup/restriction/detailed/Final.java
diff --git a/test/tools/src/tools/JUnit/JUnitXResultFormatter.java b/src/test/java/tools/JUnit/JUnitXResultFormatter.java
similarity index 100%
rename from test/tools/src/tools/JUnit/JUnitXResultFormatter.java
rename to src/test/java/tools/JUnit/JUnitXResultFormatter.java
diff --git a/test/tools/src/tools/JUnit/JUnitXRunner.java b/src/test/java/tools/JUnit/JUnitXRunner.java
similarity index 100%
rename from test/tools/src/tools/JUnit/JUnitXRunner.java
rename to src/test/java/tools/JUnit/JUnitXRunner.java
diff --git a/test/tools/src/tools/JUnit/JUnitXTask.java b/src/test/java/tools/JUnit/JUnitXTask.java
similarity index 100%
rename from test/tools/src/tools/JUnit/JUnitXTask.java
rename to src/test/java/tools/JUnit/JUnitXTask.java
diff --git a/test/tools/src/tools/JUnit/SimpleResultFormatter.java b/src/test/java/tools/JUnit/SimpleResultFormatter.java
similarity index 100%
rename from test/tools/src/tools/JUnit/SimpleResultFormatter.java
rename to src/test/java/tools/JUnit/SimpleResultFormatter.java
diff --git a/test/tools/src/tools/JUnit/TestReportMergeUtility.java b/src/test/java/tools/JUnit/TestReportMergeUtility.java
similarity index 100%
rename from test/tools/src/tools/JUnit/TestReportMergeUtility.java
rename to src/test/java/tools/JUnit/TestReportMergeUtility.java
diff --git a/test/tools/src/tools/JUnit/XmlResultFormatter.java b/src/test/java/tools/JUnit/XmlResultFormatter.java
similarity index 100%
rename from test/tools/src/tools/JUnit/XmlResultFormatter.java
rename to src/test/java/tools/JUnit/XmlResultFormatter.java
diff --git a/test/tools/src/tools/JUnit/XmlResultFormatterImpl.java b/src/test/java/tools/JUnit/XmlResultFormatterImpl.java
similarity index 100%
rename from test/tools/src/tools/JUnit/XmlResultFormatterImpl.java
rename to src/test/java/tools/JUnit/XmlResultFormatterImpl.java
diff --git a/test/src/tools/inst2xsd/checkin/Inst2XsdAttrTest.java b/src/test/java/tools/inst2xsd/checkin/Inst2XsdAttrTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/checkin/Inst2XsdAttrTest.java
rename to src/test/java/tools/inst2xsd/checkin/Inst2XsdAttrTest.java
diff --git a/test/src/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java b/src/test/java/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java
rename to src/test/java/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java
diff --git a/test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java b/src/test/java/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java
rename to src/test/java/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java
diff --git a/test/src/tools/inst2xsd/checkin/Inst2XsdTypeTest.java b/src/test/java/tools/inst2xsd/checkin/Inst2XsdTypeTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/checkin/Inst2XsdTypeTest.java
rename to src/test/java/tools/inst2xsd/checkin/Inst2XsdTypeTest.java
diff --git a/test/src/tools/inst2xsd/common/Inst2XsdCommon.java b/src/test/java/tools/inst2xsd/common/Inst2XsdCommon.java
similarity index 100%
rename from test/src/tools/inst2xsd/common/Inst2XsdCommon.java
rename to src/test/java/tools/inst2xsd/common/Inst2XsdCommon.java
diff --git a/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java b/src/test/java/tools/inst2xsd/common/Inst2XsdTestBase.java
similarity index 100%
rename from test/src/tools/inst2xsd/common/Inst2XsdTestBase.java
rename to src/test/java/tools/inst2xsd/common/Inst2XsdTestBase.java
diff --git a/test/src/tools/inst2xsd/detailed/ComplexDetailedTest.java b/src/test/java/tools/inst2xsd/detailed/ComplexDetailedTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/detailed/ComplexDetailedTest.java
rename to src/test/java/tools/inst2xsd/detailed/ComplexDetailedTest.java
diff --git a/test/src/tools/inst2xsd/detailed/DetailedLCDTest.java b/src/test/java/tools/inst2xsd/detailed/DetailedLCDTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/detailed/DetailedLCDTest.java
rename to src/test/java/tools/inst2xsd/detailed/DetailedLCDTest.java
diff --git a/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java b/src/test/java/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java
rename to src/test/java/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java
diff --git a/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java b/src/test/java/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java
rename to src/test/java/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java
diff --git a/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java b/src/test/java/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java
rename to src/test/java/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java
diff --git a/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java b/src/test/java/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java
rename to src/test/java/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java
diff --git a/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java b/src/test/java/tools/inst2xsd/detailed/Inst2XsdMiscTest.java
similarity index 100%
rename from test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java
rename to src/test/java/tools/inst2xsd/detailed/Inst2XsdMiscTest.java
diff --git a/test/tools/src/tools/io/TeeOutputStream.java b/src/test/java/tools/io/TeeOutputStream.java
similarity index 100%
rename from test/tools/src/tools/io/TeeOutputStream.java
rename to src/test/java/tools/io/TeeOutputStream.java
diff --git a/test/tools/src/tools/util/ClassCompare.java b/src/test/java/tools/util/ClassCompare.java
similarity index 100%
rename from test/tools/src/tools/util/ClassCompare.java
rename to src/test/java/tools/util/ClassCompare.java
diff --git a/test/tools/src/tools/util/Diff.java b/src/test/java/tools/util/Diff.java
similarity index 100%
rename from test/tools/src/tools/util/Diff.java
rename to src/test/java/tools/util/Diff.java
diff --git a/test/tools/src/tools/util/JarUtil.java b/src/test/java/tools/util/JarUtil.java
similarity index 100%
rename from test/tools/src/tools/util/JarUtil.java
rename to src/test/java/tools/util/JarUtil.java
diff --git a/test/tools/src/tools/util/Log.java b/src/test/java/tools/util/Log.java
similarity index 100%
rename from test/tools/src/tools/util/Log.java
rename to src/test/java/tools/util/Log.java
diff --git a/test/tools/src/tools/util/ResourceClass.java b/src/test/java/tools/util/ResourceClass.java
similarity index 100%
rename from test/tools/src/tools/util/ResourceClass.java
rename to src/test/java/tools/util/ResourceClass.java
diff --git a/test/tools/src/tools/util/ResourceUtil.java b/src/test/java/tools/util/ResourceUtil.java
similarity index 100%
rename from test/tools/src/tools/util/ResourceUtil.java
rename to src/test/java/tools/util/ResourceUtil.java
diff --git a/test/tools/src/tools/util/SchemaFilenameFilter.java b/src/test/java/tools/util/SchemaFilenameFilter.java
similarity index 100%
rename from test/tools/src/tools/util/SchemaFilenameFilter.java
rename to src/test/java/tools/util/SchemaFilenameFilter.java
diff --git a/test/tools/src/tools/util/SchemaValidator.java b/src/test/java/tools/util/SchemaValidator.java
similarity index 100%
rename from test/tools/src/tools/util/SchemaValidator.java
rename to src/test/java/tools/util/SchemaValidator.java
diff --git a/test/tools/src/tools/util/Util.java b/src/test/java/tools/util/Util.java
similarity index 100%
rename from test/tools/src/tools/util/Util.java
rename to src/test/java/tools/util/Util.java
diff --git a/test/tools/src/tools/util/XMLFilenameFilter.java b/src/test/java/tools/util/XMLFilenameFilter.java
similarity index 100%
rename from test/tools/src/tools/util/XMLFilenameFilter.java
rename to src/test/java/tools/util/XMLFilenameFilter.java
diff --git a/test/tools/src/tools/xml/Utils.java b/src/test/java/tools/xml/Utils.java
similarity index 100%
rename from test/tools/src/tools/xml/Utils.java
rename to src/test/java/tools/xml/Utils.java
diff --git a/test/tools/src/tools/xml/XmlComparator.java b/src/test/java/tools/xml/XmlComparator.java
similarity index 100%
rename from test/tools/src/tools/xml/XmlComparator.java
rename to src/test/java/tools/xml/XmlComparator.java
diff --git a/test/src/xmlcursor/checkin/AddToSelectionTest.java b/src/test/java/xmlcursor/checkin/AddToSelectionTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/AddToSelectionTest.java
rename to src/test/java/xmlcursor/checkin/AddToSelectionTest.java
diff --git a/test/src/xmlcursor/checkin/AnnotationsTests.java b/src/test/java/xmlcursor/checkin/AnnotationsTests.java
similarity index 100%
rename from test/src/xmlcursor/checkin/AnnotationsTests.java
rename to src/test/java/xmlcursor/checkin/AnnotationsTests.java
diff --git a/test/src/xmlcursor/checkin/BeginElementTest.java b/src/test/java/xmlcursor/checkin/BeginElementTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/BeginElementTest.java
rename to src/test/java/xmlcursor/checkin/BeginElementTest.java
diff --git a/test/src/xmlcursor/checkin/ClearBookmarkTest.java b/src/test/java/xmlcursor/checkin/ClearBookmarkTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ClearBookmarkTest.java
rename to src/test/java/xmlcursor/checkin/ClearBookmarkTest.java
diff --git a/test/src/xmlcursor/checkin/ClearSelectionTest.java b/src/test/java/xmlcursor/checkin/ClearSelectionTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ClearSelectionTest.java
rename to src/test/java/xmlcursor/checkin/ClearSelectionTest.java
diff --git a/test/src/xmlcursor/checkin/ComparePositionTest.java b/src/test/java/xmlcursor/checkin/ComparePositionTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ComparePositionTest.java
rename to src/test/java/xmlcursor/checkin/ComparePositionTest.java
diff --git a/test/src/xmlcursor/checkin/CopyTest.java b/src/test/java/xmlcursor/checkin/CopyTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/CopyTest.java
rename to src/test/java/xmlcursor/checkin/CopyTest.java
diff --git a/test/src/xmlcursor/checkin/CopyXmlContentsTest.java b/src/test/java/xmlcursor/checkin/CopyXmlContentsTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/CopyXmlContentsTest.java
rename to src/test/java/xmlcursor/checkin/CopyXmlContentsTest.java
diff --git a/test/src/xmlcursor/checkin/CurrentTokenTypeTest.java b/src/test/java/xmlcursor/checkin/CurrentTokenTypeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/CurrentTokenTypeTest.java
rename to src/test/java/xmlcursor/checkin/CurrentTokenTypeTest.java
diff --git a/test/src/xmlcursor/checkin/DisposeTest.java b/src/test/java/xmlcursor/checkin/DisposeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/DisposeTest.java
rename to src/test/java/xmlcursor/checkin/DisposeTest.java
diff --git a/test/src/xmlcursor/checkin/GetAllBookmarkRefsTest.java b/src/test/java/xmlcursor/checkin/GetAllBookmarkRefsTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetAllBookmarkRefsTest.java
rename to src/test/java/xmlcursor/checkin/GetAllBookmarkRefsTest.java
diff --git a/test/src/xmlcursor/checkin/GetAllNamespacesTest.java b/src/test/java/xmlcursor/checkin/GetAllNamespacesTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetAllNamespacesTest.java
rename to src/test/java/xmlcursor/checkin/GetAllNamespacesTest.java
diff --git a/test/src/xmlcursor/checkin/GetAttributeTextTest.java b/src/test/java/xmlcursor/checkin/GetAttributeTextTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetAttributeTextTest.java
rename to src/test/java/xmlcursor/checkin/GetAttributeTextTest.java
diff --git a/test/src/xmlcursor/checkin/GetBookmarkTest.java b/src/test/java/xmlcursor/checkin/GetBookmarkTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetBookmarkTest.java
rename to src/test/java/xmlcursor/checkin/GetBookmarkTest.java
diff --git a/test/src/xmlcursor/checkin/GetCharsTest.java b/src/test/java/xmlcursor/checkin/GetCharsTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetCharsTest.java
rename to src/test/java/xmlcursor/checkin/GetCharsTest.java
diff --git a/test/src/xmlcursor/checkin/GetCharsType2Test.java b/src/test/java/xmlcursor/checkin/GetCharsType2Test.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetCharsType2Test.java
rename to src/test/java/xmlcursor/checkin/GetCharsType2Test.java
diff --git a/test/src/xmlcursor/checkin/GetDocChangeStampTest.java b/src/test/java/xmlcursor/checkin/GetDocChangeStampTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetDocChangeStampTest.java
rename to src/test/java/xmlcursor/checkin/GetDocChangeStampTest.java
diff --git a/test/src/xmlcursor/checkin/GetNameTest.java b/src/test/java/xmlcursor/checkin/GetNameTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetNameTest.java
rename to src/test/java/xmlcursor/checkin/GetNameTest.java
diff --git a/test/src/xmlcursor/checkin/GetObjectTest.java b/src/test/java/xmlcursor/checkin/GetObjectTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/GetObjectTest.java
rename to src/test/java/xmlcursor/checkin/GetObjectTest.java
diff --git a/test/src/xmlcursor/checkin/InsertAttributeTest.java b/src/test/java/xmlcursor/checkin/InsertAttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/InsertAttributeTest.java
rename to src/test/java/xmlcursor/checkin/InsertAttributeTest.java
diff --git a/test/src/xmlcursor/checkin/InsertCharsTest.java b/src/test/java/xmlcursor/checkin/InsertCharsTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/InsertCharsTest.java
rename to src/test/java/xmlcursor/checkin/InsertCharsTest.java
diff --git a/test/src/xmlcursor/checkin/InsertCommentTest.java b/src/test/java/xmlcursor/checkin/InsertCommentTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/InsertCommentTest.java
rename to src/test/java/xmlcursor/checkin/InsertCommentTest.java
diff --git a/test/src/xmlcursor/checkin/InsertElementTest.java b/src/test/java/xmlcursor/checkin/InsertElementTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/InsertElementTest.java
rename to src/test/java/xmlcursor/checkin/InsertElementTest.java
diff --git a/test/src/xmlcursor/checkin/InsertProcInstTest.java b/src/test/java/xmlcursor/checkin/InsertProcInstTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/InsertProcInstTest.java
rename to src/test/java/xmlcursor/checkin/InsertProcInstTest.java
diff --git a/test/src/xmlcursor/checkin/IsAtSamePositionAsTest.java b/src/test/java/xmlcursor/checkin/IsAtSamePositionAsTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/IsAtSamePositionAsTest.java
rename to src/test/java/xmlcursor/checkin/IsAtSamePositionAsTest.java
diff --git a/test/src/xmlcursor/checkin/IsInSameDocumentTest.java b/src/test/java/xmlcursor/checkin/IsInSameDocumentTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/IsInSameDocumentTest.java
rename to src/test/java/xmlcursor/checkin/IsInSameDocumentTest.java
diff --git a/test/src/xmlcursor/checkin/MoveCharsTest.java b/src/test/java/xmlcursor/checkin/MoveCharsTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/MoveCharsTest.java
rename to src/test/java/xmlcursor/checkin/MoveCharsTest.java
diff --git a/test/src/xmlcursor/checkin/MoveTest.java b/src/test/java/xmlcursor/checkin/MoveTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/MoveTest.java
rename to src/test/java/xmlcursor/checkin/MoveTest.java
diff --git a/test/src/xmlcursor/checkin/PrevTokenTypeTest.java b/src/test/java/xmlcursor/checkin/PrevTokenTypeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/PrevTokenTypeTest.java
rename to src/test/java/xmlcursor/checkin/PrevTokenTypeTest.java
diff --git a/test/src/xmlcursor/checkin/RemoveAttributeTest.java b/src/test/java/xmlcursor/checkin/RemoveAttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/RemoveAttributeTest.java
rename to src/test/java/xmlcursor/checkin/RemoveAttributeTest.java
diff --git a/test/src/xmlcursor/checkin/RemoveCharsTest.java b/src/test/java/xmlcursor/checkin/RemoveCharsTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/RemoveCharsTest.java
rename to src/test/java/xmlcursor/checkin/RemoveCharsTest.java
diff --git a/test/src/xmlcursor/checkin/RemoveTest.java b/src/test/java/xmlcursor/checkin/RemoveTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/RemoveTest.java
rename to src/test/java/xmlcursor/checkin/RemoveTest.java
diff --git a/test/src/xmlcursor/checkin/SelectPathTest.java b/src/test/java/xmlcursor/checkin/SelectPathTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/SelectPathTest.java
rename to src/test/java/xmlcursor/checkin/SelectPathTest.java
diff --git a/test/src/xmlcursor/checkin/SetAttributeTextTest.java b/src/test/java/xmlcursor/checkin/SetAttributeTextTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/SetAttributeTextTest.java
rename to src/test/java/xmlcursor/checkin/SetAttributeTextTest.java
diff --git a/test/src/xmlcursor/checkin/SetBookmarkTest.java b/src/test/java/xmlcursor/checkin/SetBookmarkTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/SetBookmarkTest.java
rename to src/test/java/xmlcursor/checkin/SetBookmarkTest.java
diff --git a/test/src/xmlcursor/checkin/SetNameTest.java b/src/test/java/xmlcursor/checkin/SetNameTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/SetNameTest.java
rename to src/test/java/xmlcursor/checkin/SetNameTest.java
diff --git a/test/src/xmlcursor/checkin/SetTextTest.java b/src/test/java/xmlcursor/checkin/SetTextTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/SetTextTest.java
rename to src/test/java/xmlcursor/checkin/SetTextTest.java
diff --git a/test/src/xmlcursor/checkin/StoreTests.java b/src/test/java/xmlcursor/checkin/StoreTests.java
similarity index 100%
rename from test/src/xmlcursor/checkin/StoreTests.java
rename to src/test/java/xmlcursor/checkin/StoreTests.java
diff --git a/test/src/xmlcursor/checkin/ToCursorTest.java b/src/test/java/xmlcursor/checkin/ToCursorTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToCursorTest.java
rename to src/test/java/xmlcursor/checkin/ToCursorTest.java
diff --git a/test/src/xmlcursor/checkin/ToFirstAttributeTest.java b/src/test/java/xmlcursor/checkin/ToFirstAttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToFirstAttributeTest.java
rename to src/test/java/xmlcursor/checkin/ToFirstAttributeTest.java
diff --git a/test/src/xmlcursor/checkin/ToFirstChildElementTest.java b/src/test/java/xmlcursor/checkin/ToFirstChildElementTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToFirstChildElementTest.java
rename to src/test/java/xmlcursor/checkin/ToFirstChildElementTest.java
diff --git a/test/src/xmlcursor/checkin/ToFirstContentTokenTest.java b/src/test/java/xmlcursor/checkin/ToFirstContentTokenTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToFirstContentTokenTest.java
rename to src/test/java/xmlcursor/checkin/ToFirstContentTokenTest.java
diff --git a/test/src/xmlcursor/checkin/ToLastAttributeTest.java b/src/test/java/xmlcursor/checkin/ToLastAttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToLastAttributeTest.java
rename to src/test/java/xmlcursor/checkin/ToLastAttributeTest.java
diff --git a/test/src/xmlcursor/checkin/ToLastChildElementTest.java b/src/test/java/xmlcursor/checkin/ToLastChildElementTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToLastChildElementTest.java
rename to src/test/java/xmlcursor/checkin/ToLastChildElementTest.java
diff --git a/test/src/xmlcursor/checkin/ToNextAttributeTest.java b/src/test/java/xmlcursor/checkin/ToNextAttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToNextAttributeTest.java
rename to src/test/java/xmlcursor/checkin/ToNextAttributeTest.java
diff --git a/test/src/xmlcursor/checkin/ToNextBookmarkTest.java b/src/test/java/xmlcursor/checkin/ToNextBookmarkTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToNextBookmarkTest.java
rename to src/test/java/xmlcursor/checkin/ToNextBookmarkTest.java
diff --git a/test/src/xmlcursor/checkin/ToNextCharTest.java b/src/test/java/xmlcursor/checkin/ToNextCharTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToNextCharTest.java
rename to src/test/java/xmlcursor/checkin/ToNextCharTest.java
diff --git a/test/src/xmlcursor/checkin/ToNextElementTest.java b/src/test/java/xmlcursor/checkin/ToNextElementTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToNextElementTest.java
rename to src/test/java/xmlcursor/checkin/ToNextElementTest.java
diff --git a/test/src/xmlcursor/checkin/ToNextSelectionTest.java b/src/test/java/xmlcursor/checkin/ToNextSelectionTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToNextSelectionTest.java
rename to src/test/java/xmlcursor/checkin/ToNextSelectionTest.java
diff --git a/test/src/xmlcursor/checkin/ToNextSiblingTest.java b/src/test/java/xmlcursor/checkin/ToNextSiblingTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToNextSiblingTest.java
rename to src/test/java/xmlcursor/checkin/ToNextSiblingTest.java
diff --git a/test/src/xmlcursor/checkin/ToParentElementTest.java b/src/test/java/xmlcursor/checkin/ToParentElementTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToParentElementTest.java
rename to src/test/java/xmlcursor/checkin/ToParentElementTest.java
diff --git a/test/src/xmlcursor/checkin/ToPrevAttributeTest.java b/src/test/java/xmlcursor/checkin/ToPrevAttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToPrevAttributeTest.java
rename to src/test/java/xmlcursor/checkin/ToPrevAttributeTest.java
diff --git a/test/src/xmlcursor/checkin/ToPrevBookmarkTest.java b/src/test/java/xmlcursor/checkin/ToPrevBookmarkTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToPrevBookmarkTest.java
rename to src/test/java/xmlcursor/checkin/ToPrevBookmarkTest.java
diff --git a/test/src/xmlcursor/checkin/ToPrevCharTest.java b/src/test/java/xmlcursor/checkin/ToPrevCharTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToPrevCharTest.java
rename to src/test/java/xmlcursor/checkin/ToPrevCharTest.java
diff --git a/test/src/xmlcursor/checkin/ToPrevElementTest.java b/src/test/java/xmlcursor/checkin/ToPrevElementTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/ToPrevElementTest.java
rename to src/test/java/xmlcursor/checkin/ToPrevElementTest.java
diff --git a/test/src/xmlcursor/checkin/TokensTest.java b/src/test/java/xmlcursor/checkin/TokensTest.java
similarity index 100%
rename from test/src/xmlcursor/checkin/TokensTest.java
rename to src/test/java/xmlcursor/checkin/TokensTest.java
diff --git a/test/src/xmlcursor/common/BasicCursorTestCase.java b/src/test/java/xmlcursor/common/BasicCursorTestCase.java
similarity index 100%
rename from test/src/xmlcursor/common/BasicCursorTestCase.java
rename to src/test/java/xmlcursor/common/BasicCursorTestCase.java
diff --git a/test/src/xmlcursor/common/Common.java b/src/test/java/xmlcursor/common/Common.java
similarity index 100%
rename from test/src/xmlcursor/common/Common.java
rename to src/test/java/xmlcursor/common/Common.java
diff --git a/test/src/xmlcursor/detailed/CopyCharsTest.java b/src/test/java/xmlcursor/detailed/CopyCharsTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/CopyCharsTest.java
rename to src/test/java/xmlcursor/detailed/CopyCharsTest.java
diff --git a/test/src/xmlcursor/detailed/CopyTest.java b/src/test/java/xmlcursor/detailed/CopyTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/CopyTest.java
rename to src/test/java/xmlcursor/detailed/CopyTest.java
diff --git a/test/src/xmlcursor/detailed/CursorGeneratedTypedObjectTest.java b/src/test/java/xmlcursor/detailed/CursorGeneratedTypedObjectTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/CursorGeneratedTypedObjectTest.java
rename to src/test/java/xmlcursor/detailed/CursorGeneratedTypedObjectTest.java
diff --git a/test/src/xmlcursor/detailed/CursorLocations.java b/src/test/java/xmlcursor/detailed/CursorLocations.java
similarity index 100%
rename from test/src/xmlcursor/detailed/CursorLocations.java
rename to src/test/java/xmlcursor/detailed/CursorLocations.java
diff --git a/test/src/xmlcursor/detailed/CursorVsObjectAttributeTest.java b/src/test/java/xmlcursor/detailed/CursorVsObjectAttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/CursorVsObjectAttributeTest.java
rename to src/test/java/xmlcursor/detailed/CursorVsObjectAttributeTest.java
diff --git a/test/src/xmlcursor/detailed/CursorVsObjectInsertRemoveTest.java b/src/test/java/xmlcursor/detailed/CursorVsObjectInsertRemoveTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/CursorVsObjectInsertRemoveTest.java
rename to src/test/java/xmlcursor/detailed/CursorVsObjectInsertRemoveTest.java
diff --git a/test/src/xmlcursor/detailed/CursorVsObjectSetGetTextTest.java b/src/test/java/xmlcursor/detailed/CursorVsObjectSetGetTextTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/CursorVsObjectSetGetTextTest.java
rename to src/test/java/xmlcursor/detailed/CursorVsObjectSetGetTextTest.java
diff --git a/test/src/xmlcursor/detailed/GetTextTest.java b/src/test/java/xmlcursor/detailed/GetTextTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/GetTextTest.java
rename to src/test/java/xmlcursor/detailed/GetTextTest.java
diff --git a/test/src/xmlcursor/detailed/GetTextValueTest.java b/src/test/java/xmlcursor/detailed/GetTextValueTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/GetTextValueTest.java
rename to src/test/java/xmlcursor/detailed/GetTextValueTest.java
diff --git a/test/src/xmlcursor/detailed/InsertAttributeTest2.java b/src/test/java/xmlcursor/detailed/InsertAttributeTest2.java
similarity index 100%
rename from test/src/xmlcursor/detailed/InsertAttributeTest2.java
rename to src/test/java/xmlcursor/detailed/InsertAttributeTest2.java
diff --git a/test/src/xmlcursor/detailed/InsertNamespaceTest.java b/src/test/java/xmlcursor/detailed/InsertNamespaceTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/InsertNamespaceTest.java
rename to src/test/java/xmlcursor/detailed/InsertNamespaceTest.java
diff --git a/test/src/xmlcursor/detailed/MoveXmlTest2.java b/src/test/java/xmlcursor/detailed/MoveXmlTest2.java
similarity index 100%
rename from test/src/xmlcursor/detailed/MoveXmlTest2.java
rename to src/test/java/xmlcursor/detailed/MoveXmlTest2.java
diff --git a/test/src/xmlcursor/detailed/MultipleCopyFromCursorTest.java b/src/test/java/xmlcursor/detailed/MultipleCopyFromCursorTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/MultipleCopyFromCursorTest.java
rename to src/test/java/xmlcursor/detailed/MultipleCopyFromCursorTest.java
diff --git a/test/src/xmlcursor/detailed/MultipleCopyTest.java b/src/test/java/xmlcursor/detailed/MultipleCopyTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/MultipleCopyTest.java
rename to src/test/java/xmlcursor/detailed/MultipleCopyTest.java
diff --git a/test/src/xmlcursor/detailed/MultipleCursorSetTest.java b/src/test/java/xmlcursor/detailed/MultipleCursorSetTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/MultipleCursorSetTest.java
rename to src/test/java/xmlcursor/detailed/MultipleCursorSetTest.java
diff --git a/test/src/xmlcursor/detailed/NamespaceForPrefixTest.java b/src/test/java/xmlcursor/detailed/NamespaceForPrefixTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/NamespaceForPrefixTest.java
rename to src/test/java/xmlcursor/detailed/NamespaceForPrefixTest.java
diff --git a/test/src/xmlcursor/detailed/ObjectCursorInteractionTest.java b/src/test/java/xmlcursor/detailed/ObjectCursorInteractionTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/ObjectCursorInteractionTest.java
rename to src/test/java/xmlcursor/detailed/ObjectCursorInteractionTest.java
diff --git a/test/src/xmlcursor/detailed/PrefixForNamespaceTest.java b/src/test/java/xmlcursor/detailed/PrefixForNamespaceTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/PrefixForNamespaceTest.java
rename to src/test/java/xmlcursor/detailed/PrefixForNamespaceTest.java
diff --git a/test/src/xmlcursor/detailed/PushPopTest.java b/src/test/java/xmlcursor/detailed/PushPopTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/PushPopTest.java
rename to src/test/java/xmlcursor/detailed/PushPopTest.java
diff --git a/test/src/xmlcursor/detailed/SelectionsTest.java b/src/test/java/xmlcursor/detailed/SelectionsTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/SelectionsTest.java
rename to src/test/java/xmlcursor/detailed/SelectionsTest.java
diff --git a/test/src/xmlcursor/detailed/SetTextValueTest.java b/src/test/java/xmlcursor/detailed/SetTextValueTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/SetTextValueTest.java
rename to src/test/java/xmlcursor/detailed/SetTextValueTest.java
diff --git a/test/src/xmlcursor/detailed/ToBookmarkTest.java b/src/test/java/xmlcursor/detailed/ToBookmarkTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/ToBookmarkTest.java
rename to src/test/java/xmlcursor/detailed/ToBookmarkTest.java
diff --git a/test/src/xmlcursor/detailed/ToChildTest.java b/src/test/java/xmlcursor/detailed/ToChildTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/ToChildTest.java
rename to src/test/java/xmlcursor/detailed/ToChildTest.java
diff --git a/test/src/xmlcursor/detailed/XmlLineNumberTest.java b/src/test/java/xmlcursor/detailed/XmlLineNumberTest.java
similarity index 100%
rename from test/src/xmlcursor/detailed/XmlLineNumberTest.java
rename to src/test/java/xmlcursor/detailed/XmlLineNumberTest.java
diff --git a/test/src/xmlcursor/jsr173/common/AttributeTest.java b/src/test/java/xmlcursor/jsr173/common/AttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/common/AttributeTest.java
rename to src/test/java/xmlcursor/jsr173/common/AttributeTest.java
diff --git a/test/src/xmlcursor/jsr173/common/CharactersTest.java b/src/test/java/xmlcursor/jsr173/common/CharactersTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/common/CharactersTest.java
rename to src/test/java/xmlcursor/jsr173/common/CharactersTest.java
diff --git a/test/src/xmlcursor/jsr173/common/ElementTest.java b/src/test/java/xmlcursor/jsr173/common/ElementTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/common/ElementTest.java
rename to src/test/java/xmlcursor/jsr173/common/ElementTest.java
diff --git a/test/src/xmlcursor/jsr173/common/GeneralMethodsTest.java b/src/test/java/xmlcursor/jsr173/common/GeneralMethodsTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/common/GeneralMethodsTest.java
rename to src/test/java/xmlcursor/jsr173/common/GeneralMethodsTest.java
diff --git a/test/src/xmlcursor/jsr173/common/IsXXXTest.java b/src/test/java/xmlcursor/jsr173/common/IsXXXTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/common/IsXXXTest.java
rename to src/test/java/xmlcursor/jsr173/common/IsXXXTest.java
diff --git a/test/src/xmlcursor/jsr173/common/NamespaceTest.java b/src/test/java/xmlcursor/jsr173/common/NamespaceTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/common/NamespaceTest.java
rename to src/test/java/xmlcursor/jsr173/common/NamespaceTest.java
diff --git a/test/src/xmlcursor/jsr173/common/PITest.java b/src/test/java/xmlcursor/jsr173/common/PITest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/common/PITest.java
rename to src/test/java/xmlcursor/jsr173/common/PITest.java
diff --git a/test/src/xmlcursor/jsr173/common/README.txt b/src/test/java/xmlcursor/jsr173/common/README.txt
similarity index 100%
rename from test/src/xmlcursor/jsr173/common/README.txt
rename to src/test/java/xmlcursor/jsr173/common/README.txt
diff --git a/test/src/xmlcursor/jsr173/detailed/CursorAttributeTest.java b/src/test/java/xmlcursor/jsr173/detailed/CursorAttributeTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/detailed/CursorAttributeTest.java
rename to src/test/java/xmlcursor/jsr173/detailed/CursorAttributeTest.java
diff --git a/test/src/xmlcursor/jsr173/detailed/CursorCharactersTest.java b/src/test/java/xmlcursor/jsr173/detailed/CursorCharactersTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/detailed/CursorCharactersTest.java
rename to src/test/java/xmlcursor/jsr173/detailed/CursorCharactersTest.java
diff --git a/test/src/xmlcursor/jsr173/detailed/CursorElementTest.java b/src/test/java/xmlcursor/jsr173/detailed/CursorElementTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/detailed/CursorElementTest.java
rename to src/test/java/xmlcursor/jsr173/detailed/CursorElementTest.java
diff --git a/test/src/xmlcursor/jsr173/detailed/CursorGeneralMethodsTest.java b/src/test/java/xmlcursor/jsr173/detailed/CursorGeneralMethodsTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/detailed/CursorGeneralMethodsTest.java
rename to src/test/java/xmlcursor/jsr173/detailed/CursorGeneralMethodsTest.java
diff --git a/test/src/xmlcursor/jsr173/detailed/CursorIsXXXTest.java b/src/test/java/xmlcursor/jsr173/detailed/CursorIsXXXTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/detailed/CursorIsXXXTest.java
rename to src/test/java/xmlcursor/jsr173/detailed/CursorIsXXXTest.java
diff --git a/test/src/xmlcursor/jsr173/detailed/CursorNamespaceTest.java b/src/test/java/xmlcursor/jsr173/detailed/CursorNamespaceTest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/detailed/CursorNamespaceTest.java
rename to src/test/java/xmlcursor/jsr173/detailed/CursorNamespaceTest.java
diff --git a/test/src/xmlcursor/jsr173/detailed/CursorPITest.java b/src/test/java/xmlcursor/jsr173/detailed/CursorPITest.java
similarity index 100%
rename from test/src/xmlcursor/jsr173/detailed/CursorPITest.java
rename to src/test/java/xmlcursor/jsr173/detailed/CursorPITest.java
diff --git a/test/src/xmlcursor/xpath/CustomerTest.java b/src/test/java/xmlcursor/xpath/CustomerTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/CustomerTest.java
rename to src/test/java/xmlcursor/xpath/CustomerTest.java
diff --git a/test/src/xmlcursor/xpath/common/BaseXPathTest.java b/src/test/java/xmlcursor/xpath/common/BaseXPathTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/common/BaseXPathTest.java
rename to src/test/java/xmlcursor/xpath/common/BaseXPathTest.java
diff --git a/test/src/xmlcursor/xpath/common/XPathCommon.java b/src/test/java/xmlcursor/xpath/common/XPathCommon.java
similarity index 100%
rename from test/src/xmlcursor/xpath/common/XPathCommon.java
rename to src/test/java/xmlcursor/xpath/common/XPathCommon.java
diff --git a/test/src/xmlcursor/xpath/common/XPathExpressionTest.java b/src/test/java/xmlcursor/xpath/common/XPathExpressionTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/common/XPathExpressionTest.java
rename to src/test/java/xmlcursor/xpath/common/XPathExpressionTest.java
diff --git a/test/src/xmlcursor/xpath/common/XPathFunctionAuxTest.java b/src/test/java/xmlcursor/xpath/common/XPathFunctionAuxTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/common/XPathFunctionAuxTest.java
rename to src/test/java/xmlcursor/xpath/common/XPathFunctionAuxTest.java
diff --git a/test/src/xmlcursor/xpath/common/XPathFunctionTest.java b/src/test/java/xmlcursor/xpath/common/XPathFunctionTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/common/XPathFunctionTest.java
rename to src/test/java/xmlcursor/xpath/common/XPathFunctionTest.java
diff --git a/test/src/xmlcursor/xpath/common/XPathNodetestTest.java b/src/test/java/xmlcursor/xpath/common/XPathNodetestTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/common/XPathNodetestTest.java
rename to src/test/java/xmlcursor/xpath/common/XPathNodetestTest.java
diff --git a/test/src/xmlcursor/xpath/complex/checkin/ContainerCommentTest.java b/src/test/java/xmlcursor/xpath/complex/checkin/ContainerCommentTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/checkin/ContainerCommentTest.java
rename to src/test/java/xmlcursor/xpath/complex/checkin/ContainerCommentTest.java
diff --git a/test/src/xmlcursor/xpath/complex/checkin/XPathTests.java b/src/test/java/xmlcursor/xpath/complex/checkin/XPathTests.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/checkin/XPathTests.java
rename to src/test/java/xmlcursor/xpath/complex/checkin/XPathTests.java
diff --git a/test/src/xmlcursor/xpath/complex/checkin/XPathTestsMisc.java b/src/test/java/xmlcursor/xpath/complex/checkin/XPathTestsMisc.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/checkin/XPathTestsMisc.java
rename to src/test/java/xmlcursor/xpath/complex/checkin/XPathTestsMisc.java
diff --git a/test/src/xmlcursor/xpath/complex/detailed/DeclareNamespaceTest.java b/src/test/java/xmlcursor/xpath/complex/detailed/DeclareNamespaceTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/detailed/DeclareNamespaceTest.java
rename to src/test/java/xmlcursor/xpath/complex/detailed/DeclareNamespaceTest.java
diff --git a/test/src/xmlcursor/xpath/complex/detailed/NodeCopyTest.java b/src/test/java/xmlcursor/xpath/complex/detailed/NodeCopyTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/detailed/NodeCopyTest.java
rename to src/test/java/xmlcursor/xpath/complex/detailed/NodeCopyTest.java
diff --git a/test/src/xmlcursor/xpath/complex/detailed/TypesTest.java b/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/detailed/TypesTest.java
rename to src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java
diff --git a/test/src/xmlcursor/xpath/complex/detailed/XPathExpressionTestImpl.java b/src/test/java/xmlcursor/xpath/complex/detailed/XPathExpressionTestImpl.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/detailed/XPathExpressionTestImpl.java
rename to src/test/java/xmlcursor/xpath/complex/detailed/XPathExpressionTestImpl.java
diff --git a/test/src/xmlcursor/xpath/complex/detailed/XPathFunctionAuxTest.java b/src/test/java/xmlcursor/xpath/complex/detailed/XPathFunctionAuxTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/detailed/XPathFunctionAuxTest.java
rename to src/test/java/xmlcursor/xpath/complex/detailed/XPathFunctionAuxTest.java
diff --git a/test/src/xmlcursor/xpath/complex/detailed/XPathFunctionTestImpl.java b/src/test/java/xmlcursor/xpath/complex/detailed/XPathFunctionTestImpl.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/detailed/XPathFunctionTestImpl.java
rename to src/test/java/xmlcursor/xpath/complex/detailed/XPathFunctionTestImpl.java
diff --git a/test/src/xmlcursor/xpath/complex/detailed/XPathNodeTest.java b/src/test/java/xmlcursor/xpath/complex/detailed/XPathNodeTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/detailed/XPathNodeTest.java
rename to src/test/java/xmlcursor/xpath/complex/detailed/XPathNodeTest.java
diff --git a/test/src/xmlcursor/xpath/complex/detailed/XPathTest.java b/src/test/java/xmlcursor/xpath/complex/detailed/XPathTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/complex/detailed/XPathTest.java
rename to src/test/java/xmlcursor/xpath/complex/detailed/XPathTest.java
diff --git a/test/src/xmlcursor/xpath/xbean_xpath/detailed/AxesTest.java b/src/test/java/xmlcursor/xpath/xbean_xpath/detailed/AxesTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/xbean_xpath/detailed/AxesTest.java
rename to src/test/java/xmlcursor/xpath/xbean_xpath/detailed/AxesTest.java
diff --git a/test/src/xmlcursor/xpath/xbean_xpath/detailed/NodeTest.java b/src/test/java/xmlcursor/xpath/xbean_xpath/detailed/NodeTest.java
similarity index 100%
rename from test/src/xmlcursor/xpath/xbean_xpath/detailed/NodeTest.java
rename to src/test/java/xmlcursor/xpath/xbean_xpath/detailed/NodeTest.java
diff --git a/test/src/xmlcursor/xpath/xbean_xpath/detailed/README.txt b/src/test/java/xmlcursor/xpath/xbean_xpath/detailed/README.txt
similarity index 100%
rename from test/src/xmlcursor/xpath/xbean_xpath/detailed/README.txt
rename to src/test/java/xmlcursor/xpath/xbean_xpath/detailed/README.txt
diff --git a/test/src/xmlcursor/xquery/checkin/QueryEngineTests.java b/src/test/java/xmlcursor/xquery/checkin/QueryEngineTests.java
similarity index 100%
rename from test/src/xmlcursor/xquery/checkin/QueryEngineTests.java
rename to src/test/java/xmlcursor/xquery/checkin/QueryEngineTests.java
diff --git a/test/src/xmlcursor/xquery/detailed/NISTTest.java b/src/test/java/xmlcursor/xquery/detailed/NISTTest.java
similarity index 97%
rename from test/src/xmlcursor/xquery/detailed/NISTTest.java
rename to src/test/java/xmlcursor/xquery/detailed/NISTTest.java
index 0d9e911..5df5213 100644
--- a/test/src/xmlcursor/xquery/detailed/NISTTest.java
+++ b/src/test/java/xmlcursor/xquery/detailed/NISTTest.java
@@ -14,6 +14,7 @@
  */

 package xmlcursor.xquery.detailed;

 

+import common.Common;

 import noNamespace.TestCase;

 import noNamespace.TestSuiteDocument;

 import noNamespace.TestSuiteDocument.TestSuite.TestGroup;

@@ -61,7 +62,7 @@
 

     @Parameterized.Parameters(name = "{index}: {0} {1}")

     public static Iterable<Object[]> files() throws IOException, XmlException {

-        zf = new ZipFile("test/cases/xbean/xmlcursor/xquery/xmlQuery.zip");

+        zf = new ZipFile(Common.getCaseLocation()+"/xbean/xmlcursor/xquery/xmlQuery.zip");

 

         ZipEntry e = zf.getEntry("testSuite/NIST/files/catalog.xml");

         InputStream is = zf.getInputStream(e);

diff --git a/test/src/xmlcursor/xquery/detailed/StoreTestsXqrl.java b/src/test/java/xmlcursor/xquery/detailed/StoreTestsXqrl.java
similarity index 100%
rename from test/src/xmlcursor/xquery/detailed/StoreTestsXqrl.java
rename to src/test/java/xmlcursor/xquery/detailed/StoreTestsXqrl.java
diff --git a/test/src/xmlcursor/xquery/detailed/XQueryTest.java b/src/test/java/xmlcursor/xquery/detailed/XQueryTest.java
similarity index 100%
rename from test/src/xmlcursor/xquery/detailed/XQueryTest.java
rename to src/test/java/xmlcursor/xquery/detailed/XQueryTest.java
diff --git a/test/src/xmlcursor/xquery/detailed/XQueryVariableBindingTest.java b/src/test/java/xmlcursor/xquery/detailed/XQueryVariableBindingTest.java
similarity index 100%
rename from test/src/xmlcursor/xquery/detailed/XQueryVariableBindingTest.java
rename to src/test/java/xmlcursor/xquery/detailed/XQueryVariableBindingTest.java
diff --git a/test/src/xmlobject/checkin/AssortedTests.java b/src/test/java/xmlobject/checkin/AssortedTests.java
similarity index 100%
rename from test/src/xmlobject/checkin/AssortedTests.java
rename to src/test/java/xmlobject/checkin/AssortedTests.java
diff --git a/test/src/xmlobject/checkin/CDataTest.java b/src/test/java/xmlobject/checkin/CDataTest.java
similarity index 100%
rename from test/src/xmlobject/checkin/CDataTest.java
rename to src/test/java/xmlobject/checkin/CDataTest.java
diff --git a/test/src/xmlobject/checkin/CreationTests.java b/src/test/java/xmlobject/checkin/CreationTests.java
similarity index 100%
rename from test/src/xmlobject/checkin/CreationTests.java
rename to src/test/java/xmlobject/checkin/CreationTests.java
diff --git a/test/src/xmlobject/checkin/DumbTest.java b/src/test/java/xmlobject/checkin/DumbTest.java
similarity index 100%
rename from test/src/xmlobject/checkin/DumbTest.java
rename to src/test/java/xmlobject/checkin/DumbTest.java
diff --git a/test/src/xmlobject/checkin/EasyPoTests.java b/src/test/java/xmlobject/checkin/EasyPoTests.java
similarity index 100%
rename from test/src/xmlobject/checkin/EasyPoTests.java
rename to src/test/java/xmlobject/checkin/EasyPoTests.java
diff --git a/test/src/xmlobject/checkin/InstanceValidationTests.java b/src/test/java/xmlobject/checkin/InstanceValidationTests.java
similarity index 100%
rename from test/src/xmlobject/checkin/InstanceValidationTests.java
rename to src/test/java/xmlobject/checkin/InstanceValidationTests.java
diff --git a/test/src/xmlobject/checkin/NameworldTest.java b/src/test/java/xmlobject/checkin/NameworldTest.java
similarity index 100%
rename from test/src/xmlobject/checkin/NameworldTest.java
rename to src/test/java/xmlobject/checkin/NameworldTest.java
diff --git a/test/src/xmlobject/checkin/RedefineTest.java b/src/test/java/xmlobject/checkin/RedefineTest.java
similarity index 100%
rename from test/src/xmlobject/checkin/RedefineTest.java
rename to src/test/java/xmlobject/checkin/RedefineTest.java
diff --git a/test/src/xmlobject/checkin/SelectChldAttTests.java b/src/test/java/xmlobject/checkin/SelectChldAttTests.java
similarity index 100%
rename from test/src/xmlobject/checkin/SelectChldAttTests.java
rename to src/test/java/xmlobject/checkin/SelectChldAttTests.java
diff --git a/test/src/xmlobject/checkin/SerializationTests.java b/src/test/java/xmlobject/checkin/SerializationTests.java
similarity index 100%
rename from test/src/xmlobject/checkin/SerializationTests.java
rename to src/test/java/xmlobject/checkin/SerializationTests.java
diff --git a/test/src/xmlobject/checkin/SetTest.java b/src/test/java/xmlobject/checkin/SetTest.java
similarity index 100%
rename from test/src/xmlobject/checkin/SetTest.java
rename to src/test/java/xmlobject/checkin/SetTest.java
diff --git a/test/src/xmlobject/checkin/SubstGroupTests.java b/src/test/java/xmlobject/checkin/SubstGroupTests.java
similarity index 100%
rename from test/src/xmlobject/checkin/SubstGroupTests.java
rename to src/test/java/xmlobject/checkin/SubstGroupTests.java
diff --git a/test/src/xmlobject/checkin/ValidateTest.java b/src/test/java/xmlobject/checkin/ValidateTest.java
similarity index 100%
rename from test/src/xmlobject/checkin/ValidateTest.java
rename to src/test/java/xmlobject/checkin/ValidateTest.java
diff --git a/test/src/xmlobject/checkin/XPathTest.java b/src/test/java/xmlobject/checkin/XPathTest.java
similarity index 100%
rename from test/src/xmlobject/checkin/XPathTest.java
rename to src/test/java/xmlobject/checkin/XPathTest.java
diff --git a/test/src/xmlobject/common/SelectChildrenAttribCommon.java b/src/test/java/xmlobject/common/SelectChildrenAttribCommon.java
similarity index 100%
rename from test/src/xmlobject/common/SelectChildrenAttribCommon.java
rename to src/test/java/xmlobject/common/SelectChildrenAttribCommon.java
diff --git a/test/src/xmlobject/common/StringXmlReader.java b/src/test/java/xmlobject/common/StringXmlReader.java
similarity index 100%
rename from test/src/xmlobject/common/StringXmlReader.java
rename to src/test/java/xmlobject/common/StringXmlReader.java
diff --git a/test/src/xmlobject/common/XmlReader.java b/src/test/java/xmlobject/common/XmlReader.java
similarity index 100%
rename from test/src/xmlobject/common/XmlReader.java
rename to src/test/java/xmlobject/common/XmlReader.java
diff --git a/test/src/xmlobject/detailed/CompareToTest.java b/src/test/java/xmlobject/detailed/CompareToTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/CompareToTest.java
rename to src/test/java/xmlobject/detailed/CompareToTest.java
diff --git a/test/src/xmlobject/detailed/CopyTest.java b/src/test/java/xmlobject/detailed/CopyTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/CopyTest.java
rename to src/test/java/xmlobject/detailed/CopyTest.java
diff --git a/test/src/xmlobject/detailed/IsImmutableTest.java b/src/test/java/xmlobject/detailed/IsImmutableTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/IsImmutableTest.java
rename to src/test/java/xmlobject/detailed/IsImmutableTest.java
diff --git a/test/src/xmlobject/detailed/NilTest.java b/src/test/java/xmlobject/detailed/NilTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/NilTest.java
rename to src/test/java/xmlobject/detailed/NilTest.java
diff --git a/test/src/xmlobject/detailed/SelectAttributeTests.java b/src/test/java/xmlobject/detailed/SelectAttributeTests.java
similarity index 100%
rename from test/src/xmlobject/detailed/SelectAttributeTests.java
rename to src/test/java/xmlobject/detailed/SelectAttributeTests.java
diff --git a/test/src/xmlobject/detailed/SelectChildrenTests.java b/src/test/java/xmlobject/detailed/SelectChildrenTests.java
similarity index 100%
rename from test/src/xmlobject/detailed/SelectChildrenTests.java
rename to src/test/java/xmlobject/detailed/SelectChildrenTests.java
diff --git a/test/src/xmlobject/detailed/SerializationDetailedTests.java b/src/test/java/xmlobject/detailed/SerializationDetailedTests.java
similarity index 100%
rename from test/src/xmlobject/detailed/SerializationDetailedTests.java
rename to src/test/java/xmlobject/detailed/SerializationDetailedTests.java
diff --git a/test/src/xmlobject/detailed/SetIdentityTest.java b/src/test/java/xmlobject/detailed/SetIdentityTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/SetIdentityTest.java
rename to src/test/java/xmlobject/detailed/SetIdentityTest.java
diff --git a/test/src/xmlobject/detailed/SoapFaultTest.java b/src/test/java/xmlobject/detailed/SoapFaultTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/SoapFaultTest.java
rename to src/test/java/xmlobject/detailed/SoapFaultTest.java
diff --git a/test/src/xmlobject/detailed/SubstGroupTests.java b/src/test/java/xmlobject/detailed/SubstGroupTests.java
similarity index 100%
rename from test/src/xmlobject/detailed/SubstGroupTests.java
rename to src/test/java/xmlobject/detailed/SubstGroupTests.java
diff --git a/test/src/xmlobject/detailed/TestXmlReader.java b/src/test/java/xmlobject/detailed/TestXmlReader.java
similarity index 100%
rename from test/src/xmlobject/detailed/TestXmlReader.java
rename to src/test/java/xmlobject/detailed/TestXmlReader.java
diff --git a/test/src/xmlobject/detailed/TestsFromBugs.java b/src/test/java/xmlobject/detailed/TestsFromBugs.java
similarity index 100%
rename from test/src/xmlobject/detailed/TestsFromBugs.java
rename to src/test/java/xmlobject/detailed/TestsFromBugs.java
diff --git a/test/src/xmlobject/detailed/TypedObjectCursor.java b/src/test/java/xmlobject/detailed/TypedObjectCursor.java
similarity index 100%
rename from test/src/xmlobject/detailed/TypedObjectCursor.java
rename to src/test/java/xmlobject/detailed/TypedObjectCursor.java
diff --git a/test/src/xmlobject/detailed/TypedSettersTests.java b/src/test/java/xmlobject/detailed/TypedSettersTests.java
similarity index 100%
rename from test/src/xmlobject/detailed/TypedSettersTests.java
rename to src/test/java/xmlobject/detailed/TypedSettersTests.java
diff --git a/test/src/xmlobject/detailed/TypesTest.java b/src/test/java/xmlobject/detailed/TypesTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/TypesTest.java
rename to src/test/java/xmlobject/detailed/TypesTest.java
diff --git a/test/src/xmlobject/detailed/ValueEqualsTest.java b/src/test/java/xmlobject/detailed/ValueEqualsTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/ValueEqualsTest.java
rename to src/test/java/xmlobject/detailed/ValueEqualsTest.java
diff --git a/test/src/xmlobject/detailed/XmlObjectAbstractClassTest.java b/src/test/java/xmlobject/detailed/XmlObjectAbstractClassTest.java
similarity index 100%
rename from test/src/xmlobject/detailed/XmlObjectAbstractClassTest.java
rename to src/test/java/xmlobject/detailed/XmlObjectAbstractClassTest.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/averageCase/checkin/AverageTest.java b/src/test/java/xmlobject/extensions/interfaceFeature/averageCase/checkin/AverageTest.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/averageCase/checkin/AverageTest.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/averageCase/checkin/AverageTest.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/averageCase/existing/FooHandler.java b/src/test/java/xmlobject/extensions/interfaceFeature/averageCase/existing/FooHandler.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/averageCase/existing/FooHandler.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/averageCase/existing/FooHandler.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/averageCase/existing/IFoo.java b/src/test/java/xmlobject/extensions/interfaceFeature/averageCase/existing/IFoo.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/averageCase/existing/IFoo.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/averageCase/existing/IFoo.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin/NameCollisionTest.java b/src/test/java/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin/NameCollisionTest.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin/NameCollisionTest.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/methodNameCollision/checkin/NameCollisionTest.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/existing/FooHandler.java b/src/test/java/xmlobject/extensions/interfaceFeature/methodNameCollision/existing/FooHandler.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/existing/FooHandler.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/methodNameCollision/existing/FooHandler.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/existing/IFoo.java b/src/test/java/xmlobject/extensions/interfaceFeature/methodNameCollision/existing/IFoo.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/methodNameCollision/existing/IFoo.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/methodNameCollision/existing/IFoo.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/multInterfaces/checkin/MultInterfacesTest.java b/src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/checkin/MultInterfacesTest.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/multInterfaces/checkin/MultInterfacesTest.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/checkin/MultInterfacesTest.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/multInterfaces/existing/IReport.java b/src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/existing/IReport.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/multInterfaces/existing/IReport.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/existing/IReport.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/multInterfaces/existing/ISum.java b/src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/existing/ISum.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/multInterfaces/existing/ISum.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/existing/ISum.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/multInterfaces/existing/ReportHandler.java b/src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/existing/ReportHandler.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/multInterfaces/existing/ReportHandler.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/multInterfaces/existing/ReportHandler.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/readOnlyBean/checkin/ReadOnlyTest.java b/src/test/java/xmlobject/extensions/interfaceFeature/readOnlyBean/checkin/ReadOnlyTest.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/readOnlyBean/checkin/ReadOnlyTest.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/readOnlyBean/checkin/ReadOnlyTest.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/readOnlyBean/existing/FooHandler.java b/src/test/java/xmlobject/extensions/interfaceFeature/readOnlyBean/existing/FooHandler.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/readOnlyBean/existing/FooHandler.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/readOnlyBean/existing/FooHandler.java
diff --git a/test/src/xmlobject/extensions/interfaceFeature/readOnlyBean/existing/IFoo.java b/src/test/java/xmlobject/extensions/interfaceFeature/readOnlyBean/existing/IFoo.java
similarity index 100%
rename from test/src/xmlobject/extensions/interfaceFeature/readOnlyBean/existing/IFoo.java
rename to src/test/java/xmlobject/extensions/interfaceFeature/readOnlyBean/existing/IFoo.java
diff --git a/test/src/xmlobject/extensions/prePostFeature/ValueRestriction/checkin/ValueRestrictionTest.java b/src/test/java/xmlobject/extensions/prePostFeature/ValueRestriction/checkin/ValueRestrictionTest.java
similarity index 100%
rename from test/src/xmlobject/extensions/prePostFeature/ValueRestriction/checkin/ValueRestrictionTest.java
rename to src/test/java/xmlobject/extensions/prePostFeature/ValueRestriction/checkin/ValueRestrictionTest.java
diff --git a/test/src/xmlobject/extensions/prePostFeature/ValueRestriction/existing/ISetter.java b/src/test/java/xmlobject/extensions/prePostFeature/ValueRestriction/existing/ISetter.java
similarity index 100%
rename from test/src/xmlobject/extensions/prePostFeature/ValueRestriction/existing/ISetter.java
rename to src/test/java/xmlobject/extensions/prePostFeature/ValueRestriction/existing/ISetter.java
diff --git a/test/src/xmlobject/extensions/prePostFeature/ValueRestriction/existing/SetterHandler.java b/src/test/java/xmlobject/extensions/prePostFeature/ValueRestriction/existing/SetterHandler.java
similarity index 100%
rename from test/src/xmlobject/extensions/prePostFeature/ValueRestriction/existing/SetterHandler.java
rename to src/test/java/xmlobject/extensions/prePostFeature/ValueRestriction/existing/SetterHandler.java
diff --git a/test/src/xmlobject/extensions/prePostFeature/readOnlyBean/checkin/ReadOnlyTest.java b/src/test/java/xmlobject/extensions/prePostFeature/readOnlyBean/checkin/ReadOnlyTest.java
similarity index 100%
rename from test/src/xmlobject/extensions/prePostFeature/readOnlyBean/checkin/ReadOnlyTest.java
rename to src/test/java/xmlobject/extensions/prePostFeature/readOnlyBean/checkin/ReadOnlyTest.java
diff --git a/test/src/xmlobject/extensions/prePostFeature/readOnlyBean/existing/FooHandler.java b/src/test/java/xmlobject/extensions/prePostFeature/readOnlyBean/existing/FooHandler.java
similarity index 100%
rename from test/src/xmlobject/extensions/prePostFeature/readOnlyBean/existing/FooHandler.java
rename to src/test/java/xmlobject/extensions/prePostFeature/readOnlyBean/existing/FooHandler.java
diff --git a/test/src/xmlobject/extensions/prePostFeature/readOnlyBean/existing/IFoo.java b/src/test/java/xmlobject/extensions/prePostFeature/readOnlyBean/existing/IFoo.java
similarity index 100%
rename from test/src/xmlobject/extensions/prePostFeature/readOnlyBean/existing/IFoo.java
rename to src/test/java/xmlobject/extensions/prePostFeature/readOnlyBean/existing/IFoo.java
diff --git a/test/src/xmlobject/schematypes/checkin/EnumTests.java b/src/test/java/xmlobject/schematypes/checkin/EnumTests.java
similarity index 100%
rename from test/src/xmlobject/schematypes/checkin/EnumTests.java
rename to src/test/java/xmlobject/schematypes/checkin/EnumTests.java
diff --git a/test/src/xmlobject/schematypes/checkin/GDateTests.java b/src/test/java/xmlobject/schematypes/checkin/GDateTests.java
similarity index 100%
rename from test/src/xmlobject/schematypes/checkin/GDateTests.java
rename to src/test/java/xmlobject/schematypes/checkin/GDateTests.java
diff --git a/test/src/xmlobject/schematypes/checkin/IntTests.java b/src/test/java/xmlobject/schematypes/checkin/IntTests.java
similarity index 100%
rename from test/src/xmlobject/schematypes/checkin/IntTests.java
rename to src/test/java/xmlobject/schematypes/checkin/IntTests.java
diff --git a/test/src/xmlobject/schematypes/checkin/NumeralsTests.java b/src/test/java/xmlobject/schematypes/checkin/NumeralsTests.java
similarity index 100%
rename from test/src/xmlobject/schematypes/checkin/NumeralsTests.java
rename to src/test/java/xmlobject/schematypes/checkin/NumeralsTests.java
diff --git a/test/src/xmlobject/schematypes/checkin/QNameTests.java b/src/test/java/xmlobject/schematypes/checkin/QNameTests.java
similarity index 100%
rename from test/src/xmlobject/schematypes/checkin/QNameTests.java
rename to src/test/java/xmlobject/schematypes/checkin/QNameTests.java
diff --git a/test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java b/src/test/java/xmlobject/schematypes/checkin/SchemaTypesTests.java
similarity index 100%
rename from test/src/xmlobject/schematypes/checkin/SchemaTypesTests.java
rename to src/test/java/xmlobject/schematypes/checkin/SchemaTypesTests.java
diff --git a/test/src/xmlobject/schematypes/detailed/ListAndUnionTests.java b/src/test/java/xmlobject/schematypes/detailed/ListAndUnionTests.java
similarity index 100%
rename from test/src/xmlobject/schematypes/detailed/ListAndUnionTests.java
rename to src/test/java/xmlobject/schematypes/detailed/ListAndUnionTests.java
diff --git a/test/src/xmlobject/schematypes/detailed/QNameSetTest.java b/src/test/java/xmlobject/schematypes/detailed/QNameSetTest.java
similarity index 100%
rename from test/src/xmlobject/schematypes/detailed/QNameSetTest.java
rename to src/test/java/xmlobject/schematypes/detailed/QNameSetTest.java
diff --git a/test/src/xmlobject/usertype/averageCase/checkin/AverageTest.java b/src/test/java/xmlobject/usertype/averageCase/checkin/AverageTest.java
similarity index 100%
rename from test/src/xmlobject/usertype/averageCase/checkin/AverageTest.java
rename to src/test/java/xmlobject/usertype/averageCase/checkin/AverageTest.java
diff --git a/test/src/xmlobject/usertype/averageCase/existing/SKU.java b/src/test/java/xmlobject/usertype/averageCase/existing/SKU.java
similarity index 100%
rename from test/src/xmlobject/usertype/averageCase/existing/SKU.java
rename to src/test/java/xmlobject/usertype/averageCase/existing/SKU.java
diff --git a/test/src/xmlobject/usertype/averageCase/existing/SKUHandler.java b/src/test/java/xmlobject/usertype/averageCase/existing/SKUHandler.java
similarity index 100%
rename from test/src/xmlobject/usertype/averageCase/existing/SKUHandler.java
rename to src/test/java/xmlobject/usertype/averageCase/existing/SKUHandler.java
diff --git a/test/src/xmlobject/usertype/multipleItems/checkin/AverageTest.java b/src/test/java/xmlobject/usertype/multipleItems/checkin/AverageTest.java
similarity index 100%
rename from test/src/xmlobject/usertype/multipleItems/checkin/AverageTest.java
rename to src/test/java/xmlobject/usertype/multipleItems/checkin/AverageTest.java
diff --git a/test/src/xmlobject/usertype/multipleItems/existing/Room.java b/src/test/java/xmlobject/usertype/multipleItems/existing/Room.java
similarity index 100%
rename from test/src/xmlobject/usertype/multipleItems/existing/Room.java
rename to src/test/java/xmlobject/usertype/multipleItems/existing/Room.java
diff --git a/test/src/xmlobject/usertype/multipleItems/existing/RoomHandler.java b/src/test/java/xmlobject/usertype/multipleItems/existing/RoomHandler.java
similarity index 100%
rename from test/src/xmlobject/usertype/multipleItems/existing/RoomHandler.java
rename to src/test/java/xmlobject/usertype/multipleItems/existing/RoomHandler.java
diff --git a/test/src/xmlobject/xmlloader/detailed/JapaneseTextTest.java b/src/test/java/xmlobject/xmlloader/detailed/JapaneseTextTest.java
similarity index 100%
rename from test/src/xmlobject/xmlloader/detailed/JapaneseTextTest.java
rename to src/test/java/xmlobject/xmlloader/detailed/JapaneseTextTest.java
diff --git a/test/src/xmlobject/xmlloader/detailed/ParseTest.java b/src/test/java/xmlobject/xmlloader/detailed/ParseTest.java
similarity index 100%
rename from test/src/xmlobject/xmlloader/detailed/ParseTest.java
rename to src/test/java/xmlobject/xmlloader/detailed/ParseTest.java
diff --git a/test/src/xmlobject/xmlloader/detailed/PiccoloParseTests.java b/src/test/java/xmlobject/xmlloader/detailed/PiccoloParseTests.java
similarity index 100%
rename from test/src/xmlobject/xmlloader/detailed/PiccoloParseTests.java
rename to src/test/java/xmlobject/xmlloader/detailed/PiccoloParseTests.java
diff --git a/test/src/xmlobject/xmlloader/detailed/XmlLoaderBvtTest.java b/src/test/java/xmlobject/xmlloader/detailed/XmlLoaderBvtTest.java
similarity index 100%
rename from test/src/xmlobject/xmlloader/detailed/XmlLoaderBvtTest.java
rename to src/test/java/xmlobject/xmlloader/detailed/XmlLoaderBvtTest.java
diff --git a/test/src/xmlobject/xmlloader/detailed/XmlLoaderMiscTest.java b/src/test/java/xmlobject/xmlloader/detailed/XmlLoaderMiscTest.java
similarity index 100%
rename from test/src/xmlobject/xmlloader/detailed/XmlLoaderMiscTest.java
rename to src/test/java/xmlobject/xmlloader/detailed/XmlLoaderMiscTest.java
diff --git a/test/src/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java b/src/test/java/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java
similarity index 100%
rename from test/src/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java
rename to src/test/java/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java
diff --git a/test/src/xmltokensource/detailed/NewDomNodeTest.java b/src/test/java/xmltokensource/detailed/NewDomNodeTest.java
similarity index 100%
rename from test/src/xmltokensource/detailed/NewDomNodeTest.java
rename to src/test/java/xmltokensource/detailed/NewDomNodeTest.java
diff --git a/test/src/xmltokensource/detailed/PrettyPrintNamespaceTest.java b/src/test/java/xmltokensource/detailed/PrettyPrintNamespaceTest.java
similarity index 100%
rename from test/src/xmltokensource/detailed/PrettyPrintNamespaceTest.java
rename to src/test/java/xmltokensource/detailed/PrettyPrintNamespaceTest.java
diff --git a/test/src/xmltokensource/detailed/RoundTripLoaderTest.java b/src/test/java/xmltokensource/detailed/RoundTripLoaderTest.java
similarity index 100%
rename from test/src/xmltokensource/detailed/RoundTripLoaderTest.java
rename to src/test/java/xmltokensource/detailed/RoundTripLoaderTest.java
diff --git a/test/src/xmltokensource/detailed/XmlTextTest.java b/src/test/java/xmltokensource/detailed/XmlTextTest.java
similarity index 100%
rename from test/src/xmltokensource/detailed/XmlTextTest.java
rename to src/test/java/xmltokensource/detailed/XmlTextTest.java
diff --git a/test/cases/schema/appview/Add_AcctSiebel7.xml b/src/test/resources/schema/appview/Add_AcctSiebel7.xml
similarity index 100%
rename from test/cases/schema/appview/Add_AcctSiebel7.xml
rename to src/test/resources/schema/appview/Add_AcctSiebel7.xml
diff --git a/test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml b/src/test/resources/xbean/ValidatingStream/CarLocationMessage-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/CarLocationMessage-inv.xml
rename to src/test/resources/xbean/ValidatingStream/CarLocationMessage-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/CarLocationMessage.xml b/src/test/resources/xbean/ValidatingStream/CarLocationMessage.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/CarLocationMessage.xml
rename to src/test/resources/xbean/ValidatingStream/CarLocationMessage.xml
diff --git a/test/cases/xbean/ValidatingStream/Employees.xml b/src/test/resources/xbean/ValidatingStream/Employees.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/Employees.xml
rename to src/test/resources/xbean/ValidatingStream/Employees.xml
diff --git a/test/cases/xbean/ValidatingStream/foo-inv.xml b/src/test/resources/xbean/ValidatingStream/foo-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/foo-inv.xml
rename to src/test/resources/xbean/ValidatingStream/foo-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/foo.xsd b/src/test/resources/xbean/ValidatingStream/foo.xsd
similarity index 100%
rename from test/cases/xbean/ValidatingStream/foo.xsd
rename to src/test/resources/xbean/ValidatingStream/foo.xsd
diff --git a/test/cases/xbean/ValidatingStream/global-attr.xml b/src/test/resources/xbean/ValidatingStream/global-attr.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/global-attr.xml
rename to src/test/resources/xbean/ValidatingStream/global-attr.xml
diff --git a/test/cases/xbean/ValidatingStream/location-inv.xml b/src/test/resources/xbean/ValidatingStream/location-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/location-inv.xml
rename to src/test/resources/xbean/ValidatingStream/location-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/location.xml b/src/test/resources/xbean/ValidatingStream/location.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/location.xml
rename to src/test/resources/xbean/ValidatingStream/location.xml
diff --git a/test/cases/xbean/ValidatingStream/location.xsd b/src/test/resources/xbean/ValidatingStream/location.xsd
similarity index 100%
rename from test/cases/xbean/ValidatingStream/location.xsd
rename to src/test/resources/xbean/ValidatingStream/location.xsd
diff --git a/test/cases/xbean/ValidatingStream/mixed-content-inv.xml b/src/test/resources/xbean/ValidatingStream/mixed-content-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/mixed-content-inv.xml
rename to src/test/resources/xbean/ValidatingStream/mixed-content-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/mixed-content.xml b/src/test/resources/xbean/ValidatingStream/mixed-content.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/mixed-content.xml
rename to src/test/resources/xbean/ValidatingStream/mixed-content.xml
diff --git a/test/cases/xbean/ValidatingStream/mixed-content.xsd b/src/test/resources/xbean/ValidatingStream/mixed-content.xsd
similarity index 100%
rename from test/cases/xbean/ValidatingStream/mixed-content.xsd
rename to src/test/resources/xbean/ValidatingStream/mixed-content.xsd
diff --git a/test/cases/xbean/ValidatingStream/nomixed-content-inv.xml b/src/test/resources/xbean/ValidatingStream/nomixed-content-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/nomixed-content-inv.xml
rename to src/test/resources/xbean/ValidatingStream/nomixed-content-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/numerals.xsd b/src/test/resources/xbean/ValidatingStream/numerals.xsd
similarity index 100%
rename from test/cases/xbean/ValidatingStream/numerals.xsd
rename to src/test/resources/xbean/ValidatingStream/numerals.xsd
diff --git a/test/cases/xbean/ValidatingStream/person-frag.xml b/src/test/resources/xbean/ValidatingStream/person-frag.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person-frag.xml
rename to src/test/resources/xbean/ValidatingStream/person-frag.xml
diff --git a/test/cases/xbean/ValidatingStream/person-frag2.xml b/src/test/resources/xbean/ValidatingStream/person-frag2.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person-frag2.xml
rename to src/test/resources/xbean/ValidatingStream/person-frag2.xml
diff --git a/test/cases/xbean/ValidatingStream/person-inv.xml b/src/test/resources/xbean/ValidatingStream/person-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person-inv.xml
rename to src/test/resources/xbean/ValidatingStream/person-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/person-justname-inv.xml b/src/test/resources/xbean/ValidatingStream/person-justname-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person-justname-inv.xml
rename to src/test/resources/xbean/ValidatingStream/person-justname-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/person-justname.xml b/src/test/resources/xbean/ValidatingStream/person-justname.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person-justname.xml
rename to src/test/resources/xbean/ValidatingStream/person-justname.xml
diff --git a/test/cases/xbean/ValidatingStream/person-sibling-inv.xml b/src/test/resources/xbean/ValidatingStream/person-sibling-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person-sibling-inv.xml
rename to src/test/resources/xbean/ValidatingStream/person-sibling-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/person-sibling.xml b/src/test/resources/xbean/ValidatingStream/person-sibling.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person-sibling.xml
rename to src/test/resources/xbean/ValidatingStream/person-sibling.xml
diff --git a/test/cases/xbean/ValidatingStream/person-xsi-inv.xml b/src/test/resources/xbean/ValidatingStream/person-xsi-inv.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person-xsi-inv.xml
rename to src/test/resources/xbean/ValidatingStream/person-xsi-inv.xml
diff --git a/test/cases/xbean/ValidatingStream/person.xml b/src/test/resources/xbean/ValidatingStream/person.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person.xml
rename to src/test/resources/xbean/ValidatingStream/person.xml
diff --git a/test/cases/xbean/ValidatingStream/person.xsd b/src/test/resources/xbean/ValidatingStream/person.xsd
similarity index 100%
rename from test/cases/xbean/ValidatingStream/person.xsd
rename to src/test/resources/xbean/ValidatingStream/person.xsd
diff --git a/test/cases/xbean/ValidatingStream/po.xml b/src/test/resources/xbean/ValidatingStream/po.xml
similarity index 100%
rename from test/cases/xbean/ValidatingStream/po.xml
rename to src/test/resources/xbean/ValidatingStream/po.xml
diff --git a/test/cases/xbean/ValidatingStream/simpleTypes.xsd b/src/test/resources/xbean/ValidatingStream/simpleTypes.xsd
similarity index 100%
rename from test/cases/xbean/ValidatingStream/simpleTypes.xsd
rename to src/test/resources/xbean/ValidatingStream/simpleTypes.xsd
diff --git a/test/cases/xbean/compile/scomp/detailed/laxDoc.xsd b/src/test/resources/xbean/compile/scomp/detailed/laxDoc.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/detailed/laxDoc.xsd
rename to src/test/resources/xbean/compile/scomp/detailed/laxDoc.xsd
diff --git a/test/cases/xbean/compile/scomp/incr/incr1.xsd b/src/test/resources/xbean/compile/scomp/incr/incr1.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/incr/incr1.xsd
rename to src/test/resources/xbean/compile/scomp/incr/incr1.xsd
diff --git a/test/cases/xbean/compile/scomp/incr/incr2-1.xsd b/src/test/resources/xbean/compile/scomp/incr/incr2-1.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/incr/incr2-1.xsd
rename to src/test/resources/xbean/compile/scomp/incr/incr2-1.xsd
diff --git a/test/cases/xbean/compile/scomp/incr/incr2.xsd b/src/test/resources/xbean/compile/scomp/incr/incr2.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/incr/incr2.xsd
rename to src/test/resources/xbean/compile/scomp/incr/incr2.xsd
diff --git a/test/cases/xbean/compile/scomp/incr/incr3.xsd b/src/test/resources/xbean/compile/scomp/incr/incr3.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/incr/incr3.xsd
rename to src/test/resources/xbean/compile/scomp/incr/incr3.xsd
diff --git a/test/cases/xbean/compile/scomp/incr/incr4.xsd b/src/test/resources/xbean/compile/scomp/incr/incr4.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/incr/incr4.xsd
rename to src/test/resources/xbean/compile/scomp/incr/incr4.xsd
diff --git a/test/cases/xbean/compile/scomp/j2ee/XML.xsd b/src/test/resources/xbean/compile/scomp/j2ee/XML.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/j2ee/XML.xsd
rename to src/test/resources/xbean/compile/scomp/j2ee/XML.xsd
diff --git a/test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd b/src/test/resources/xbean/compile/scomp/j2ee/application-client_1_4.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/j2ee/application-client_1_4.xsd
rename to src/test/resources/xbean/compile/scomp/j2ee/application-client_1_4.xsd
diff --git a/test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd b/src/test/resources/xbean/compile/scomp/j2ee/application_1_4.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/j2ee/application_1_4.xsd
rename to src/test/resources/xbean/compile/scomp/j2ee/application_1_4.xsd
diff --git a/test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd b/src/test/resources/xbean/compile/scomp/j2ee/connector_1_5.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/j2ee/connector_1_5.xsd
rename to src/test/resources/xbean/compile/scomp/j2ee/connector_1_5.xsd
diff --git a/test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd b/src/test/resources/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd
rename to src/test/resources/xbean/compile/scomp/j2ee/ejb-jar_2_1.xsd
diff --git a/test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd b/src/test/resources/xbean/compile/scomp/j2ee/j2ee_1_4.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/j2ee/j2ee_1_4.xsd
rename to src/test/resources/xbean/compile/scomp/j2ee/j2ee_1_4.xsd
diff --git a/test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd b/src/test/resources/xbean/compile/scomp/j2ee/jsp_2_0.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/j2ee/jsp_2_0.xsd
rename to src/test/resources/xbean/compile/scomp/j2ee/jsp_2_0.xsd
diff --git a/test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd b/src/test/resources/xbean/compile/scomp/j2ee/web-app_2_4.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/j2ee/web-app_2_4.xsd
rename to src/test/resources/xbean/compile/scomp/j2ee/web-app_2_4.xsd
diff --git a/test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd b/src/test/resources/xbean/compile/scomp/pricequote/PriceQuote.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/pricequote/PriceQuote.xsd
rename to src/test/resources/xbean/compile/scomp/pricequote/PriceQuote.xsd
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/enum1.xsd_ b/src/test/resources/xbean/compile/scomp/schemacompiler/enum1.xsd_
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/enum1.xsd_
rename to src/test/resources/xbean/compile/scomp/schemacompiler/enum1.xsd_
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/enum1_redefine.xsd_ b/src/test/resources/xbean/compile/scomp/schemacompiler/enum1_redefine.xsd_
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/enum1_redefine.xsd_
rename to src/test/resources/xbean/compile/scomp/schemacompiler/enum1_redefine.xsd_
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/enum2.xsd_ b/src/test/resources/xbean/compile/scomp/schemacompiler/enum2.xsd_
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/enum2.xsd_
rename to src/test/resources/xbean/compile/scomp/schemacompiler/enum2.xsd_
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/enum2_redefine.xsd_ b/src/test/resources/xbean/compile/scomp/schemacompiler/enum2_redefine.xsd_
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/enum2_redefine.xsd_
rename to src/test/resources/xbean/compile/scomp/schemacompiler/enum2_redefine.xsd_
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/enum3.xsd_ b/src/test/resources/xbean/compile/scomp/schemacompiler/enum3.xsd_
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/enum3.xsd_
rename to src/test/resources/xbean/compile/scomp/schemacompiler/enum3.xsd_
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/enum3_redefine.xsd_ b/src/test/resources/xbean/compile/scomp/schemacompiler/enum3_redefine.xsd_
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/enum3_redefine.xsd_
rename to src/test/resources/xbean/compile/scomp/schemacompiler/enum3_redefine.xsd_
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/ext/H1.java b/src/test/resources/xbean/compile/scomp/schemacompiler/ext/H1.java
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/ext/H1.java
rename to src/test/resources/xbean/compile/scomp/schemacompiler/ext/H1.java
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/ext/H2.java b/src/test/resources/xbean/compile/scomp/schemacompiler/ext/H2.java
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/ext/H2.java
rename to src/test/resources/xbean/compile/scomp/schemacompiler/ext/H2.java
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/ext/I1.java b/src/test/resources/xbean/compile/scomp/schemacompiler/ext/I1.java
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/ext/I1.java
rename to src/test/resources/xbean/compile/scomp/schemacompiler/ext/I1.java
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/ext/I2.java b/src/test/resources/xbean/compile/scomp/schemacompiler/ext/I2.java
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/ext/I2.java
rename to src/test/resources/xbean/compile/scomp/schemacompiler/ext/I2.java
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/methodsColide_jira205_278.xsd_ b/src/test/resources/xbean/compile/scomp/schemacompiler/methodsColide_jira205_278.xsd_
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/methodsColide_jira205_278.xsd_
rename to src/test/resources/xbean/compile/scomp/schemacompiler/methodsColide_jira205_278.xsd_
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/methodsColide_jira205_278.xsdconfig_ b/src/test/resources/xbean/compile/scomp/schemacompiler/methodsColide_jira205_278.xsdconfig_
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/methodsColide_jira205_278.xsdconfig_
rename to src/test/resources/xbean/compile/scomp/schemacompiler/methodsColide_jira205_278.xsdconfig_
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/union_initial.xsd b/src/test/resources/xbean/compile/scomp/schemacompiler/union_initial.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/union_initial.xsd
rename to src/test/resources/xbean/compile/scomp/schemacompiler/union_initial.xsd
diff --git a/test/cases/xbean/compile/scomp/schemacompiler/union_redefine.xsd b/src/test/resources/xbean/compile/scomp/schemacompiler/union_redefine.xsd
similarity index 100%
rename from test/cases/xbean/compile/scomp/schemacompiler/union_redefine.xsd
rename to src/test/resources/xbean/compile/scomp/schemacompiler/union_redefine.xsd
diff --git a/test/cases/xbean/compile/som/constraints.xsd_ b/src/test/resources/xbean/compile/som/constraints.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/constraints.xsd_
rename to src/test/resources/xbean/compile/som/constraints.xsd_
diff --git a/test/cases/xbean/compile/som/constraints_added.xsd_ b/src/test/resources/xbean/compile/som/constraints_added.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/constraints_added.xsd_
rename to src/test/resources/xbean/compile/som/constraints_added.xsd_
diff --git a/test/cases/xbean/compile/som/datatypes.xsd_ b/src/test/resources/xbean/compile/som/datatypes.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/datatypes.xsd_
rename to src/test/resources/xbean/compile/som/datatypes.xsd_
diff --git a/test/cases/xbean/compile/som/datatypes_added.xsd_ b/src/test/resources/xbean/compile/som/datatypes_added.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/datatypes_added.xsd_
rename to src/test/resources/xbean/compile/som/datatypes_added.xsd_
diff --git a/test/cases/xbean/compile/som/datatypes_modified.xsd_ b/src/test/resources/xbean/compile/som/datatypes_modified.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/datatypes_modified.xsd_
rename to src/test/resources/xbean/compile/som/datatypes_modified.xsd_
diff --git a/test/cases/xbean/compile/som/derived_types.xsd_ b/src/test/resources/xbean/compile/som/derived_types.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/derived_types.xsd_
rename to src/test/resources/xbean/compile/som/derived_types.xsd_
diff --git a/test/cases/xbean/compile/som/derived_types_added.xsd_ b/src/test/resources/xbean/compile/som/derived_types_added.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/derived_types_added.xsd_
rename to src/test/resources/xbean/compile/som/derived_types_added.xsd_
diff --git a/test/cases/xbean/compile/som/derived_types_modifed.xsd_ b/src/test/resources/xbean/compile/som/derived_types_modifed.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/derived_types_modifed.xsd_
rename to src/test/resources/xbean/compile/som/derived_types_modifed.xsd_
diff --git a/test/cases/xbean/compile/som/elemattr.xsd_ b/src/test/resources/xbean/compile/som/elemattr.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/elemattr.xsd_
rename to src/test/resources/xbean/compile/som/elemattr.xsd_
diff --git a/test/cases/xbean/compile/som/elemattr_added.xsd_ b/src/test/resources/xbean/compile/som/elemattr_added.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/elemattr_added.xsd_
rename to src/test/resources/xbean/compile/som/elemattr_added.xsd_
diff --git a/test/cases/xbean/compile/som/elemattr_modified.xsd_ b/src/test/resources/xbean/compile/som/elemattr_modified.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/elemattr_modified.xsd_
rename to src/test/resources/xbean/compile/som/elemattr_modified.xsd_
diff --git a/test/cases/xbean/compile/som/groups.xsd_ b/src/test/resources/xbean/compile/som/groups.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/groups.xsd_
rename to src/test/resources/xbean/compile/som/groups.xsd_
diff --git a/test/cases/xbean/compile/som/groups_added.xsd_ b/src/test/resources/xbean/compile/som/groups_added.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/groups_added.xsd_
rename to src/test/resources/xbean/compile/som/groups_added.xsd_
diff --git a/test/cases/xbean/compile/som/groups_modified.xsd_ b/src/test/resources/xbean/compile/som/groups_modified.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/groups_modified.xsd_
rename to src/test/resources/xbean/compile/som/groups_modified.xsd_
diff --git a/test/cases/xbean/compile/som/instance_constraints_invalid.xml b/src/test/resources/xbean/compile/som/instance_constraints_invalid.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_constraints_invalid.xml
rename to src/test/resources/xbean/compile/som/instance_constraints_invalid.xml
diff --git a/test/cases/xbean/compile/som/instance_constraints_valid.xml b/src/test/resources/xbean/compile/som/instance_constraints_valid.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_constraints_valid.xml
rename to src/test/resources/xbean/compile/som/instance_constraints_valid.xml
diff --git a/test/cases/xbean/compile/som/instance_datatypes_valid.xml b/src/test/resources/xbean/compile/som/instance_datatypes_valid.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_datatypes_valid.xml
rename to src/test/resources/xbean/compile/som/instance_datatypes_valid.xml
diff --git a/test/cases/xbean/compile/som/instance_derived_types_modify.xml b/src/test/resources/xbean/compile/som/instance_derived_types_modify.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_derived_types_modify.xml
rename to src/test/resources/xbean/compile/som/instance_derived_types_modify.xml
diff --git a/test/cases/xbean/compile/som/instance_derived_types_valid.xml b/src/test/resources/xbean/compile/som/instance_derived_types_valid.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_derived_types_valid.xml
rename to src/test/resources/xbean/compile/som/instance_derived_types_valid.xml
diff --git a/test/cases/xbean/compile/som/instance_elemattr.xml b/src/test/resources/xbean/compile/som/instance_elemattr.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_elemattr.xml
rename to src/test/resources/xbean/compile/som/instance_elemattr.xml
diff --git a/test/cases/xbean/compile/som/instance_elemattr_added.xml b/src/test/resources/xbean/compile/som/instance_elemattr_added.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_elemattr_added.xml
rename to src/test/resources/xbean/compile/som/instance_elemattr_added.xml
diff --git a/test/cases/xbean/compile/som/instance_elemattr_valid.xml b/src/test/resources/xbean/compile/som/instance_elemattr_valid.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_elemattr_valid.xml
rename to src/test/resources/xbean/compile/som/instance_elemattr_valid.xml
diff --git a/test/cases/xbean/compile/som/instance_simple_types_invalid.xml b/src/test/resources/xbean/compile/som/instance_simple_types_invalid.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_simple_types_invalid.xml
rename to src/test/resources/xbean/compile/som/instance_simple_types_invalid.xml
diff --git a/test/cases/xbean/compile/som/instance_simple_types_valid.xml b/src/test/resources/xbean/compile/som/instance_simple_types_valid.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_simple_types_valid.xml
rename to src/test/resources/xbean/compile/som/instance_simple_types_valid.xml
diff --git a/test/cases/xbean/compile/som/instance_subst_grps_valid.xml b/src/test/resources/xbean/compile/som/instance_subst_grps_valid.xml
similarity index 100%
rename from test/cases/xbean/compile/som/instance_subst_grps_valid.xml
rename to src/test/resources/xbean/compile/som/instance_subst_grps_valid.xml
diff --git a/test/cases/xbean/compile/som/namespaces1.xsd_ b/src/test/resources/xbean/compile/som/namespaces1.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/namespaces1.xsd_
rename to src/test/resources/xbean/compile/som/namespaces1.xsd_
diff --git a/test/cases/xbean/compile/som/namespaces2.xsd_ b/src/test/resources/xbean/compile/som/namespaces2.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/namespaces2.xsd_
rename to src/test/resources/xbean/compile/som/namespaces2.xsd_
diff --git a/test/cases/xbean/compile/som/namespaces_import_fileonly.xsd_ b/src/test/resources/xbean/compile/som/namespaces_import_fileonly.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/namespaces_import_fileonly.xsd_
rename to src/test/resources/xbean/compile/som/namespaces_import_fileonly.xsd_
diff --git a/test/cases/xbean/compile/som/namespaces_import_filepath.xsd b/src/test/resources/xbean/compile/som/namespaces_import_filepath.xsd
similarity index 100%
rename from test/cases/xbean/compile/som/namespaces_import_filepath.xsd
rename to src/test/resources/xbean/compile/som/namespaces_import_filepath.xsd
diff --git a/test/cases/xbean/compile/som/namespaces_include.xsd_ b/src/test/resources/xbean/compile/som/namespaces_include.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/namespaces_include.xsd_
rename to src/test/resources/xbean/compile/som/namespaces_include.xsd_
diff --git a/test/cases/xbean/compile/som/namespaces_noimports.xsd_ b/src/test/resources/xbean/compile/som/namespaces_noimports.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/namespaces_noimports.xsd_
rename to src/test/resources/xbean/compile/som/namespaces_noimports.xsd_
diff --git a/test/cases/xbean/compile/som/reusable_grps.xsd_ b/src/test/resources/xbean/compile/som/reusable_grps.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/reusable_grps.xsd_
rename to src/test/resources/xbean/compile/som/reusable_grps.xsd_
diff --git a/test/cases/xbean/compile/som/reusable_grps_added.xsd_ b/src/test/resources/xbean/compile/som/reusable_grps_added.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/reusable_grps_added.xsd_
rename to src/test/resources/xbean/compile/som/reusable_grps_added.xsd_
diff --git a/test/cases/xbean/compile/som/reusable_grps_modified.xsd_ b/src/test/resources/xbean/compile/som/reusable_grps_modified.xsd_
similarity index 100%
rename from test/cases/xbean/compile/som/reusable_grps_modified.xsd_
rename to src/test/resources/xbean/compile/som/reusable_grps_modified.xsd_
diff --git a/test/cases/xbean/dom/ComplexTypeTest.xsd b/src/test/resources/xbean/dom/ComplexTypeTest.xsd
similarity index 100%
rename from test/cases/xbean/dom/ComplexTypeTest.xsd
rename to src/test/resources/xbean/dom/ComplexTypeTest.xsd
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/README b/src/test/resources/xbean/dom/W3C/level2/core/files/README
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/README
rename to src/test/resources/xbean/dom/W3C/level2/core/files/README
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml b/src/test/resources/xbean/dom/W3C/level2/core/files/hc_staff.xml
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/hc_staff.xml
rename to src/test/resources/xbean/dom/W3C/level2/core/files/hc_staff.xml
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml b/src/test/resources/xbean/dom/W3C/level2/core/files/nodtdstaff.xml
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/nodtdstaff.xml
rename to src/test/resources/xbean/dom/W3C/level2/core/files/nodtdstaff.xml
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/staff.dtd b/src/test/resources/xbean/dom/W3C/level2/core/files/staff.dtd
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/staff.dtd
rename to src/test/resources/xbean/dom/W3C/level2/core/files/staff.dtd
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/staff.xml b/src/test/resources/xbean/dom/W3C/level2/core/files/staff.xml
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/staff.xml
rename to src/test/resources/xbean/dom/W3C/level2/core/files/staff.xml
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd b/src/test/resources/xbean/dom/W3C/level2/core/files/staff2.dtd
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/staff2.dtd
rename to src/test/resources/xbean/dom/W3C/level2/core/files/staff2.dtd
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/staff2.xml b/src/test/resources/xbean/dom/W3C/level2/core/files/staff2.xml
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/staff2.xml
rename to src/test/resources/xbean/dom/W3C/level2/core/files/staff2.xml
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd b/src/test/resources/xbean/dom/W3C/level2/core/files/staffNS.dtd
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/staffNS.dtd
rename to src/test/resources/xbean/dom/W3C/level2/core/files/staffNS.dtd
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml b/src/test/resources/xbean/dom/W3C/level2/core/files/staffNS.xml
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/staffNS.xml
rename to src/test/resources/xbean/dom/W3C/level2/core/files/staffNS.xml
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd b/src/test/resources/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd
rename to src/test/resources/xbean/dom/W3C/level2/core/files/xhtml1-frameset.dtd
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd b/src/test/resources/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd
rename to src/test/resources/xbean/dom/W3C/level2/core/files/xhtml1-strict.dtd
diff --git a/test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd b/src/test/resources/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd
similarity index 100%
rename from test/cases/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd
rename to src/test/resources/xbean/dom/W3C/level2/core/files/xhtml1-transitional.dtd
diff --git a/test/cases/xbean/dom/dumb.xsd b/src/test/resources/xbean/dom/dumb.xsd
similarity index 100%
rename from test/cases/xbean/dom/dumb.xsd
rename to src/test/resources/xbean/dom/dumb.xsd
diff --git a/test/cases/xbean/dom/id.xml b/src/test/resources/xbean/dom/id.xml
similarity index 100%
rename from test/cases/xbean/dom/id.xml
rename to src/test/resources/xbean/dom/id.xml
diff --git a/test/cases/xbean/dom/id.xsd b/src/test/resources/xbean/dom/id.xsd
similarity index 100%
rename from test/cases/xbean/dom/id.xsd
rename to src/test/resources/xbean/dom/id.xsd
diff --git a/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd b/src/test/resources/xbean/extensions/interfaceFeature/averageCase/po.xsd
similarity index 100%
rename from test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsd
rename to src/test/resources/xbean/extensions/interfaceFeature/averageCase/po.xsd
diff --git a/test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig b/src/test/resources/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig
similarity index 100%
rename from test/cases/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig
rename to src/test/resources/xbean/extensions/interfaceFeature/averageCase/po.xsdconfig
diff --git a/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd b/src/test/resources/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd
similarity index 100%
rename from test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd
rename to src/test/resources/xbean/extensions/interfaceFeature/methodNameCollision/company.xsd
diff --git a/test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig b/src/test/resources/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig
similarity index 100%
rename from test/cases/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig
rename to src/test/resources/xbean/extensions/interfaceFeature/methodNameCollision/company.xsdconfig
diff --git a/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd b/src/test/resources/xbean/extensions/interfaceFeature/multInterfaces/po.xsd
similarity index 100%
rename from test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsd
rename to src/test/resources/xbean/extensions/interfaceFeature/multInterfaces/po.xsd
diff --git a/test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig b/src/test/resources/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig
similarity index 100%
rename from test/cases/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig
rename to src/test/resources/xbean/extensions/interfaceFeature/multInterfaces/po.xsdconfig
diff --git a/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd b/src/test/resources/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd
similarity index 100%
rename from test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd
rename to src/test/resources/xbean/extensions/interfaceFeature/readOnlyBean/po.xsd
diff --git a/test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig b/src/test/resources/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig
similarity index 100%
rename from test/cases/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig
rename to src/test/resources/xbean/extensions/interfaceFeature/readOnlyBean/po.xsdconfig
diff --git a/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd b/src/test/resources/xbean/extensions/prePostFeature/ValueRestriction/company.xsd
similarity index 100%
rename from test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsd
rename to src/test/resources/xbean/extensions/prePostFeature/ValueRestriction/company.xsd
diff --git a/test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig b/src/test/resources/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig
similarity index 100%
rename from test/cases/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig
rename to src/test/resources/xbean/extensions/prePostFeature/ValueRestriction/company.xsdconfig
diff --git a/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd b/src/test/resources/xbean/extensions/prePostFeature/readOnlyBean/po.xsd
similarity index 100%
rename from test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsd
rename to src/test/resources/xbean/extensions/prePostFeature/readOnlyBean/po.xsd
diff --git a/test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsdconfig b/src/test/resources/xbean/extensions/prePostFeature/readOnlyBean/po.xsdconfig
similarity index 100%
rename from test/cases/xbean/extensions/prePostFeature/readOnlyBean/po.xsdconfig
rename to src/test/resources/xbean/extensions/prePostFeature/readOnlyBean/po.xsdconfig
diff --git a/test/cases/xbean/marshal/com/mytest/YourClass.java b/src/test/resources/xbean/marshal/com/mytest/YourClass.java
similarity index 100%
rename from test/cases/xbean/marshal/com/mytest/YourClass.java
rename to src/test/resources/xbean/marshal/com/mytest/YourClass.java
diff --git a/test/cases/xbean/misc/dyntest.xml b/src/test/resources/xbean/misc/dyntest.xml
similarity index 100%
rename from test/cases/xbean/misc/dyntest.xml
rename to src/test/resources/xbean/misc/dyntest.xml
diff --git a/test/cases/xbean/misc/dyntest.xsd b/src/test/resources/xbean/misc/dyntest.xsd
similarity index 100%
rename from test/cases/xbean/misc/dyntest.xsd
rename to src/test/resources/xbean/misc/dyntest.xsd
diff --git a/test/cases/xbean/misc/dyntest2.xml b/src/test/resources/xbean/misc/dyntest2.xml
similarity index 100%
rename from test/cases/xbean/misc/dyntest2.xml
rename to src/test/resources/xbean/misc/dyntest2.xml
diff --git a/test/cases/xbean/misc/dyntest2.xsd b/src/test/resources/xbean/misc/dyntest2.xsd
similarity index 100%
rename from test/cases/xbean/misc/dyntest2.xsd
rename to src/test/resources/xbean/misc/dyntest2.xsd
diff --git a/test/cases/xbean/misc/jira/easypo.xml b/src/test/resources/xbean/misc/jira/easypo.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/easypo.xml
rename to src/test/resources/xbean/misc/jira/easypo.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_04.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_04.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_04.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_04.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_08.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_08.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_08.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_08.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_08a.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_08a.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_08a.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_08a.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_09.xml b/src/test/resources/xbean/misc/jira/xmlbeans_09.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_09.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_09.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_09.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_09.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_09.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_09.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_102.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_102.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_102.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_102.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_102_netui-config.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_102_netui-config.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_102_netui-config.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_102_netui-config.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_105.xml b/src/test/resources/xbean/misc/jira/xmlbeans_105.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_105.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_105.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_105.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_105.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_105.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_105.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_105a.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_105a.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_105a.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_105a.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_175.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_175.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_175.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_175.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_177.xml b/src/test/resources/xbean/misc/jira/xmlbeans_177.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_177.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_177.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_177.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_177.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_177.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_177.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_177a.xml b/src/test/resources/xbean/misc/jira/xmlbeans_177a.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_177a.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_177a.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_177a.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_177a.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_177a.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_177a.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_184_datentypen_V1.30.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_184_datentypen_V1.30.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_184_datentypen_V1.30.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_184_datentypen_V1.30.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_184_ehd_header_V1.30.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_184_ehd_header_V1.30.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_184_ehd_header_V1.30.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_184_ehd_header_V1.30.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_184_ehd_root_V1.30.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_184_ehd_root_V1.30.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_184_ehd_root_V1.30.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_184_ehd_root_V1.30.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_184_keytabs_V1.30.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_184_keytabs_V1.30.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_184_keytabs_V1.30.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_184_keytabs_V1.30.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_184_vdx_data_V1.04.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_184_vdx_data_V1.04.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_184_vdx_data_V1.04.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_184_vdx_data_V1.04.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_184_vdx_header_V1.04.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_184_vdx_header_V1.04.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_184_vdx_header_V1.04.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_184_vdx_header_V1.04.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_184_vdx_root_V1.04.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_184_vdx_root_V1.04.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_184_vdx_root_V1.04.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_184_vdx_root_V1.04.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_208.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_208.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_208.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_208.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_228.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_228.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_228.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_228.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_236.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_236.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_236.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_236.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_239a.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_239a.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_239a.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_239a.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_239b.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_239b.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_239b.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_239b.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_239c.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_239c.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_239c.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_239c.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_251.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_251.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_251.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_251.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_307_maxallowedenum.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_307_maxallowedenum.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_307_maxallowedenum.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_307_maxallowedenum.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_307_morethanallowedenum.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_307_morethanallowedenum.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_307_morethanallowedenum.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_307_morethanallowedenum.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_33a.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_33a.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_33a.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_33a.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_33b.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_33b.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_33b.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_33b.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_34a.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_34a.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_34a.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_34a.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_34b.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_34b.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_34b.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_34b.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_35.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_35.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_35.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_35.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_45a.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_45a.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_45a.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_45a.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_45b.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_45b.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_45b.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_45b.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_46.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_46.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_46.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_46.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_48.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_48.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_48.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_48.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_49.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_49.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_49.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_49.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_54.xsd_ b/src/test/resources/xbean/misc/jira/xmlbeans_54.xsd_
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_54.xsd_
rename to src/test/resources/xbean/misc/jira/xmlbeans_54.xsd_
diff --git a/test/cases/xbean/misc/jira/xmlbeans_57.xml b/src/test/resources/xbean/misc/jira/xmlbeans_57.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_57.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_57.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_62.xml b/src/test/resources/xbean/misc/jira/xmlbeans_62.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_62.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_62.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_64.xml b/src/test/resources/xbean/misc/jira/xmlbeans_64.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_64.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_64.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_64.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_64.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_64.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_64.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_68.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_68.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_68.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_68.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_71.xml b/src/test/resources/xbean/misc/jira/xmlbeans_71.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_71.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_71.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_71.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_71.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_71.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_71.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_78.xml b/src/test/resources/xbean/misc/jira/xmlbeans_78.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_78.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_78.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_97.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_97.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_97.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_97.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_97.xsdconfig b/src/test/resources/xbean/misc/jira/xmlbeans_97.xsdconfig
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_97.xsdconfig
rename to src/test/resources/xbean/misc/jira/xmlbeans_97.xsdconfig
diff --git a/test/cases/xbean/misc/jira/xmlbeans_98.xml b/src/test/resources/xbean/misc/jira/xmlbeans_98.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_98.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_98.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_98.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_98.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_98.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_98.xsd
diff --git a/test/cases/xbean/misc/jira/xmlbeans_98_exp.xml b/src/test/resources/xbean/misc/jira/xmlbeans_98_exp.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_98_exp.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_98_exp.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_99.xml b/src/test/resources/xbean/misc/jira/xmlbeans_99.xml
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_99.xml
rename to src/test/resources/xbean/misc/jira/xmlbeans_99.xml
diff --git a/test/cases/xbean/misc/jira/xmlbeans_99.xsd b/src/test/resources/xbean/misc/jira/xmlbeans_99.xsd
similarity index 100%
rename from test/cases/xbean/misc/jira/xmlbeans_99.xsd
rename to src/test/resources/xbean/misc/jira/xmlbeans_99.xsd
diff --git a/test/cases/xbean/misc/primitiveTypes.xml b/src/test/resources/xbean/misc/primitiveTypes.xml
similarity index 100%
rename from test/cases/xbean/misc/primitiveTypes.xml
rename to src/test/resources/xbean/misc/primitiveTypes.xml
diff --git a/test/cases/xbean/misc/signature-example-dsa.xml b/src/test/resources/xbean/misc/signature-example-dsa.xml
similarity index 100%
rename from test/cases/xbean/misc/signature-example-dsa.xml
rename to src/test/resources/xbean/misc/signature-example-dsa.xml
diff --git a/test/cases/xbean/misc/signature-example-rsa.xml b/src/test/resources/xbean/misc/signature-example-rsa.xml
similarity index 100%
rename from test/cases/xbean/misc/signature-example-rsa.xml
rename to src/test/resources/xbean/misc/signature-example-rsa.xml
diff --git a/test/cases/xbean/misc/signature-example.xml b/src/test/resources/xbean/misc/signature-example.xml
similarity index 100%
rename from test/cases/xbean/misc/signature-example.xml
rename to src/test/resources/xbean/misc/signature-example.xml
diff --git a/test/cases/xbean/misc/syscachetest1.xsd b/src/test/resources/xbean/misc/syscachetest1.xsd
similarity index 100%
rename from test/cases/xbean/misc/syscachetest1.xsd
rename to src/test/resources/xbean/misc/syscachetest1.xsd
diff --git a/test/cases/xbean/misc/syscachetest2.xsd b/src/test/resources/xbean/misc/syscachetest2.xsd
similarity index 100%
rename from test/cases/xbean/misc/syscachetest2.xsd
rename to src/test/resources/xbean/misc/syscachetest2.xsd
diff --git a/test/cases/xbean/misc/xkms-1.0.wsdl b/src/test/resources/xbean/misc/xkms-1.0.wsdl
similarity index 100%
rename from test/cases/xbean/misc/xkms-1.0.wsdl
rename to src/test/resources/xbean/misc/xkms-1.0.wsdl
diff --git a/test/cases/xbean/misc/xmldsig-core-schema.xsd b/src/test/resources/xbean/misc/xmldsig-core-schema.xsd
similarity index 100%
rename from test/cases/xbean/misc/xmldsig-core-schema.xsd
rename to src/test/resources/xbean/misc/xmldsig-core-schema.xsd
diff --git a/test/cases/xbean/schema/typesonly/typesonly.xsd b/src/test/resources/xbean/schema/typesonly/typesonly.xsd
similarity index 100%
rename from test/cases/xbean/schema/typesonly/typesonly.xsd
rename to src/test/resources/xbean/schema/typesonly/typesonly.xsd
diff --git a/test/cases/xbean/scomp/attribute/AttributeGroup.xsd b/src/test/resources/xbean/scomp/attribute/AttributeGroup.xsd
similarity index 100%
rename from test/cases/xbean/scomp/attribute/AttributeGroup.xsd
rename to src/test/resources/xbean/scomp/attribute/AttributeGroup.xsd
diff --git a/test/cases/xbean/scomp/attribute/GlobalAttrDefault.xsd b/src/test/resources/xbean/scomp/attribute/GlobalAttrDefault.xsd
similarity index 100%
rename from test/cases/xbean/scomp/attribute/GlobalAttrDefault.xsd
rename to src/test/resources/xbean/scomp/attribute/GlobalAttrDefault.xsd
diff --git a/test/cases/xbean/scomp/attribute/GlobalAttrFixed.xsd b/src/test/resources/xbean/scomp/attribute/GlobalAttrFixed.xsd
similarity index 100%
rename from test/cases/xbean/scomp/attribute/GlobalAttrFixed.xsd
rename to src/test/resources/xbean/scomp/attribute/GlobalAttrFixed.xsd
diff --git a/test/cases/xbean/scomp/attribute/GlobalAttrId.xsd b/src/test/resources/xbean/scomp/attribute/GlobalAttrId.xsd
similarity index 100%
rename from test/cases/xbean/scomp/attribute/GlobalAttrId.xsd
rename to src/test/resources/xbean/scomp/attribute/GlobalAttrId.xsd
diff --git a/test/cases/xbean/scomp/attribute/GlobalAttrType.xsd b/src/test/resources/xbean/scomp/attribute/GlobalAttrType.xsd
similarity index 100%
rename from test/cases/xbean/scomp/attribute/GlobalAttrType.xsd
rename to src/test/resources/xbean/scomp/attribute/GlobalAttrType.xsd
diff --git a/test/cases/xbean/scomp/attribute/LocalAttrFixedDefault.xsd b/src/test/resources/xbean/scomp/attribute/LocalAttrFixedDefault.xsd
similarity index 100%
rename from test/cases/xbean/scomp/attribute/LocalAttrFixedDefault.xsd
rename to src/test/resources/xbean/scomp/attribute/LocalAttrFixedDefault.xsd
diff --git a/test/cases/xbean/scomp/attribute/LocalAttrUse.xsd b/src/test/resources/xbean/scomp/attribute/LocalAttrUse.xsd
similarity index 100%
rename from test/cases/xbean/scomp/attribute/LocalAttrUse.xsd
rename to src/test/resources/xbean/scomp/attribute/LocalAttrUse.xsd
diff --git a/test/cases/xbean/scomp/contentType/Anonymous.xsd b/src/test/resources/xbean/scomp/contentType/Anonymous.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/Anonymous.xsd
rename to src/test/resources/xbean/scomp/contentType/Anonymous.xsd
diff --git a/test/cases/xbean/scomp/contentType/ComplexTypeTest.xsd b/src/test/resources/xbean/scomp/contentType/ComplexTypeTest.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/ComplexTypeTest.xsd
rename to src/test/resources/xbean/scomp/contentType/ComplexTypeTest.xsd
diff --git a/test/cases/xbean/scomp/contentType/Group.xsd b/src/test/resources/xbean/scomp/contentType/Group.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/Group.xsd
rename to src/test/resources/xbean/scomp/contentType/Group.xsd
diff --git a/test/cases/xbean/scomp/contentType/ListType.xsd b/src/test/resources/xbean/scomp/contentType/ListType.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/ListType.xsd
rename to src/test/resources/xbean/scomp/contentType/ListType.xsd
diff --git a/test/cases/xbean/scomp/contentType/Named.xsd b/src/test/resources/xbean/scomp/contentType/Named.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/Named.xsd
rename to src/test/resources/xbean/scomp/contentType/Named.xsd
diff --git a/test/cases/xbean/scomp/contentType/SimpleType.xsd b/src/test/resources/xbean/scomp/contentType/SimpleType.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/SimpleType.xsd
rename to src/test/resources/xbean/scomp/contentType/SimpleType.xsd
diff --git a/test/cases/xbean/scomp/contentType/UnionType.xsd b/src/test/resources/xbean/scomp/contentType/UnionType.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/UnionType.xsd
rename to src/test/resources/xbean/scomp/contentType/UnionType.xsd
diff --git a/test/cases/xbean/scomp/contentType/builtInTypes/DateTime.xsd b/src/test/resources/xbean/scomp/contentType/builtInTypes/DateTime.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/builtInTypes/DateTime.xsd
rename to src/test/resources/xbean/scomp/contentType/builtInTypes/DateTime.xsd
diff --git a/test/cases/xbean/scomp/contentType/builtInTypes/NumberBased.xsd b/src/test/resources/xbean/scomp/contentType/builtInTypes/NumberBased.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/builtInTypes/NumberBased.xsd
rename to src/test/resources/xbean/scomp/contentType/builtInTypes/NumberBased.xsd
diff --git a/test/cases/xbean/scomp/contentType/builtInTypes/StringBased.xsd b/src/test/resources/xbean/scomp/contentType/builtInTypes/StringBased.xsd
similarity index 100%
rename from test/cases/xbean/scomp/contentType/builtInTypes/StringBased.xsd
rename to src/test/resources/xbean/scomp/contentType/builtInTypes/StringBased.xsd
diff --git a/test/cases/xbean/scomp/derivation/Abstract.xsd b/src/test/resources/xbean/scomp/derivation/Abstract.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/Abstract.xsd
rename to src/test/resources/xbean/scomp/derivation/Abstract.xsd
diff --git a/test/cases/xbean/scomp/derivation/AttributeExtension.xsd b/src/test/resources/xbean/scomp/derivation/AttributeExtension.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/AttributeExtension.xsd
rename to src/test/resources/xbean/scomp/derivation/AttributeExtension.xsd
diff --git a/test/cases/xbean/scomp/derivation/AttributeRestriction.xsd b/src/test/resources/xbean/scomp/derivation/AttributeRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/AttributeRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/AttributeRestriction.xsd
diff --git a/test/cases/xbean/scomp/derivation/AttributeUseProhibited.xsd b/src/test/resources/xbean/scomp/derivation/AttributeUseProhibited.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/AttributeUseProhibited.xsd
rename to src/test/resources/xbean/scomp/derivation/AttributeUseProhibited.xsd
diff --git a/test/cases/xbean/scomp/derivation/AttributeWCExtension.xsd b/src/test/resources/xbean/scomp/derivation/AttributeWCExtension.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/AttributeWCExtension.xsd
rename to src/test/resources/xbean/scomp/derivation/AttributeWCExtension.xsd
diff --git a/test/cases/xbean/scomp/derivation/AttributeWCRestriction.xsd b/src/test/resources/xbean/scomp/derivation/AttributeWCRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/AttributeWCRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/AttributeWCRestriction.xsd
diff --git a/test/cases/xbean/scomp/derivation/Block.xsd b/src/test/resources/xbean/scomp/derivation/Block.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/Block.xsd
rename to src/test/resources/xbean/scomp/derivation/Block.xsd
diff --git a/test/cases/xbean/scomp/derivation/ComplexContentExtension.xsd b/src/test/resources/xbean/scomp/derivation/ComplexContentExtension.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/ComplexContentExtension.xsd
rename to src/test/resources/xbean/scomp/derivation/ComplexContentExtension.xsd
diff --git a/test/cases/xbean/scomp/derivation/ElementRestriction.xsd b/src/test/resources/xbean/scomp/derivation/ElementRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/ElementRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/ElementRestriction.xsd
diff --git a/test/cases/xbean/scomp/derivation/ElementWCRestriction.xsd b/src/test/resources/xbean/scomp/derivation/ElementWCRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/ElementWCRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/ElementWCRestriction.xsd
diff --git a/test/cases/xbean/scomp/derivation/EmptyContent.xsd b/src/test/resources/xbean/scomp/derivation/EmptyContent.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/EmptyContent.xsd
rename to src/test/resources/xbean/scomp/derivation/EmptyContent.xsd
diff --git a/test/cases/xbean/scomp/derivation/FinalBlockDefault.xsd b/src/test/resources/xbean/scomp/derivation/FinalBlockDefault.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/FinalBlockDefault.xsd
rename to src/test/resources/xbean/scomp/derivation/FinalBlockDefault.xsd
diff --git a/test/cases/xbean/scomp/derivation/GroupRestrictionTest.xsd b/src/test/resources/xbean/scomp/derivation/GroupRestrictionTest.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/GroupRestrictionTest.xsd
rename to src/test/resources/xbean/scomp/derivation/GroupRestrictionTest.xsd
diff --git a/test/cases/xbean/scomp/derivation/MixedContentExtension.xsd b/src/test/resources/xbean/scomp/derivation/MixedContentExtension.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/MixedContentExtension.xsd
rename to src/test/resources/xbean/scomp/derivation/MixedContentExtension.xsd
diff --git a/test/cases/xbean/scomp/derivation/MixedContentRestriction.xsd b/src/test/resources/xbean/scomp/derivation/MixedContentRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/MixedContentRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/MixedContentRestriction.xsd
diff --git a/test/cases/xbean/scomp/derivation/SimpleContentExtension.xsd b/src/test/resources/xbean/scomp/derivation/SimpleContentExtension.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/SimpleContentExtension.xsd
rename to src/test/resources/xbean/scomp/derivation/SimpleContentExtension.xsd
diff --git a/test/cases/xbean/scomp/derivation/SimpleTypeRestriction.xsd b/src/test/resources/xbean/scomp/derivation/SimpleTypeRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/SimpleTypeRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/SimpleTypeRestriction.xsd
diff --git a/test/cases/xbean/scomp/derivation/facets/DateTimePattern.xsd b/src/test/resources/xbean/scomp/derivation/facets/DateTimePattern.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/facets/DateTimePattern.xsd
rename to src/test/resources/xbean/scomp/derivation/facets/DateTimePattern.xsd
diff --git a/test/cases/xbean/scomp/derivation/facets/FacetRestriction.xsd b/src/test/resources/xbean/scomp/derivation/facets/FacetRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/facets/FacetRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/facets/FacetRestriction.xsd
diff --git a/test/cases/xbean/scomp/derivation/facets/Facets.xsd b/src/test/resources/xbean/scomp/derivation/facets/Facets.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/facets/Facets.xsd
rename to src/test/resources/xbean/scomp/derivation/facets/Facets.xsd
diff --git a/test/cases/xbean/scomp/derivation/facets/ListRestriction.xsd b/src/test/resources/xbean/scomp/derivation/facets/ListRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/facets/ListRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/facets/ListRestriction.xsd
diff --git a/test/cases/xbean/scomp/derivation/facets/UnionRestriction.xsd b/src/test/resources/xbean/scomp/derivation/facets/UnionRestriction.xsd
similarity index 100%
rename from test/cases/xbean/scomp/derivation/facets/UnionRestriction.xsd
rename to src/test/resources/xbean/scomp/derivation/facets/UnionRestriction.xsd
diff --git a/test/cases/xbean/scomp/element/Any.xsd b/src/test/resources/xbean/scomp/element/Any.xsd
similarity index 100%
rename from test/cases/xbean/scomp/element/Any.xsd
rename to src/test/resources/xbean/scomp/element/Any.xsd
diff --git a/test/cases/xbean/scomp/element/GlobalEltDefault.xsd b/src/test/resources/xbean/scomp/element/GlobalEltDefault.xsd
similarity index 100%
rename from test/cases/xbean/scomp/element/GlobalEltDefault.xsd
rename to src/test/resources/xbean/scomp/element/GlobalEltDefault.xsd
diff --git a/test/cases/xbean/scomp/element/GlobalEltFixed.xsd b/src/test/resources/xbean/scomp/element/GlobalEltFixed.xsd
similarity index 100%
rename from test/cases/xbean/scomp/element/GlobalEltFixed.xsd
rename to src/test/resources/xbean/scomp/element/GlobalEltFixed.xsd
diff --git a/test/cases/xbean/scomp/element/GlobalEltNillable.xsd b/src/test/resources/xbean/scomp/element/GlobalEltNillable.xsd
similarity index 100%
rename from test/cases/xbean/scomp/element/GlobalEltNillable.xsd
rename to src/test/resources/xbean/scomp/element/GlobalEltNillable.xsd
diff --git a/test/cases/xbean/scomp/element/LocalEltMinMaxOccurs.xsd b/src/test/resources/xbean/scomp/element/LocalEltMinMaxOccurs.xsd
similarity index 100%
rename from test/cases/xbean/scomp/element/LocalEltMinMaxOccurs.xsd
rename to src/test/resources/xbean/scomp/element/LocalEltMinMaxOccurs.xsd
diff --git a/test/cases/xbean/scomp/element/NamedModelGroup.xsd b/src/test/resources/xbean/scomp/element/NamedModelGroup.xsd
similarity index 100%
rename from test/cases/xbean/scomp/element/NamedModelGroup.xsd
rename to src/test/resources/xbean/scomp/element/NamedModelGroup.xsd
diff --git a/test/cases/xbean/scomp/element/NillTest.xsd b/src/test/resources/xbean/scomp/element/NillTest.xsd
similarity index 100%
rename from test/cases/xbean/scomp/element/NillTest.xsd
rename to src/test/resources/xbean/scomp/element/NillTest.xsd
diff --git a/test/cases/xbean/scomp/idConstraints/Constraint.xsd b/src/test/resources/xbean/scomp/idConstraints/Constraint.xsd
similarity index 100%
rename from test/cases/xbean/scomp/idConstraints/Constraint.xsd
rename to src/test/resources/xbean/scomp/idConstraints/Constraint.xsd
diff --git a/test/cases/xbean/scomp/namespace/AttributeFormDefault.xsd b/src/test/resources/xbean/scomp/namespace/AttributeFormDefault.xsd
similarity index 100%
rename from test/cases/xbean/scomp/namespace/AttributeFormDefault.xsd
rename to src/test/resources/xbean/scomp/namespace/AttributeFormDefault.xsd
diff --git a/test/cases/xbean/scomp/namespace/AttributeWC.xsd b/src/test/resources/xbean/scomp/namespace/AttributeWC.xsd
similarity index 100%
rename from test/cases/xbean/scomp/namespace/AttributeWC.xsd
rename to src/test/resources/xbean/scomp/namespace/AttributeWC.xsd
diff --git a/test/cases/xbean/scomp/namespace/ElementFormDefault.xsd b/src/test/resources/xbean/scomp/namespace/ElementFormDefault.xsd
similarity index 100%
rename from test/cases/xbean/scomp/namespace/ElementFormDefault.xsd
rename to src/test/resources/xbean/scomp/namespace/ElementFormDefault.xsd
diff --git a/test/cases/xbean/scomp/namespace/ElementWC.xsd b/src/test/resources/xbean/scomp/namespace/ElementWC.xsd
similarity index 100%
rename from test/cases/xbean/scomp/namespace/ElementWC.xsd
rename to src/test/resources/xbean/scomp/namespace/ElementWC.xsd
diff --git a/test/cases/xbean/scomp/namespace/NoNamespace.xsd b/src/test/resources/xbean/scomp/namespace/NoNamespace.xsd
similarity index 100%
rename from test/cases/xbean/scomp/namespace/NoNamespace.xsd
rename to src/test/resources/xbean/scomp/namespace/NoNamespace.xsd
diff --git a/test/cases/xbean/scomp/redefine/AttrRedefineSub.xs b/src/test/resources/xbean/scomp/redefine/AttrRedefineSub.xs
similarity index 100%
rename from test/cases/xbean/scomp/redefine/AttrRedefineSub.xs
rename to src/test/resources/xbean/scomp/redefine/AttrRedefineSub.xs
diff --git a/test/cases/xbean/scomp/redefine/AttrRedefineSuper.xsd b/src/test/resources/xbean/scomp/redefine/AttrRedefineSuper.xsd
similarity index 100%
rename from test/cases/xbean/scomp/redefine/AttrRedefineSuper.xsd
rename to src/test/resources/xbean/scomp/redefine/AttrRedefineSuper.xsd
diff --git a/test/cases/xbean/scomp/redefine/BaseAttrGroup.xs b/src/test/resources/xbean/scomp/redefine/BaseAttrGroup.xs
similarity index 100%
rename from test/cases/xbean/scomp/redefine/BaseAttrGroup.xs
rename to src/test/resources/xbean/scomp/redefine/BaseAttrGroup.xs
diff --git a/test/cases/xbean/scomp/redefine/BaseModelGroup.xs b/src/test/resources/xbean/scomp/redefine/BaseModelGroup.xs
similarity index 100%
rename from test/cases/xbean/scomp/redefine/BaseModelGroup.xs
rename to src/test/resources/xbean/scomp/redefine/BaseModelGroup.xs
diff --git a/test/cases/xbean/scomp/redefine/BaseSimple.xs b/src/test/resources/xbean/scomp/redefine/BaseSimple.xs
similarity index 100%
rename from test/cases/xbean/scomp/redefine/BaseSimple.xs
rename to src/test/resources/xbean/scomp/redefine/BaseSimple.xs
diff --git a/test/cases/xbean/scomp/redefine/ModelGroupSub.xs b/src/test/resources/xbean/scomp/redefine/ModelGroupSub.xs
similarity index 100%
rename from test/cases/xbean/scomp/redefine/ModelGroupSub.xs
rename to src/test/resources/xbean/scomp/redefine/ModelGroupSub.xs
diff --git a/test/cases/xbean/scomp/redefine/ModelGroupSuper.xsd b/src/test/resources/xbean/scomp/redefine/ModelGroupSuper.xsd
similarity index 100%
rename from test/cases/xbean/scomp/redefine/ModelGroupSuper.xsd
rename to src/test/resources/xbean/scomp/redefine/ModelGroupSuper.xsd
diff --git a/test/cases/xbean/scomp/redefine/SimpleRedefined.xsd b/src/test/resources/xbean/scomp/redefine/SimpleRedefined.xsd
similarity index 100%
rename from test/cases/xbean/scomp/redefine/SimpleRedefined.xsd
rename to src/test/resources/xbean/scomp/redefine/SimpleRedefined.xsd
diff --git a/test/cases/xbean/scomp/redefine/TypeBase.xs b/src/test/resources/xbean/scomp/redefine/TypeBase.xs
similarity index 100%
rename from test/cases/xbean/scomp/redefine/TypeBase.xs
rename to src/test/resources/xbean/scomp/redefine/TypeBase.xs
diff --git a/test/cases/xbean/scomp/redefine/TypeRedefine.xsd b/src/test/resources/xbean/scomp/redefine/TypeRedefine.xsd
similarity index 100%
rename from test/cases/xbean/scomp/redefine/TypeRedefine.xsd
rename to src/test/resources/xbean/scomp/redefine/TypeRedefine.xsd
diff --git a/test/cases/xbean/scomp/substGroup/Abstract.xsd b/src/test/resources/xbean/scomp/substGroup/Abstract.xsd
similarity index 100%
rename from test/cases/xbean/scomp/substGroup/Abstract.xsd
rename to src/test/resources/xbean/scomp/substGroup/Abstract.xsd
diff --git a/test/cases/xbean/scomp/substGroup/Block.xsd b/src/test/resources/xbean/scomp/substGroup/Block.xsd
similarity index 100%
rename from test/cases/xbean/scomp/substGroup/Block.xsd
rename to src/test/resources/xbean/scomp/substGroup/Block.xsd
diff --git a/test/cases/xbean/scomp/substGroup/Deep.xsd b/src/test/resources/xbean/scomp/substGroup/Deep.xsd
similarity index 100%
rename from test/cases/xbean/scomp/substGroup/Deep.xsd
rename to src/test/resources/xbean/scomp/substGroup/Deep.xsd
diff --git a/test/cases/xbean/scomp/substGroup/OneLevel.xsd b/src/test/resources/xbean/scomp/substGroup/OneLevel.xsd
similarity index 100%
rename from test/cases/xbean/scomp/substGroup/OneLevel.xsd
rename to src/test/resources/xbean/scomp/substGroup/OneLevel.xsd
diff --git a/test/cases/xbean/scomp/substGroup/UserAbstract.xsd b/src/test/resources/xbean/scomp/substGroup/UserAbstract.xsd
similarity index 100%
rename from test/cases/xbean/scomp/substGroup/UserAbstract.xsd
rename to src/test/resources/xbean/scomp/substGroup/UserAbstract.xsd
diff --git a/test/cases/xbean/scomp/substGroup/UserReported.xsd b/src/test/resources/xbean/scomp/substGroup/UserReported.xsd
similarity index 100%
rename from test/cases/xbean/scomp/substGroup/UserReported.xsd
rename to src/test/resources/xbean/scomp/substGroup/UserReported.xsd
diff --git a/test/cases/xbean/scomp/substGroup/Wide.xsd b/src/test/resources/xbean/scomp/substGroup/Wide.xsd
similarity index 100%
rename from test/cases/xbean/scomp/substGroup/Wide.xsd
rename to src/test/resources/xbean/scomp/substGroup/Wide.xsd
diff --git a/test/cases/xbean/simple/dumb/dumb.xml b/src/test/resources/xbean/simple/dumb/dumb.xml
similarity index 100%
rename from test/cases/xbean/simple/dumb/dumb.xml
rename to src/test/resources/xbean/simple/dumb/dumb.xml
diff --git a/test/cases/xbean/simple/dumb/dumb.xsd b/src/test/resources/xbean/simple/dumb/dumb.xsd
similarity index 100%
rename from test/cases/xbean/simple/dumb/dumb.xsd
rename to src/test/resources/xbean/simple/dumb/dumb.xsd
diff --git a/test/cases/xbean/simple/dumb/sub/bar.xsd b/src/test/resources/xbean/simple/dumb/sub/bar.xsd
similarity index 100%
rename from test/cases/xbean/simple/dumb/sub/bar.xsd
rename to src/test/resources/xbean/simple/dumb/sub/bar.xsd
diff --git a/test/cases/xbean/simple/dupSchemaElements/DupElementsInSameSchema.xsd b/src/test/resources/xbean/simple/dupSchemaElements/DupElementsInSameSchema.xsd
similarity index 100%
rename from test/cases/xbean/simple/dupSchemaElements/DupElementsInSameSchema.xsd
rename to src/test/resources/xbean/simple/dupSchemaElements/DupElementsInSameSchema.xsd
diff --git a/test/cases/xbean/simple/dupSchemaElements/custOrdUdf.xsd b/src/test/resources/xbean/simple/dupSchemaElements/custOrdUdf.xsd
similarity index 100%
rename from test/cases/xbean/simple/dupSchemaElements/custOrdUdf.xsd
rename to src/test/resources/xbean/simple/dupSchemaElements/custOrdUdf.xsd
diff --git a/test/cases/xbean/simple/dupSchemaElements/viewtarget.xsd b/src/test/resources/xbean/simple/dupSchemaElements/viewtarget.xsd
similarity index 100%
rename from test/cases/xbean/simple/dupSchemaElements/viewtarget.xsd
rename to src/test/resources/xbean/simple/dupSchemaElements/viewtarget.xsd
diff --git a/test/cases/xbean/simple/person/person.xml b/src/test/resources/xbean/simple/person/person.xml
similarity index 100%
rename from test/cases/xbean/simple/person/person.xml
rename to src/test/resources/xbean/simple/person/person.xml
diff --git a/test/cases/xbean/simple/person/person.xsd b/src/test/resources/xbean/simple/person/person.xsd
similarity index 100%
rename from test/cases/xbean/simple/person/person.xsd
rename to src/test/resources/xbean/simple/person/person.xsd
diff --git a/test/cases/xbean/simple/person/simplec.xsd b/src/test/resources/xbean/simple/person/simplec.xsd
similarity index 100%
rename from test/cases/xbean/simple/person/simplec.xsd
rename to src/test/resources/xbean/simple/person/simplec.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base.xml b/src/test/resources/xbean/tools/inst2xsd/options/base.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base.xml
rename to src/test/resources/xbean/tools/inst2xsd/options/base.xml
diff --git a/test/cases/xbean/tools/inst2xsd/options/base0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_rd_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_rd_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_rd_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_rd_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_rd_scs0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_rd_scs0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_rd_scs0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_rd_scs0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_rd_scs_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_rd_scs_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_rd_scs_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_rd_scs_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_ss_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_ss_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_ss_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_ss_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_ss_scs0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_ss_scs0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_ss_scs0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_ss_scs0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_ss_scs_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_ss_scs_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_ss_scs_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_ss_scs_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_vb_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_vb_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_vb_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_vb_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_vb_scs0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_vb_scs0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_vb_scs0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_vb_scs0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/options/base_vb_scs_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/options/base_vb_scs_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/options/base_vb_scs_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/options/base_vb_scs_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/choice.xml b/src/test/resources/xbean/tools/inst2xsd/schema/choice.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/choice.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/choice.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/choice_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/choice_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/choice_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/choice_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/attrchoice.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/attrchoice.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/attrchoice.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/attrchoice.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/attrchoice_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/attrchoice_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/attrchoice_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/attrchoice_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/attrchoice_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/attrchoice_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/attrchoice_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/attrchoice_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/nschoice_ss3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/schema0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/schema0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/schema0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/schema0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/schema1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/schema1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/schema1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/schema1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/simplechoice.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/simplechoice.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/simplechoice.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/simplechoice.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/choice/simplechoice_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss_enum2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum2_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum2_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum2_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum2_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum2_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum2_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum2_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum2_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum2_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum2_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum2_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum2_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enumQName.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enumQName.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enumQName.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enumQName.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_enum0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_enum0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_enum0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_enum0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum_vb_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum_vb_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum_vb_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum_vb_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum_vb_scs_enum0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum_vb_scs_enum0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum_vb_scs_enum0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/enum/enum_vb_scs_enum0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattr_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattr_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattribute.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattribute.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/global/globalattribute.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/global/globalattribute.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_rd3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_ss3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedArray_vb3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedNSArray.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedNSArray.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedNSArray.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/nestedNSArray/nestedNSArray.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice.xml b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_eN1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_eN1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_eN1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_eN1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_scs_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_scs_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_scs_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_scs_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_scs_eN1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_scs_eN1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_scs_eN1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/choice_rd_scs_eN1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/oops0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/oops0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/oops0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/oops0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/complex/sample/oops1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/oops1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/complex/sample/oops1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/complex/sample/oops1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/cd_catalog.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/cd_catalog.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/cd_catalog.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/cd_catalog.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/cd_catalog_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/cd_catalog_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/cd_catalog_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/cd_catalog_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/cd_catalog_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/cd_catalog_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/cd_catalog_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/cd_catalog_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/cd_catalog_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/cd_catalog_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/cd_catalog_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/cd_catalog_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/cdcatalog.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/cdcatalog.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/cdcatalog.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/cdcatalog.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/cdcatalog_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/cdcatalog_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/cdcatalog_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/cdcatalog_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/cdcatalog_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/cdcatalog_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/cdcatalog_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/cdcatalog_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/cdcatalog_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/cdcatalog_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/cdcatalog_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/cdcatalog_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/component.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/component.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/component.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/component.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/component_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/component_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/component_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/component_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/component_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/component_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/component_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/component_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/component_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/component_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/component_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/component_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/html_example.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/html_example.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/html_example.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/html_example.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/html_example_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/html_example_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/html_example_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/html_example_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/html_example_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/html_example_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/html_example_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/html_example_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/html_example_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/html_example_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/html_example_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/html_example_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/po/po.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/po/po.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_rd_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_rd_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/po/po_rd_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_rd_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/po/po_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_ss_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_ss_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/po/po_ss_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_ss_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_eN0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_vb_eN0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_eN0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_vb_eN0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs_enum0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs_enum0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs_enum0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs_enum0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentsmart_4enum_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentsmart_4enum_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentsmart_4enum_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentsmart_4enum_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentsmart_neverenum_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentsmart_neverenum_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentsmart_neverenum_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentsmart_neverenum_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_4enum_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_4enum_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_4enum_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_4enum_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_neverenum_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_neverenum_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_neverenum_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_neverenum_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_contentstring_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_neverenum_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_neverenum_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_neverenum_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_neverenum_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/rss2sample_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/rss2sample_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss091.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss091.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss091.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss091.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss091_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss091_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss091_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss091_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss091_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss091_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss091_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss091_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss091_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss091_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss091_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss091_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss092.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss092.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss092_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss092_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss092_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss092_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss092_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/sampleRss092_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/schema0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/schema0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/schema0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/schema0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdot.rdf.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdot.rdf.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdot.rdf.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdot.rdf.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdot.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdot.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdot.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdot.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotrdf_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotxml_neverenum_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotxml_neverenum_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotxml_neverenum_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotxml_neverenum_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotxml_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotxml_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotxml_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotxml_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotxml_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotxml_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotxml_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotxml_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotxml_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotxml_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/slashdotxml_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/slashdotxml_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xmlnews.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xmlnews.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xmlnews.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xmlnews.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xmlnews_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xmlnews_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xmlnews_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xmlnews_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xmlnews_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xmlnews_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xmlnews_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xmlnews_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xmlnews_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xmlnews_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xmlnews_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xmlnews_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_example.xml b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_example.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xsl_example.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_example.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xsl_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xsl_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xsl_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xsl_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xsl_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/examples/xsl_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/examples/xsl_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS.xml b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS.xml b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_rd3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_ss3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNS_vb3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS.xml b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/must.xml b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/must.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/must_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/must_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/must_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/must_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/must_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/must_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/must_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/must_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/must_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/must_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/must_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/must_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/must_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/simple.xml b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/simple.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/simple.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/simple.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/simple_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/simple_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/simple_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/simple_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/namespaces/simple_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/namespaces/simple_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/simpleName.xml b/src/test/resources/xbean/tools/inst2xsd/schema/simpleName.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/simpleName.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/simpleName.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/simpleName_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/simpleName_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/simpleName_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/simpleName_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/simpleName_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/simpleName_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/simpleName_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/simpleName_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/simpleName_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/simpleName_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/simpleName_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/simpleName_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/CData.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/CData.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/CData.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/CData.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/cdata_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/cdata_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/cdata_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/cdata_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/cdata_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/cdata_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/cdata_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/cdata_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/cdata_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/cdata_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/cdata_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/cdata_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/comments.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/comments.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/comments.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/comments.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/comments_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/comments_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/comments_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/comments_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/comments_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/comments_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/comments_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/comments_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/comments_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/comments_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/comments_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/comments_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/commentschoice.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNrd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice_eNrd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNrd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice_eNrd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice_eNss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice_eNss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNvb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice_eNvb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNvb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice_eNvb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/commentschoice_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/innercomment.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/innercomment.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/innercomment.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/innercomment.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/innercomment_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/innercomment_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/innercomment_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/innercomment_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/person.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/person.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/person.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/person.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/person_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/person_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/person_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/person_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/po.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/po.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/po.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/po.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/po_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/po_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/po_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/po_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/po_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/po_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/po_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/po_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation_vb2.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation_vb2.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation_vb2.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation_vb2.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation_vb3.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation_vb3.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/schemaLocation_vb3.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/schemaLocation_vb3.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/unicode.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/unicode.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/unicode.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/unicode.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/unicode_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/unicode_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/unicode_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/unicode_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/unicode_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/unicode_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/unicode_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/unicode_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/unicode_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/unicode_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/unicode_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/unicode_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsinil.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsinil.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_rd0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_rd0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsinil_rd0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_rd0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_rd1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_rd1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsinil_rd1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_rd1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_ss0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_ss0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsinil_ss0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_ss0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_ss1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_ss1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsinil_ss1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_ss1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsinil_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsinil_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsinil_vb1.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsitype.xml b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsitype.xml
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsitype.xml
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsitype.xml
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsitype_vb0.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsitype_vb0.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsitype_vb0.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsitype_vb0.xsd
diff --git a/test/cases/xbean/tools/inst2xsd/schema/types/xsitype_vb1.xsd b/src/test/resources/xbean/tools/inst2xsd/schema/types/xsitype_vb1.xsd
similarity index 100%
rename from test/cases/xbean/tools/inst2xsd/schema/types/xsitype_vb1.xsd
rename to src/test/resources/xbean/tools/inst2xsd/schema/types/xsitype_vb1.xsd
diff --git a/test/cases/xbean/tranxml.tar.bz2 b/src/test/resources/xbean/tranxml.tar.bz2
similarity index 100%
rename from test/cases/xbean/tranxml.tar.bz2
rename to src/test/resources/xbean/tranxml.tar.bz2
Binary files differ
diff --git a/test/cases/xbean/usertype/averageCase/po.xsd b/src/test/resources/xbean/usertype/averageCase/po.xsd
similarity index 100%
rename from test/cases/xbean/usertype/averageCase/po.xsd
rename to src/test/resources/xbean/usertype/averageCase/po.xsd
diff --git a/test/cases/xbean/usertype/averageCase/po.xsdconfig b/src/test/resources/xbean/usertype/averageCase/po.xsdconfig
similarity index 100%
rename from test/cases/xbean/usertype/averageCase/po.xsdconfig
rename to src/test/resources/xbean/usertype/averageCase/po.xsdconfig
diff --git a/test/cases/xbean/usertype/multipleItems/company.xsd b/src/test/resources/xbean/usertype/multipleItems/company.xsd
similarity index 100%
rename from test/cases/xbean/usertype/multipleItems/company.xsd
rename to src/test/resources/xbean/usertype/multipleItems/company.xsd
diff --git a/test/cases/xbean/usertype/multipleItems/company.xsdconfig b/src/test/resources/xbean/usertype/multipleItems/company.xsdconfig
similarity index 100%
rename from test/cases/xbean/usertype/multipleItems/company.xsdconfig
rename to src/test/resources/xbean/usertype/multipleItems/company.xsdconfig
diff --git a/test/cases/xbean/xmlcursor/CR196679.xsd b/src/test/resources/xbean/xmlcursor/CR196679.xsd
similarity index 100%
rename from test/cases/xbean/xmlcursor/CR196679.xsd
rename to src/test/resources/xbean/xmlcursor/CR196679.xsd
diff --git a/test/cases/xbean/xmlcursor/CarLocationMessage.xml b/src/test/resources/xbean/xmlcursor/CarLocationMessage.xml
similarity index 100%
rename from test/cases/xbean/xmlcursor/CarLocationMessage.xml
rename to src/test/resources/xbean/xmlcursor/CarLocationMessage.xml
diff --git a/test/cases/xbean/xmlcursor/Employees.xml b/src/test/resources/xbean/xmlcursor/Employees.xml
similarity index 100%
rename from test/cases/xbean/xmlcursor/Employees.xml
rename to src/test/resources/xbean/xmlcursor/Employees.xml
diff --git a/test/cases/xbean/xmlcursor/TranXML_License.txt b/src/test/resources/xbean/xmlcursor/TranXML_License.txt
similarity index 100%
rename from test/cases/xbean/xmlcursor/TranXML_License.txt
rename to src/test/resources/xbean/xmlcursor/TranXML_License.txt
diff --git a/test/cases/xbean/xmlcursor/W3C_Software_Licence.txt b/src/test/resources/xbean/xmlcursor/W3C_Software_Licence.txt
similarity index 100%
rename from test/cases/xbean/xmlcursor/W3C_Software_Licence.txt
rename to src/test/resources/xbean/xmlcursor/W3C_Software_Licence.txt
diff --git a/test/cases/xbean/xmlcursor/XQueryInput.xml b/src/test/resources/xbean/xmlcursor/XQueryInput.xml
similarity index 100%
rename from test/cases/xbean/xmlcursor/XQueryInput.xml
rename to src/test/resources/xbean/xmlcursor/XQueryInput.xml
diff --git a/test/cases/xbean/xmlcursor/XQueryInput.xsd b/src/test/resources/xbean/xmlcursor/XQueryInput.xsd
similarity index 100%
rename from test/cases/xbean/xmlcursor/XQueryInput.xsd
rename to src/test/resources/xbean/xmlcursor/XQueryInput.xsd
diff --git a/test/cases/xbean/xmlcursor/doc.xml b/src/test/resources/xbean/xmlcursor/doc.xml
similarity index 100%
rename from test/cases/xbean/xmlcursor/doc.xml
rename to src/test/resources/xbean/xmlcursor/doc.xml
diff --git a/test/cases/xbean/xmlcursor/location.xsd b/src/test/resources/xbean/xmlcursor/location.xsd
similarity index 100%
rename from test/cases/xbean/xmlcursor/location.xsd
rename to src/test/resources/xbean/xmlcursor/location.xsd