db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r420179 - in /db/jdo/trunk: ./ core20/ enhancer20/ enhancer20/test/ fostore20/ fostore20/test/ fostore20/test/conf/ fostore20/test/fsuid2/ model20/ model20/src/ model20/src/conf/ model20/src/java/org/apache/jdo/util/ query20/ runtime20/ tck...
Date Sat, 08 Jul 2006 18:52:43 GMT
Author: mbo
Date: Sat Jul  8 11:52:41 2006
New Revision: 420179

URL: http://svn.apache.org/viewvc?rev=420179&view=rev
Log:
JDO-388: Split core20 into two separate subprojects util20 and model20

Added:
    db/jdo/trunk/model20/
      - copied from r418591, db/jdo/trunk/core20/
    db/jdo/trunk/model20/maven.xml
      - copied, changed from r420176, db/jdo/trunk/core20/maven.xml
    db/jdo/trunk/model20/project.properties
      - copied, changed from r420176, db/jdo/trunk/core20/project.properties
    db/jdo/trunk/model20/project.xml
      - copied, changed from r420176, db/jdo/trunk/core20/project.xml
    db/jdo/trunk/model20/src/
      - copied from r420176, db/jdo/trunk/core20/src/
    db/jdo/trunk/util20/
    db/jdo/trunk/util20/maven.xml
    db/jdo/trunk/util20/project.properties
    db/jdo/trunk/util20/project.xml
    db/jdo/trunk/util20/src/
    db/jdo/trunk/util20/src/conf/
    db/jdo/trunk/util20/src/conf/commons-logging.properties
    db/jdo/trunk/util20/src/conf/logging.properties
    db/jdo/trunk/util20/src/conf/simplelog.properties
    db/jdo/trunk/util20/src/java/
    db/jdo/trunk/util20/src/java/org/
    db/jdo/trunk/util20/src/java/org/apache/
    db/jdo/trunk/util20/src/java/org/apache/jdo/
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/
      - copied from r418591, db/jdo/trunk/core20/src/java/org/apache/jdo/util/
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/Bundle.properties
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/Bundle.properties
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/I18NHelper.java
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/I18NHelper.java
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/JDOJdk14Logger.java
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/JDOJdk14Logger.java
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/JDORIVersion.java
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/JDORIVersion.java
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/Pool.java
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/Pool.java
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/StringHelper.java
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/StringHelper.java
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/WeakHashSet.java
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/WeakHashSet.java
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/WeakValueHashMap.java
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/WeakValueHashMap.java
    db/jdo/trunk/util20/src/java/org/apache/jdo/util/package.html
      - copied unchanged from r420176, db/jdo/trunk/core20/src/java/org/apache/jdo/util/package.html
Removed:
    db/jdo/trunk/core20/
    db/jdo/trunk/model20/src/java/org/apache/jdo/util/
Modified:
    db/jdo/trunk/enhancer20/maven.xml
    db/jdo/trunk/enhancer20/project.properties
    db/jdo/trunk/enhancer20/project.xml
    db/jdo/trunk/enhancer20/test/common.xml
    db/jdo/trunk/fostore20/maven.xml
    db/jdo/trunk/fostore20/project.properties
    db/jdo/trunk/fostore20/project.xml
    db/jdo/trunk/fostore20/test/conf/JDO20Policy
    db/jdo/trunk/fostore20/test/fsuid2/build.xml
    db/jdo/trunk/fostore20/test/fsuid2/dist.xml
    db/jdo/trunk/fostore20/test/runtest.xml
    db/jdo/trunk/maven.xml
    db/jdo/trunk/model20/src/conf/commons-logging.properties
    db/jdo/trunk/model20/src/conf/logging.properties
    db/jdo/trunk/model20/src/conf/simplelog.properties
    db/jdo/trunk/project.properties
    db/jdo/trunk/project.xml
    db/jdo/trunk/query20/maven.xml
    db/jdo/trunk/query20/project.properties
    db/jdo/trunk/query20/project.xml
    db/jdo/trunk/runtime20/maven.xml
    db/jdo/trunk/runtime20/project.properties
    db/jdo/trunk/runtime20/project.xml
    db/jdo/trunk/tck20/project.properties
    db/jdo/trunk/tck20/project.xml

Modified: db/jdo/trunk/enhancer20/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/maven.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/maven.xml (original)
+++ db/jdo/trunk/enhancer20/maven.xml Sat Jul  8 11:52:41 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -63,8 +63,9 @@
     
     <goal name="Generator">
       <ant dir="${basedir}/test/sempdept" antfile="build.xml" target="all_gen" inheritAll="false">
-        <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
-        <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
+        <property name="jdoapi" value="${jdo.api.jarfile}"/>
+        <property name="jdoutil" value="${jdo.jdoutil.jarfile}"/>
+        <property name="jdomodel" value="${jdo.jdomodel.jarfile}"/>
         <property name="jdoenhancer" value="${maven.build.dir}/classes"/>
         <property name="logging" value="${logging.jarfile}"/>
         <property name="xmlparser" value="${xmlparser}"/>
@@ -77,16 +78,18 @@
     
     <goal name="Enhancer">
       <ant dir="${basedir}/test/sempdept" antfile="build.xml" target="compile" inheritAll="false">
-        <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
-        <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
+        <property name="jdoapi" value="${jdo.api.jarfile}"/>
+        <property name="jdoutil" value="${jdo.jdoutil.jarfile}"/>
+        <property name="jdomodel" value="${jdo.jdomodel.jarfile}"/>
         <property name="jdoenhancer" value="${maven.build.dir}/classes"/>
         <property name="logging" value="${logging.jarfile}"/>
         <property name="xmlparser" value="${xmlparser}"/>
         <property name="verbose" value="${verbose}"/>
       </ant>
       <ant dir="${basedir}/test/sempdept" antfile="build.xml" target="all_enh" inheritAll="false">
-        <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
-        <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
+        <property name="jdoapi" value="${jdo.api.jarfile}"/>
+        <property name="jdoutil" value="${jdo.jdoutil.jarfile}"/>
+        <property name="jdomodel" value="${jdo.jdomodel.jarfile}"/>
         <property name="jdoenhancer" value="${maven.build.dir}/classes"/>
         <property name="logging" value="${logging.jarfile}"/>
         <property name="xmlparser" value="${xmlparser}"/>

Modified: db/jdo/trunk/enhancer20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/project.properties?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/project.properties (original)
+++ db/jdo/trunk/enhancer20/project.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 The Apache Software Foundation.
+# Copyright 2006 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.
@@ -18,7 +18,8 @@
 
 # dependencies
 jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
-jdo.jdocore.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
+jdo.jdoutil.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-util')}
+jdo.jdomodel.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-model')}
 logging.jarfile = ${pom.getDependencyPath('commons-logging')}
 xmlparser = 
 
@@ -26,14 +27,14 @@
 jdo.enhancer.enhanced.dir = ${maven.build.dir}/test-classes
 jdo.enhancer.main = org.apache.jdo.enhancer.Main
 jdo.enhancer.options = -f -d "${jdo.enhancer.enhanced.dir}" -s "${jdo.enhancer.sourcepath}"
-jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoapi.jarfile}
-jdo.enhancer.classpath = ${maven.build.dir}/classes${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.api.jarfile}
+jdo.enhancer.classpath = ${maven.build.dir}/classes${path.separator}${jdo.jdoutil.jarfile}${path.separator}${jdo.jdomodel.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
 jdo.annotationtest.main = org.apache.jdo.impl.enhancer.util.AnnotationTest
 jdo.annotationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
 jdo.augmentationtest.main = org.apache.jdo.impl.enhancer.util.AugmentationTest
 jdo.augmentationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
 jdo.xmlexists.main = org.apache.jdo.impl.model.jdo.xml.XMLExists
-jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
+jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${path.separator}${jdo.jdoutil.jarfile}${path.separator}${jdo.jdomodel.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
 
 # Manifest seed file
 maven.jar.manifest = ${basedir}/../JDO20.MF

Modified: db/jdo/trunk/enhancer20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/project.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/project.xml (original)
+++ db/jdo/trunk/enhancer20/project.xml Sat Jul  8 11:52:41 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -42,7 +42,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
-            <artifactId>jdo2-core</artifactId>
+            <artifactId>jdo2-util</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-model</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>

Modified: db/jdo/trunk/enhancer20/test/common.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/enhancer20/test/common.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/enhancer20/test/common.xml (original)
+++ db/jdo/trunk/enhancer20/test/common.xml Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 <!--
-   Copyright 2005 The Apache Software Foundation
+   Copyright 2006 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.
@@ -15,10 +15,11 @@
 -->
 
   <!-- libs -->
-  <property name="jdoapi" value="${user.home}/.maven/repository/apache-jdo/jars/jdo1-api-SNAPSHOT.jar"/>
-  <property name="jdocore" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-core-20-SNAPSHOT.jar"/>
-  <property name="jdoenhancer" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-enhancer-20-SNAPSHOT.jar"/>
-  <property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.0.4.jar"/>
+  <property name="jdoapi" value="${user.home}/.maven/repository/javax.jdo/jars/jdo2-api-SNAPSHOT.jar"/>
+  <property name="jdoutil" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-util-SNAPSHOT.jar"/>
+  <property name="jdomodel" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-model-SNAPSHOT.jar"/>
+  <property name="jdoenhancer" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-enhancer-SNAPSHOT.jar"/>
+  <property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.1.jar"/>
   <property name="xmlparser"  value=""/>
 
   <!-- subdirectories -->
@@ -33,7 +34,8 @@
   <!-- classpath -->
   <path id="tools.class.path">
     <pathelement location="${jdoapi}"/>
-    <pathelement location="${jdocore}"/>
+    <pathelement location="${jdoutil}"/>
+    <pathelement location="${jdomodel}"/>
     <pathelement location="${jdoenhancer}"/>
     <pathelement location="${logging}"/>
     <pathelement location="${xmlparser}"/>

Modified: db/jdo/trunk/fostore20/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/maven.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/maven.xml (original)
+++ db/jdo/trunk/fostore20/maven.xml Sat Jul  8 11:52:41 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -78,7 +78,8 @@
             <property name="testlist" value="${jdo.testlist}"/>
             <property name="jdoapi" value="${jdo.api.jarfile}"/>
             <property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
-            <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
+            <property name="jdoutil" value="${jdo.jdoutil.jarfile}"/>
+            <property name="jdomodel" value="${jdo.jdomodel.jarfile}"/>
             <property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
             <property name="jdoquery" value="${jdo.jdoquery.jarfile}"/>
             <property name="jdofostore" value="${maven.build.dir}/classes"/>
@@ -103,7 +104,8 @@
             <property name="testlist" value="${jdo.testlist}"/>
             <property name="jdoapi" value="${jdo.api.jarfile}"/>
             <property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
-            <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
+            <property name="jdoutil" value="${jdo.jdoutil.jarfile}"/>
+            <property name="jdomodel" value="${jdo.jdomodel.jarfile}"/>
             <property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
             <property name="jdoquery" value="${jdo.jdoquery.jarfile}"/>
             <property name="jdofostore" value="${maven.build.dir}/classes"/>
@@ -130,7 +132,8 @@
              dir="${basedir}/test" antfile="runtest.xml">
             <property name="jdoapi" value="${jdo.api.jarfile}"/>
             <property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
-            <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
+            <property name="jdoutil" value="${jdo.jdoutil.jarfile}"/>
+            <property name="jdomodel" value="${jdo.jdomodel.jarfile}"/>
             <property name="jdoruntime" value="${jdo.jdoruntime.jarfile}"/>
             <property name="jdoquery" value="${jdo.jdoquery.jarfile}"/>
             <property name="jdofostore" value="${maven.build.dir}/classes"/>
@@ -321,7 +324,8 @@
     <goal name="fsuid2.build">
         <ant dir="${basedir}/test/fsuid2" target="build">
             <property name="jdoapi" value="${jdo.api.jarfile}"/>
-            <property name="jdocore" value="${jdo.jdocore.jarfile}"/>
+            <property name="jdoutil" value="${jdo.jdoutil.jarfile}"/>
+            <property name="jdomodel" value="${jdo.jdomodel.jarfile}"/>
             <property name="jdoenhancer" value="${jdo.jdoenhancer.jarfile}"/>
             <property name="logging" value="${logging.jarfile}"/>
             <property name="xerces" value="${xerces.jarfile}"/>

Modified: db/jdo/trunk/fostore20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/project.properties?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/project.properties (original)
+++ db/jdo/trunk/fostore20/project.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 The Apache Software Foundation.
+# Copyright 2006 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.
@@ -26,7 +26,8 @@
 # dependencies
 jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
 jdo.jdobtree.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo-btree')}
-jdo.jdocore.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
+jdo.jdoutil.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-util')}
+jdo.jdomodel.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-model')}
 jdo.jdoenhancer.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
 jdo.jdoruntime.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-runtime')}
 jdo.jdoquery.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-query')}
@@ -52,13 +53,13 @@
 jdo.enhancer.main = org.apache.jdo.enhancer.Main
 jdo.enhancer.options = -f -d "${jdo.enhancer.enhanced.dir}" -s "${jdo.enhancer.sourcepath}"
 jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.api.jarfile}
-jdo.enhancer.classpath = ${jdo.jdoenhancer.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
+jdo.enhancer.classpath = ${jdo.jdoenhancer.jarfile}${path.separator}${jdo.jdoutil.jarfile}${path.separator}${jdo.jdomodel.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
 jdo.annotationtest.main = org.apache.jdo.impl.enhancer.util.AnnotationTest
 jdo.annotationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
 jdo.augmentationtest.main = org.apache.jdo.impl.enhancer.util.AugmentationTest
 jdo.augmentationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
 jdo.xmlexists.main = org.apache.jdo.impl.model.jdo.xml.XMLExists
-jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoruntime.jarfile}${path.separator}${jdo.jdocore.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
+jdo.xmlexists.classpath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoruntime.jarfile}${path.separator}${jdo.jdoutil.jarfile}${path.separator}${jdo.jdomodel.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
 
 jdo.pcclasses.pc.classes= \
   org.apache.jdo.pc.PCArrays \

Modified: db/jdo/trunk/fostore20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/project.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/project.xml (original)
+++ db/jdo/trunk/fostore20/project.xml Sat Jul  8 11:52:41 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -26,7 +26,7 @@
     <artifactId>jdo2-fostore</artifactId>
     <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo</package>
-    <shortDescription>Java Data Objects 2.0 (JDO) Core</shortDescription>
+    <shortDescription>Java Data Objects 2.0 (JDO) FOStore</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request JSR 243 under the auspices of the Java Community Process.</description>
@@ -46,7 +46,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
-            <artifactId>jdo2-core</artifactId>
+            <artifactId>jdo2-util</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-model</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>

Modified: db/jdo/trunk/fostore20/test/conf/JDO20Policy
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/conf/JDO20Policy?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/test/conf/JDO20Policy (original)
+++ db/jdo/trunk/fostore20/test/conf/JDO20Policy Sat Jul  8 11:52:41 2006
@@ -1,7 +1,8 @@
 // This is the policy file for JDO 2.0 assuming that 
 // - the JDO API classes are in jar ${jdoapi}, 
 // - the btree implementation is in ${jdobtree},
-// - the JDO core classes are in ${jdocode},
+// - the JDO util classes are in ${jdoutil},
+// - the JDO model classes are in ${jdomodel},
 // - the JDO runtime classes are in ${jdoruntime},
 // - the JDO query classes are in ${jdoquery},
 // - the JDO fostore classes are in ${jdofostore},
@@ -24,7 +25,14 @@
 	permission java.io.FilePermission "${testdir}${/}*", "read,write,delete";
        };
 
-grant codeBase "file:${jdocore}" { 
+grant codeBase "file:${jdoutil}" { 
+	// Allow the jdori classes to configure the JDK 1.4 logging
+	permission java.util.logging.LoggingPermission "control";
+	// Allow the jdori classes to read the JDK 1.4 logging properties file
+	permission java.io.FilePermission "${jdoritests}", "read";
+       };
+
+grant codeBase "file:${jdomodel}" { 
 	// Allow jdori classes to read the jdo.dtd from jdo.jar.
 	permission java.io.FilePermission "${jdoapi}", "read";
 	// Allow jdori classes to read the JDO metadata files.

Modified: db/jdo/trunk/fostore20/test/fsuid2/build.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/fsuid2/build.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/test/fsuid2/build.xml (original)
+++ db/jdo/trunk/fostore20/test/fsuid2/build.xml Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -16,11 +16,12 @@
 
 <project name="fsuid2" default="build" basedir=".">
 
-<property name="jdoapi" value="${user.home}/.maven/repository/apache-jdo/jars/jdo1-api-SNAPSHOT.jar"/>
-<property name="jdocore" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-core-20-SNAPSHOT.jar"/>
-<property name="jdoenhancer" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-enhancer-20-SNAPSHOT.jar"/>
+<property name="jdoapi" value="${user.home}/.maven/repository/javax.jdo/jars/jdo1-ap2-SNAPSHOT.jar"/>
+<property name="jdoutil" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-util-SNAPSHOT.jar"/>
+<property name="jdomodel" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-model-SNAPSHOT.jar"/>
+<property name="jdoenhancer" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-enhancer-SNAPSHOT.jar"/>
 
-<property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.0.4.jar"/>
+<property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.1.jar"/>
 <property name="xmlparser" value=""/>
 <property name="fsuid2.jarfile" value="../fsuid2.jar"/>
 
@@ -41,7 +42,7 @@
     <mkdir dir="${enhanceDir}"/>
     <java fork="yes" failonerror="yes" 
           classname="${enhancer}" 
-          classpath="${maven.build.dest};${jdoapi};${jdocore};${jdoenhancer};${xmlparser};${logging}">
+          classpath="${maven.build.dest};${jdoapi};${jdoutil};${jdomodel};${jdoenhancer};${xmlparser};${logging}">
         <arg line="-f -d ${enhanceDir} -s . org/apache/jdo/pc/PCPoint.class"/>
     </java>
 
@@ -53,15 +54,15 @@
 
     <java fork="yes" failonerror="yes" 
           classname="org.apache.jdo.impl.enhancer.util.AugmentationTest"
-          classpath=".;${maven.build.dest};${jdoapi};${jdocore};${jdoenhancer}">
+          classpath=".;${maven.build.dest};${jdoapi};${jdoutil};${jdomodel};${jdoenhancer}">
         <arg line="-s"/>
-        <arg path=".;${jdoapi};${jdocore};${jdoenhancer}"/>
+        <arg path=".;${jdoapi};${jdoutil};${jdomodel};${jdoenhancer}"/>
         <arg line="--properties org/apache/jdo/pc/fsuid2.jdoproperties org.apache.jdo.pc.PCPoint"/>
     </java>
 
     <java fork="yes" failonerror="yes"
           classname="org.apache.jdo.impl.enhancer.util.AnnotationTest"
-          classpath="${maven.build.dest};${jdocore};${jdoenhancer}">
+          classpath="${maven.build.dest};${jdoutil};${jdomodel};${jdoenhancer}">
         <arg line="--properties org/apache/jdo/pc/fsuid2.jdoproperties org/apache/jdo/pc/PCPoint.class"/>
     </java>
 

Modified: db/jdo/trunk/fostore20/test/fsuid2/dist.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/fsuid2/dist.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/test/fsuid2/dist.xml (original)
+++ db/jdo/trunk/fostore20/test/fsuid2/dist.xml Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -16,9 +16,10 @@
 
 <project name="fsuid2" default="build" basedir=".">
 
-<property name="jdoapi" value="${user.home}/.maven/repository/apache-jdo/jars/jdo1-api-SNAPSHOT.jar"/>
-<property name="jdocore" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-core-20-SNAPSHOT.jar"/>
-<property name="jdoenhancer" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-enhancer-20-SNAPSHOT.jar"/>
+<property name="jdoapi" value="${user.home}/.maven/repository/javax.jdo/jars/jdo2-api-SNAPSHOT.jar"/>
+<property name="jdoutil" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-util-SNAPSHOT.jar"/>
+<property name="jdomodel" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-model-SNAPSHOT.jar"/>
+<property name="jdoenhancer" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-enhancer-SNAPSHOT.jar"/>
 
 <property name="xmlparser" value=""/>
 <property name="fsuid2.jarfile" value="../fsuid2.jar"/>

Modified: db/jdo/trunk/fostore20/test/runtest.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/fostore20/test/runtest.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/fostore20/test/runtest.xml (original)
+++ db/jdo/trunk/fostore20/test/runtest.xml Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -40,13 +40,14 @@
 -->
 
 <!-- JAR files required to run the tests -->
-<property name="jdoapi" value="${user.home}/.maven/repository/apache-jdo/jars/jdo1-api-SNAPSHOT.jar"/>
-<property name="jdobtree" value="${user.home}/.maven/repository/apache-jdo/jars/jdo-btree-SNAPSHOT.jar"/>
-<property name="jdocore" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-core-20-SNAPSHOT.jar"/>
-<property name="jdoruntime" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-runtime-20-SNAPSHOT.jar"/>
-<property name="jdoquery" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-query-20-SNAPSHOT.jar"/>
+<property name="jdoapi" value="${user.home}/.maven/repository/javax.jdo/jars/jdo2-api-SNAPSHOT.jar"/>
+<property name="jdobtree" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo-btree-SNAPSHOT.jar"/>
+<property name="jdoutil" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-util-SNAPSHOT.jar"/>
+<property name="jdomodel" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-model-SNAPSHOT.jar"/>
+<property name="jdoruntime" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-runtime-SNAPSHOT.jar"/>
+<property name="jdoquery" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-query-SNAPSHOT.jar"/>
 <property name="jdofostore" value="${maven.build.dir}/classes"/>
-<property name="jdoenhancer" value="${user.home}/.maven/repository/apache-jdo/jars/jdo2-enhancer-20-SNAPSHOT.jar"/>
+<property name="jdoenhancer" value="${user.home}/.maven/repository/org.apache.jdo/jars/jdo2-enhancer-SNAPSHOT.jar"/>
 
 <property name="builddir" value="${basedir}/../target"/>
 <property name="jdoritests" value="${builddir}/test-classes/jdo-ri-tests.jar"/>
@@ -58,7 +59,7 @@
 <property name="junit" value="${user.home}/.maven/repository/junit/jars/junit-3.8.1.jar"/>
 <property name="jta" value="${user.home}/.maven/repository/geronimo-spec/jars/geronimo-spec-jta-1.0.1B-rc2.jar"/>
 <property name="antlr" value="${user.home}/.maven/repository/antlr/jars/antlr-2.7.3.jar"/>
-<property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.0.4.jar"/>
+<property name="logging" value="${user.home}/.maven/repository/commons-logging/jars/commons-logging-1.1.jar"/>
 <property name="xmlparser" value=""/>
 <!-- jndi implementation jars, needs to be consistent with jndi.properties -->
 <property name="jndi" value="${basedir}/fscontext.jar:${basedir}/providerutil.jar"/>
@@ -66,7 +67,7 @@
 <!-- other properties -->
 <property name="testlist" value="${basedir}/conf/tests.list"/>
 <property name="ResultPrinterClass" value="org.apache.jdo.test.util.BatchResultPrinter"/>
-<property name="policyfile" value="${basedir}/conf/JDO11Policy"/>
+<property name="policyfile" value="${basedir}/conf/JDO20Policy"/>
 <property name="gui" value="false"/>
 <property name="cfdbname" value="CFDB"/>
 
@@ -82,7 +83,7 @@
 <property name="extjars" 
           value="${antlr}:${junit}:${jta}:${logging}:${xmlparser}"/>
 <property name="classpath" 
-          value="${jdoritests}:${pcclasses}:${jdoapi}:${jdocore}:${jdoruntime}:${jdoquery}:${jdofostore}:${jdobtree}:${extjars}"/>
+          value="${jdoritests}:${pcclasses}:${jdoapi}:${jdoutil}:${jdomodel}:${jdoruntime}:${jdoquery}:${jdofostore}:${jdobtree}:${extjars}"/>
 
                     <!-- TEST PROPERTIES -->
                     <!-- TEST PROPERTIES -->
@@ -154,7 +155,8 @@
     <sysproperty key="ResultPrinterClass" value="${ResultPrinterClass}"/>
     <sysproperty key="jdoapi" value="${jdoapi}"/>
     <sysproperty key="jdobtree" value="${jdobtree}"/>
-    <sysproperty key="jdocore" value="${jdocore}"/>
+    <sysproperty key="jdoutil" value="${jdoutil}"/>
+    <sysproperty key="jdomodel" value="${jdomodel}"/>
     <sysproperty key="jdoruntime" value="${jdoruntime}"/>
     <sysproperty key="jdoquery" value="${jdoquery}"/>
     <sysproperty key="jdofostore" value="${jdofostore}"/>
@@ -181,8 +183,8 @@
 <!-- Test FOStore's security policy implementation.  This tests that in 
      an environment with a security manager, basic operations can be performed
      including create and read of persistent instances.  The security policy
-     contains different permission grants for: jdo1-api-SNAPSHOT.jar, jdo2-core-20-SNAPSHOT.jar,
-     jdo2-runtime-20-SNAPSHOT.jar, jdo2-runtime-20-SNAPSHOT.jar, jdo2-query-20-SNAPSHOT, and the
+     contains different permission grants for: jdo1-api-SNAPSHOT.jar, jdo2-util-SNAPSHOT.jar, 
+     jdo2-model-SNAPSHOT.jar, jdo2-runtime-SNAPSHOT.jar, jdo2-query-SNAPSHOT, and the
      test program itself. The query needs RuntimePermission 
      "accessDeclaredMembers" to get metadata about non managed fields
      and ReflectPermission "suppressAccessChecks" to access values of 
@@ -209,7 +211,8 @@
     <sysproperty key="ResultPrinterClass" value="${ResultPrinterClass}"/>
     <sysproperty key="jdoapi" value="${jdoapi}"/>
     <sysproperty key="jdobtree" value="${jdobtree}"/>
-    <sysproperty key="jdocore" value="${jdocore}"/>
+    <sysproperty key="jdoutil" value="${jdoutil}"/>
+    <sysproperty key="jdomodel" value="${jdomodel}"/>
     <sysproperty key="jdoruntime" value="${jdoruntime}"/>
     <sysproperty key="jdoquery" value="${jdoquery}"/>
     <sysproperty key="jdofostore" value="${jdofostore}"/>

Modified: db/jdo/trunk/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/maven.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/maven.xml (original)
+++ db/jdo/trunk/maven.xml Sat Jul  8 11:52:41 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.

Copied: db/jdo/trunk/model20/maven.xml (from r420176, db/jdo/trunk/core20/maven.xml)
URL: http://svn.apache.org/viewvc/db/jdo/trunk/model20/maven.xml?p2=db/jdo/trunk/model20/maven.xml&p1=db/jdo/trunk/core20/maven.xml&r1=420176&r2=420179&rev=420179&view=diff
==============================================================================
--- db/jdo/trunk/core20/maven.xml (original)
+++ db/jdo/trunk/model20/maven.xml Sat Jul  8 11:52:41 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.

Copied: db/jdo/trunk/model20/project.properties (from r420176, db/jdo/trunk/core20/project.properties)
URL: http://svn.apache.org/viewvc/db/jdo/trunk/model20/project.properties?p2=db/jdo/trunk/model20/project.properties&p1=db/jdo/trunk/core20/project.properties&r1=420176&r2=420179&rev=420179&view=diff
==============================================================================
--- db/jdo/trunk/core20/project.properties (original)
+++ db/jdo/trunk/model20/project.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 The Apache Software Foundation.
+# Copyright 2006 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.

Copied: db/jdo/trunk/model20/project.xml (from r420176, db/jdo/trunk/core20/project.xml)
URL: http://svn.apache.org/viewvc/db/jdo/trunk/model20/project.xml?p2=db/jdo/trunk/model20/project.xml&p1=db/jdo/trunk/core20/project.xml&r1=420176&r2=420179&rev=420179&view=diff
==============================================================================
--- db/jdo/trunk/core20/project.xml (original)
+++ db/jdo/trunk/model20/project.xml Sat Jul  8 11:52:41 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -22,12 +22,12 @@
     <!-- ============== -->
     <!-- Identification -->
     <!-- ============== -->
-    <name>JDO2 Implementation (Core)</name>
+    <name>JDO2 Implementation (Model)</name>
     <groupId>org.apache.jdo</groupId>
-    <artifactId>jdo2-core</artifactId>
+    <artifactId>jdo2-model</artifactId>
     <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo</package>
-    <shortDescription>Java Data Objects 2.0 (JDO) Core</shortDescription>
+    <shortDescription>Java Data Objects 2.0 (JDO) Model</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request JSR 243 under the auspices of the Java Community Process.</description>
@@ -35,6 +35,11 @@
     <!-- Dependencies -->
     <!-- ============ -->
     <dependencies>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-util</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
         <dependency>
             <id>commons-logging</id>
             <version>1.0.4</version>

Modified: db/jdo/trunk/model20/src/conf/commons-logging.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/model20/src/conf/commons-logging.properties?rev=420179&r1=420176&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/model20/src/conf/commons-logging.properties (original)
+++ db/jdo/trunk/model20/src/conf/commons-logging.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 The Apache Software Foundation.
+# Copyright 2006 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.
@@ -15,7 +15,7 @@
 
 #
 # This is a sample apache commons logging configuration file defining logging
-# properties for the JDO2 Implementation (Enhancer) sources. It defines what
+# properties for the JDO2 Implementation (Model) sources. It defines what
 # logging implementation the apache commons logging API should use by specifying
 # the property org.apache.commons.logging.Log (see below). Please note, that
 # there are separate property files for each logging implementation to set the
@@ -23,8 +23,7 @@
 # - SimpleLog:      simplelog.properties 
 # - JDK1.4 logging: logging.properties
 #
-# The JDO2 Implementation (Core) sources use the following logger instances:
-# org.apache.jdo.util                 Utility classes
+# The JDO2 Implementation (Model) sources use the following logger instances:
 # org.apache.jdo.impl.model.jdo       JDOModel implementation
 # org.apache.jdo.impl.model.jdo.xml   XML parser for JDO metadata files
 #

Modified: db/jdo/trunk/model20/src/conf/logging.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/model20/src/conf/logging.properties?rev=420179&r1=420176&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/model20/src/conf/logging.properties (original)
+++ db/jdo/trunk/model20/src/conf/logging.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 The Apache Software Foundation.
+# Copyright 2006 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.
@@ -15,7 +15,7 @@
 
 #
 # This is a sample properties file to configure standard JDK 1.4 logging for 
-# the for the JDO2 Implementation (Core) sources.
+# the for the JDO2 Implementation (Model) sources.
 # Below you find an entry for each of the source logger instances. 
 # Please uncomment the line and adapt the log level to your needs, 
 # in case to want to enable a particular logger.
@@ -31,15 +31,13 @@
 #
 
 ######################
-# Core source logger
+# Model source logger
 ######################
 
 # JDOModel logger
 #org.apache.jdo.impl.model.jdo.level = FINE
 # XML parser logger
 #org.apache.jdo.impl.model.jdo.xml.level = FINE
-# Utility class logger
-#org.apache.jdo.util.level = FINE
 
 ######################
 # JDK 1.4 logging properties

Modified: db/jdo/trunk/model20/src/conf/simplelog.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/model20/src/conf/simplelog.properties?rev=420179&r1=420176&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/model20/src/conf/simplelog.properties (original)
+++ db/jdo/trunk/model20/src/conf/simplelog.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 The Apache Software Foundation.
+# Copyright 2006 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.
@@ -15,22 +15,20 @@
 
 #
 # This is a sample properties file to configure apache commons logging SimpleLog
-# implementation for the JDO2 Implementation (Core) sources. 
+# implementation for the JDO2 Implementation (Model) sources. 
 # Below you find an entry for each of the source logger instances. 
 # Please uncomment the line and adapt the log level to your needs, 
 # in case to want to enable a particular logger.
 #
 
 ######################
-# Core source logger
+# Model source logger
 ######################
 
 # JDOModel logger
 #org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.model.jdo = debug
 # XML parser logger
 #org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.model.jdo.xml = debug
-# Utility class logger
-#org.apache.commons.logging.simplelog.log.org.apache.jdo.util = debug
 
 ######################
 # Default logging level

Modified: db/jdo/trunk/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/project.properties?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/project.properties (original)
+++ db/jdo/trunk/project.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-#   Copyright 2005 The Apache Software Foundation
+#   Copyright 2006 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.
@@ -34,11 +34,11 @@
 # project lists
 #   please note, the project lists must no include blanks
 jdo11.projects=api11/project.xml,btree/project.xml,ri11/project.xml,tck11/project.xml
-jdo20.projects=api20/project.xml,core20/project.xml,enhancer20/project.xml,\
+jdo20.projects=api20/project.xml,util20/project.xml,model20/project.xml,enhancer20/project.xml,\
 runtime20/project.xml,query20/project.xml,btree/project.xml,fostore20/project.xml,\
 tck20/project.xml
-tck20.projects=api20/project.xml,core20/project.xml,enhancer20/project.xml,tck20/project.xml
-fostore20.projects=api20/project.xml,core20/project.xml,runtime20/project.xml,query20/project.xml,btree/project.xml,fostore20/project.xml,enhancer20/project.xml
+tck20.projects=api20/project.xml,util20/project.xml,model20/project.xml,enhancer20/project.xml,tck20/project.xml
+fostore20.projects=api20/project.xml,util20/project.xml,model20/project.xml,runtime20/project.xml,query20/project.xml,btree/project.xml,fostore20/project.xml,enhancer20/project.xml
 
 # release properties
 jdo.releases.dir = ${basedir.substring(0, basedir.lastIndexOf('jdo'))}jdo/releases

Modified: db/jdo/trunk/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/project.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/project.xml (original)
+++ db/jdo/trunk/project.xml Sat Jul  8 11:52:41 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.

Modified: db/jdo/trunk/query20/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/query20/maven.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/query20/maven.xml (original)
+++ db/jdo/trunk/query20/maven.xml Sat Jul  8 11:52:41 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.

Modified: db/jdo/trunk/query20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/query20/project.properties?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/query20/project.properties (original)
+++ db/jdo/trunk/query20/project.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 The Apache Software Foundation.
+# Copyright 2006 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.

Modified: db/jdo/trunk/query20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/query20/project.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/query20/project.xml (original)
+++ db/jdo/trunk/query20/project.xml Sat Jul  8 11:52:41 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -27,7 +27,7 @@
     <artifactId>jdo2-query</artifactId>
     <currentVersion>SNAPSHOT</currentVersion>
     <package>org.apache.jdo</package>
-    <shortDescription>Java Data Objects 2.0 (JDO) Core</shortDescription>
+    <shortDescription>Java Data Objects 2.0 (JDO) Query</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request JSR 243 under the auspices of the Java Community Process.</description>
@@ -42,7 +42,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
-            <artifactId>jdo2-core</artifactId>
+            <artifactId>jdo2-util</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-model</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>

Modified: db/jdo/trunk/runtime20/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/runtime20/maven.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/runtime20/maven.xml (original)
+++ db/jdo/trunk/runtime20/maven.xml Sat Jul  8 11:52:41 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.

Modified: db/jdo/trunk/runtime20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/runtime20/project.properties?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/runtime20/project.properties (original)
+++ db/jdo/trunk/runtime20/project.properties Sat Jul  8 11:52:41 2006
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 The Apache Software Foundation.
+# Copyright 2006 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.

Modified: db/jdo/trunk/runtime20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/runtime20/project.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/runtime20/project.xml (original)
+++ db/jdo/trunk/runtime20/project.xml Sat Jul  8 11:52:41 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2005 The Apache Software Foundation
+    Copyright 2006 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.
@@ -42,7 +42,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
-            <artifactId>jdo2-core</artifactId>
+            <artifactId>jdo2-util</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-model</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>

Modified: db/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.properties?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.properties (original)
+++ db/jdo/trunk/tck20/project.properties Sat Jul  8 11:52:41 2006
@@ -63,7 +63,8 @@
 log4j.jarfile = ${pom.getDependencyPath('log4j')}
 derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
 derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
-core20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-core')}
+util20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-util')}
+model20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-model')}
 enhancer20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
 xmlparser =
 

Modified: db/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.xml?rev=420179&r1=420178&r2=420179&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.xml (original)
+++ db/jdo/trunk/tck20/project.xml Sat Jul  8 11:52:41 2006
@@ -47,7 +47,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
-            <artifactId>jdo2-core</artifactId>
+            <artifactId>jdo2-util</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jdo</groupId>
+            <artifactId>jdo2-model</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
         <dependency>

Added: db/jdo/trunk/util20/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/util20/maven.xml?rev=420179&view=auto
==============================================================================
--- db/jdo/trunk/util20/maven.xml (added)
+++ db/jdo/trunk/util20/maven.xml Sat Jul  8 11:52:41 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 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.
+-->
+
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven"
+    >
+
+    <!-- ==================== -->
+    <!-- Default Global Goals -->
+    <!-- ==================== -->
+
+    <goal name="default">
+        <attainGoal name="jar:install"/>
+    </goal>
+
+    <goal name="build">
+        <attainGoal name="default"/>
+    </goal>
+
+    <goal name="rebuild">
+        <attainGoal name="clean"/>
+        <attainGoal name="build"/>
+    </goal>
+
+    <goal name="clobber" prereqs="clean">
+        <delete>
+            <fileset dir="." defaultexcludes="no" includes="**/*~"/>
+        </delete>
+    </goal>
+
+</project>

Added: db/jdo/trunk/util20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/util20/project.properties?rev=420179&view=auto
==============================================================================
--- db/jdo/trunk/util20/project.properties (added)
+++ db/jdo/trunk/util20/project.properties Sat Jul  8 11:52:41 2006
@@ -0,0 +1,20 @@
+#
+# Copyright 2006 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.
+
+# checkstyle settings
+maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
+
+# Manifest seed file
+maven.jar.manifest = ${basedir}/../JDO20.MF

Added: db/jdo/trunk/util20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/util20/project.xml?rev=420179&view=auto
==============================================================================
--- db/jdo/trunk/util20/project.xml (added)
+++ db/jdo/trunk/util20/project.xml Sat Jul  8 11:52:41 2006
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2006 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.
+-->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../project.xml</extend>
+    <!-- ============== -->
+    <!-- Identification -->
+    <!-- ============== -->
+    <name>JDO2 Implementation (Util)</name>
+    <groupId>org.apache.jdo</groupId>
+    <artifactId>jdo2-util</artifactId>
+    <currentVersion>SNAPSHOT</currentVersion>
+    <package>org.apache.jdo</package>
+    <shortDescription>Java Data Objects 2.0 (JDO) Util</shortDescription>
+    <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based 
+Java model abstraction of persistence, developed as Java Specification 
+Request JSR 243 under the auspices of the Java Community Process.</description>
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0.4</version>
+        </dependency>
+    </dependencies>
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <!-- J A R  R E S O U R C E S -->
+        <!-- Resources that are packaged up inside the JAR file -->
+        <resources>
+            <resource>
+                <directory>${basedir}/..</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+</project>
+

Added: db/jdo/trunk/util20/src/conf/commons-logging.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/util20/src/conf/commons-logging.properties?rev=420179&view=auto
==============================================================================
--- db/jdo/trunk/util20/src/conf/commons-logging.properties (added)
+++ db/jdo/trunk/util20/src/conf/commons-logging.properties Sat Jul  8 11:52:41 2006
@@ -0,0 +1,36 @@
+#
+# Copyright 2006 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.
+
+#
+# This is a sample apache commons logging configuration file defining logging
+# properties for the JDO2 Implementation (Util) sources. It defines what
+# logging implementation the apache commons logging API should use by specifying
+# the property org.apache.commons.logging.Log (see below). Please note, that
+# there are separate property files for each logging implementation to set the
+# log level of the loggers:
+# - SimpleLog:      simplelog.properties 
+# - JDK1.4 logging: logging.properties
+#
+# The JDO2 Implementation (Util) sources use the following logger instances:
+# org.apache.jdo.util                 Utility classes
+# org.apache.jdo.util.web.JDOFilter   JDOFilter class
+#
+
+# Uncomment the next line if you want to use the apache simple logger
+#org.apache.commons.logging.Log = org.apache.commons.logging.impl.SimpleLog
+
+# Uncomment the next two lines if you want to use JDK 1.4 logging
+#org.apache.commons.logging.Log = org.apache.jdo.util.JDOJdk14Logger
+

Added: db/jdo/trunk/util20/src/conf/logging.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/util20/src/conf/logging.properties?rev=420179&view=auto
==============================================================================
--- db/jdo/trunk/util20/src/conf/logging.properties (added)
+++ db/jdo/trunk/util20/src/conf/logging.properties Sat Jul  8 11:52:41 2006
@@ -0,0 +1,47 @@
+#
+# Copyright 2006 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.
+
+#
+# This is a sample properties file to configure standard JDK 1.4 logging for 
+# the for the JDO2 Implementation (Util) sources.
+# Below you find an entry for each of the source logger instances. 
+# Please uncomment the line and adapt the log level to your needs, 
+# in case to want to enable a particular logger.
+#
+# The following describes the mapping between the log level of JDK 1.4 logging
+# and apache commns logging:
+#   JDK 1.4        Apache 
+#   FINEST         trace 
+#   FINE, FINER    debug 
+#   INFO, CONFIG   info
+#   WARNING        warn
+#   SEVERE         error, fatal
+#
+
+######################
+# Util source logger
+######################
+
+# Utility class logger
+#org.apache.jdo.util.level = FINE
+# JDOFilter class logger
+#org.apache.jdo.util.web.JDOFilter.level = FINE
+
+######################
+# JDK 1.4 logging properties
+######################
+
+handlers = java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level = FINEST

Added: db/jdo/trunk/util20/src/conf/simplelog.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/util20/src/conf/simplelog.properties?rev=420179&view=auto
==============================================================================
--- db/jdo/trunk/util20/src/conf/simplelog.properties (added)
+++ db/jdo/trunk/util20/src/conf/simplelog.properties Sat Jul  8 11:52:41 2006
@@ -0,0 +1,37 @@
+#
+# Copyright 2006 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.
+
+#
+# This is a sample properties file to configure apache commons logging SimpleLog
+# implementation for the JDO2 Implementation (Util) sources. 
+# Below you find an entry for each of the source logger instances. 
+# Please uncomment the line and adapt the log level to your needs, 
+# in case to want to enable a particular logger.
+#
+
+######################
+# Util source logger
+######################
+
+# Utility class logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.util = debug
+# JDOFilter class logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.util.web.JDOFilter = debug
+
+######################
+# Default logging level
+######################
+
+org.apache.commons.logging.simplelog.defaultlog = error



Mime
View raw message