Index: C:/Java/castor-4/.checkstyle
===================================================================
--- C:/Java/castor-4/.checkstyle	(revision 7008)
+++ C:/Java/castor-4/.checkstyle	(working copy)
@@ -6,31 +6,28 @@
     <local-check-config name="castor-test-checks" location="src/tools/checkstyle/castor-test-checks.xml" type="project" description="">
         <additional-data name="protect-config-file" value="true"/>
     </local-check-config>
-    <fileset name="src/test/java" enabled="true" check-config-name="castor-test-checks" local="true">
-        <file-match-pattern match-pattern="src[/\\]test[/\\]java[/\\].*\.java" include-pattern="true"/>
+    <fileset name="cpa test" enabled="true" check-config-name="castor-test-checks" local="true">
+        <file-match-pattern match-pattern="cpa[/\\]src[/\\]test[/\\]java[/\\].*\.java" include-pattern="true"/>
+        <file-match-pattern match-pattern="cpactf[/\\]src[/\\]test[/\\]java[/\\].*\.java" include-pattern="true"/>
+        <file-match-pattern match-pattern="cpaptf[/\\]src[/\\]test[/\\]java[/\\].*\.java" include-pattern="true"/>
     </fileset>
-    <fileset name="src/tests/ptf" enabled="true" check-config-name="castor-test-checks" local="true">
-        <file-match-pattern match-pattern="src[/\\]tests[/\\]ptf[/\\]jdo[/\\].*\.java" include-pattern="true"/>
+    <fileset name="cpa main" enabled="true" check-config-name="castor-main-checks" local="true">
+        <file-match-pattern match-pattern="cpa[/\\]src[/\\]main[/\\]java[/\\].*\.java" include-pattern="true"/>
+        <file-match-pattern match-pattern="cpactf[/\\]src[/\\]main[/\\]java[/\\].*\.java" include-pattern="true"/>
     </fileset>
-    <fileset name="ddlgen + anttask + codegen" enabled="true" check-config-name="castor-main-checks" local="true">
-        <file-match-pattern match-pattern="ddlgen[/\\]src[/\\]main[/\\]java[/\\].*\.java" include-pattern="true"/>
+    <fileset name="anttask main" enabled="true" check-config-name="castor-main-checks" local="true">
         <file-match-pattern match-pattern="anttask[/\\]src[/\\]main[/\\]java[/\\].*\.java" include-pattern="true"/>
+    </fileset>
+    <fileset name="codegen main" enabled="true" check-config-name="castor-main-checks" local="true">
         <file-match-pattern match-pattern="codegen[/\\]src[/\\]main[/\\]java[/\\].*\.java" include-pattern="true"/>
     </fileset>
-    <fileset name="src/tests/ctf" enabled="true" check-config-name="castor-test-checks" local="true">
-        <file-match-pattern match-pattern="src[/\\]tests[/\\]ctf[/\\]jdo[/\\].*\.java" include-pattern="true"/>
+    <fileset name="codegen test" enabled="true" check-config-name="castor-test-checks" local="true">
+        <file-match-pattern match-pattern="codegen[/\\]src[/\\]test[/\\]java[/\\].*\.java" include-pattern="true"/>
     </fileset>
-    <fileset name="ddlgen tests" enabled="true" check-config-name="castor-test-checks" local="true">
+    <fileset name="ddlgen main" enabled="true" check-config-name="castor-main-checks" local="true">
+        <file-match-pattern match-pattern="ddlgen[/\\]src[/\\]main[/\\]java[/\\].*\.java" include-pattern="true"/>
+    </fileset>
+    <fileset name="ddlgen test" enabled="true" check-config-name="castor-test-checks" local="true">
         <file-match-pattern match-pattern="ddlgen[/\\]src[/\\]test[/\\]java[/\\].*\.java" include-pattern="true"/>
     </fileset>
-    <fileset name="src/main/java" enabled="true" check-config-name="castor-main-checks" local="true">
-        <file-match-pattern match-pattern="src[/\\]main[/\\]java[/\\]org[/\\]exolab[/\\]castor[/\\]jdo[/\\]JDOManager\.java" include-pattern="true"/>
-        <file-match-pattern match-pattern="src[/\\]main[/\\]java[/\\]org[/\\]exolab[/\\]castor[/\\]jdo[/\\]JDO\.java" include-pattern="true"/>
-        <file-match-pattern match-pattern="src[/\\]main[/\\]java[/\\]org[/\\]castor[/\\].*\.java" include-pattern="true"/>
-        <file-match-pattern match-pattern="src[/\\]main[/\\]java[/\\]org[/\\]castor[/\\]util[/\\]concurrent[/\\].*\.java" include-pattern="false"/>
-        <file-match-pattern match-pattern="src[/\\]main[/\\]java[/\\]org[/\\]castor[/\\]jdo[/\\]conf[/\\].*\.java" include-pattern="false"/>
-        <file-match-pattern match-pattern="src[/\\]main[/\\]java[/\\]org[/\\]exolab[/\\]castor[/\\]xml[/\\]validators[/\\].*\.java" include-pattern="true"/>
-        <file-match-pattern match-pattern="src[/\\]main[/\\]java[/\\]org[/\\]exolab[/\\]castor[/\\]xml[/\\]descriptors[/\\].*\.java" include-pattern="true"/>
-        <file-match-pattern match-pattern="src[/\\]main[/\\]java[/\\]org[/\\]exolab[/\\]castor[/\\]xml[/\\]handlers[/\\].*\.java" include-pattern="true"/>
-    </fileset>
 </fileset-config>
Index: C:/Java/castor-4/.classpath
===================================================================
--- C:/Java/castor-4/.classpath	(revision 7008)
+++ C:/Java/castor-4/.classpath	(working copy)
@@ -6,25 +6,29 @@
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="src" path="src/bugs"/>
 	<classpathentry kind="src" path="src/tests"/>
-	<classpathentry output="anttask/eclipse" kind="src" path="anttask/src/main/java"/>
-	<classpathentry output="anttask/eclipse" kind="src" path="anttask/src/main/resources"/>
-	<classpathentry output="codegen/eclipse" kind="src" path="codegen/src/main/java"/>
-	<classpathentry output="codegen/eclipse" kind="src" path="codegen/src/main/resources"/>
-	<classpathentry output="cpactf/eclipse" kind="src" path="cpactf/src/main/java"/>
-	<classpathentry output="cpactf/eclipse" kind="src" path="cpactf/src/main/resources"/>
-	<classpathentry output="cpactf/eclipse" kind="src" path="cpactf/src/test/java"/>
-	<classpathentry output="cpactf/eclipse" kind="src" path="cpactf/src/test/resources"/>
-	<classpathentry output="cpaptf/eclipse" kind="src" path="cpaptf/src/test/java"/>
-	<classpathentry output="cpaptf/eclipse" kind="src" path="cpaptf/src/test/resources"/>
-	<classpathentry output="ddlgen/eclipse" kind="src" path="ddlgen/src/main/java"/>
-	<classpathentry output="ddlgen/eclipse" kind="src" path="ddlgen/src/main/resources"/>
-	<classpathentry output="ddlgen/eclipse" kind="src" path="ddlgen/src/test/java"/>
-	<classpathentry output="ddlgen/eclipse" kind="src" path="ddlgen/src/test/resources"/>
-	<classpathentry output="xmlctf/eclipse" kind="src" path="xmlctf/src/main/java"/>
-	<classpathentry kind="src" path="codegen/src/test/java"/>
-	<classpathentry kind="src" path="codegen/src/test/resources"/>
-	<classpathentry excluding="codegen/" output="examples/eclipse" kind="src" path="examples/src/main/java"/>
-	<classpathentry output="examples/eclipse" kind="src" path="examples/src/main/resources"/>
+	<classpathentry kind="src" output="anttask/eclipse" path="anttask/src/main/java"/>
+	<classpathentry kind="src" output="anttask/eclipse" path="anttask/src/main/resources"/>
+	<classpathentry kind="src" output="codegen/eclipse" path="codegen/src/main/java"/>
+	<classpathentry kind="src" output="codegen/eclipse" path="codegen/src/main/resources"/>
+	<classpathentry kind="src" output="codegen/eclipse" path="codegen/src/test/java"/>
+	<classpathentry kind="src" output="codegen/eclipse" path="codegen/src/test/resources"/>
+	<classpathentry kind="src" output="cpa/eclipse" path="cpa/src/main/java"/>
+	<classpathentry kind="src" output="cpa/eclipse" path="cpa/src/main/resources"/>
+	<classpathentry kind="src" output="cpa/eclipse" path="cpa/src/test/java"/>
+	<classpathentry kind="src" output="cpa/eclipse" path="cpa/src/test/resources"/>
+	<classpathentry kind="src" output="cpactf/eclipse" path="cpactf/src/main/java"/>
+	<classpathentry kind="src" output="cpactf/eclipse" path="cpactf/src/main/resources"/>
+	<classpathentry kind="src" output="cpactf/eclipse" path="cpactf/src/test/java"/>
+	<classpathentry kind="src" output="cpactf/eclipse" path="cpactf/src/test/resources"/>
+	<classpathentry kind="src" output="cpaptf/eclipse" path="cpaptf/src/test/java"/>
+	<classpathentry kind="src" output="cpaptf/eclipse" path="cpaptf/src/test/resources"/>
+	<classpathentry kind="src" output="ddlgen/eclipse" path="ddlgen/src/main/java"/>
+	<classpathentry kind="src" output="ddlgen/eclipse" path="ddlgen/src/main/resources"/>
+	<classpathentry kind="src" output="ddlgen/eclipse" path="ddlgen/src/test/java"/>
+	<classpathentry kind="src" output="ddlgen/eclipse" path="ddlgen/src/test/resources"/>
+	<classpathentry excluding="codegen/" kind="src" output="examples/eclipse" path="examples/src/main/java"/>
+	<classpathentry kind="src" output="examples/eclipse" path="examples/src/main/resources"/>
+	<classpathentry kind="src" output="xmlctf/eclipse" path="xmlctf/src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/jakarta-oro-2.0.5.jar"/>
 	<classpathentry kind="lib" path="lib/jakarta-regexp-1.1.jar"/>
Index: C:/Java/castor-4/src/doc/release-notes.xml
===================================================================
--- C:/Java/castor-4/src/doc/release-notes.xml	(revision 7008)
+++ C:/Java/castor-4/src/doc/release-notes.xml	(working copy)
@@ -35,6 +35,26 @@
             <summary>
             </summary>
             <bugs>
+                <bug id="2000" tool="jira">
+                    <description>
+                        Created basic modul structur for JDO modul including eclipse configuration.
+                    </description>
+                    <contributor>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon.eu</email>
+                    </contributor>
+                    <submitter>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon.eu</email>
+                    </submitter>
+                    <reporter>
+                        <name>Ralf Joachim</name>
+                        <email>ralf.joachim@syscon.eu</email>
+                    </reporter>
+                    <type>Enh.</type>
+                    <module>JDO</module>
+                    <date>20070607</date>
+                </bug>
                 <bug id="1774" tool="jira">
                     <description>
                         Replaced PrintStream and StringBuffer by a Writer implementation.
Index: C:/Java/castor-4/src/etc/CHANGELOG
===================================================================
--- C:/Java/castor-4/src/etc/CHANGELOG	(revision 7008)
+++ C:/Java/castor-4/src/etc/CHANGELOG	(working copy)
@@ -1,6 +1,11 @@
 SVN
 ---
 
+JDO:   Resolved issue CASTOR-2000 using contribution from Ralf Joachim [ralf.joachim@syscon.eu]
+       Created basic modul structur for JDO modul including eclipse configuration.
+       Details: http://jira.codehaus.org/browse/CASTOR-2000
+       (Ralf - 20070607)
+
 JDO:   Resolved issue CASTOR-1774 using contribution from Le Duc Bao [leducbao@gmail.com]
        Replaced PrintStream and StringBuffer by a Writer implementation.
        Details: http://jira.codehaus.org/browse/CASTOR-1774