svn commit: r168400 - in /incubator/jdo/trunk/ri11: src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/jdoql/ test/java/org/apache/jdo/test/query/

[mbo]

Author: mbo
Date: Thu May  5 13:38:26 2005
New Revision: 168400

URL: http://svn.apache.org/viewcvs?rev=168400view=rev
Log:
JDO-36 Implement JDOQLQueryFactory proposal. Code provided by Michael Watzek

Added:
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStorePM.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/JDOQLQueryFactoryImpl.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/jdoql/JDOQLQueryFactory.java
Modified:

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Bundle.properties

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStorePMF.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerFactoryImpl.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerImpl.java

incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/query/NegativeTest.java

incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/query/PositiveTest.java

Modified: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Bundle.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Bundle.properties?rev=168400r1=168399r2=168400view=diff
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Bundle.properties 
(original)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Bundle.properties 
Thu May  5 13:38:26 2005
@@ -221,6 +221,7 @@
 ERR_OIDNotProv=given OID is not provisional: {0}.
 #NOI18N
 ERR_DuplicateProvOID=duplicate provisional OID: {0}.
+EXC_CannotCreateJDOQLQueryFactory=Cannot create JDOQLQueryFactory of class 
''{0}''.
 
 #
 # FOStoreSchemaUID

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStorePM.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStorePM.java?rev=168400view=auto
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStorePM.java 
(added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStorePM.java 
Thu May  5 13:38:26 2005
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.impl.fostore;
+
+import java.util.Collection;
+
+import javax.jdo.Extent;
+import javax.jdo.JDOUserException;
+import javax.jdo.Query;
+
+import org.apache.jdo.jdoql.JDOQLQueryFactory;
+
+import org.apache.jdo.impl.pm.PersistenceManagerImpl;
+
+/**
+ * Subclass of [EMAIL PROTECTED] #PersistenceManagerImpl} implementing
+ * abstract methods codenewQuery/code.
+ *
+ * @author Michael Watzek
+ */
+public class FOStorePM extends PersistenceManagerImpl 
+{
+/** The JDOQLQueryFactory. */
+private JDOQLQueryFactory jdoqlQueryFactory;
+
+/**
+ * Constructs new instance of PersistenceManagerImpl for this
+ * PersistenceManagerFactoryInternal and particular combination of 
+ * username and password.
+ * @param pmf calling PersistenceManagerFactory as
+ * PersistenceManagerFactoryInternal 
+ * @param username user name used for accessing Connector or null if none
+ * is provided.
+ * @param password user password used for accessing Connector or null if 
+ * none is provided.
+ */
+FOStorePM(FOStorePMF pmf, String username, String password) 
+{
+super(pmf, username, password);
+this.jdoqlQueryFactory = pmf.getJDOQLQueryFactory();
+}
+
+/** Create a new Query with no elements.
+ * @return a new Query instance with no elements.
+ */  
+ public Query newQuery() 
+ {
+ assertIsOpen();
+ return this.jdoqlQueryFactory.newQuery(this);
+ }
+
+ /** Create a new Query using elements from another Query.  The other Query
+ * must have been created by the same JDO implementation.  It might be 
active
+ * in a different PersistenceManager or might have been serialized and
+ * restored.
+ * @return the new Query
+ * @param compiled another Query from the same JDO implementation
+ */  
+ public Query newQuery(Object compiled) 
+ {
+ assertIsOpen();
+ return this.jdoqlQueryFactory.newQuery(this, compiled);
+ }
+
+ /** Create a new Query using the specified

svn commit: r168430 - in /incubator/jdo/trunk: ri11/test/java/org/apache/jdo/test/util/ tck11/test/java/org/apache/jdo/tck/ tck11/test/java/org/apache/jdo/tck/api/persistencemanager/ tck20/test/java/org/apache/jdo/tck/ tck20/test/java/org/apache/jdo/tck/api/persistencemanager/

[mbo]

Author: mbo
Date: Thu May  5 14:44:58 2005
New Revision: 168430

URL: http://svn.apache.org/viewcvs?rev=168430view=rev
Log:
JDO-32 Some tests, when they fail, do not close pmf. Change method closePMF to 
make sure that the pmf is closed and changed cleanup method in 
PersistenceManagerTest

Modified:

incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/util/AbstractTest.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/JDO_Test.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/JDO_Test.java

incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java

Modified: 
incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/util/AbstractTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/util/AbstractTest.java?rev=168430r1=168429r2=168430view=diff
==
--- 
incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/util/AbstractTest.java 
(original)
+++ 
incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/util/AbstractTest.java 
Thu May  5 14:44:58 2005
@@ -47,6 +47,7 @@
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 import javax.jdo.Transaction;
+import javax.jdo.JDOException;
 
 import junit.framework.TestCase;
 
@@ -297,7 +298,8 @@
  *
  */
 protected void closePMF() {
-if (pmf != null) {
+JDOException failure = null;
+while (pmf != null) {
 if (debug) logger.debug(closePMF);
 try {
 // Execute pmf.close in a privileged block, otherwise the test
@@ -307,11 +309,56 @@
 pmf.close();
 return null;
 }});
-}
-finally {
 pmf = null;
 }
+catch (JDOException ex) {
+// store failure of first call pmf.close
+if (failure == null)
+failure = ex;
+PersistenceManager[] pms = getFailedPersistenceManagers(ex);
+for (int i = 0; i  pms.length; i++) {
+closePM(pms[i]);
+}
+}
+}
+
+// rethrow JDOException thrown by pmf.close
+if (failure != null)
+throw failure;
+}
+
+/** 
+ * This method cleans up the specified 
+ * codePersistenceManager/code. If the pm still has an open
+ * transaction, it will be rolled back, before closing the pm.
+ */
+protected void closePM(PersistenceManager pm) 
+{
+if ((pm != null)  !pm.isClosed()) {
+if (pm.currentTransaction().isActive()) {
+pm.currentTransaction().rollback();
+}
+pm.close();
+}
+}
+
+/** */
+protected PersistenceManager[] getFailedPersistenceManagers(
+JDOException ex) {
+Throwable[] nesteds = ex.getNestedExceptions();
+int numberOfExceptions = nesteds==null ? 0 : nesteds.length;
+PersistenceManager[] result = new 
PersistenceManager[numberOfExceptions];
+for (int i = 0; i  numberOfExceptions; ++i) {
+JDOException exc = (JDOException)nesteds[i];
+Object failedObject = exc.getFailedObject();
+if (exc.getFailedObject() instanceof PersistenceManager) {
+result[i] = (PersistenceManager)failedObject;
+} else {
+fail(Unexpected failed object of type:  +
+ failedObject.getClass().getName());
+}
 }
+return result;
 }
 
 /**

Modified: incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/JDO_Test.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/JDO_Test.java?rev=168430r1=168429r2=168430view=diff
==
--- incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/JDO_Test.java 
(original)
+++ incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/JDO_Test.java Thu 
May  5 14:44:58 2005
@@ -26,6 +26,7 @@
 import javax.jdo.JDOHelper;
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.JDOException;
 
 import junit.framework.TestCase;
 
@@ -229,10 +230,47 @@
 /** Closes the pmf stored in this instance. */
 protected void closePMF()
 {
-if (pmf != null) {
-pmf.close();
-pmf = null;
+JDOException failure = null;
+while (pmf != null) {
+try {
+pmf.close();
+pmf = null;
+}
+catch (JDOException ex) {
+// store failure of first call pmf.close
+if (failure == null

svn commit: r162078 - /incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company /incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance /incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks /incubator/jdo/trunk/tck11/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company /incubator/jdo/trunk/tck11/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance /incubator/jdo/trunk/tck11/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks /incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company /incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance /incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks /incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company /incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance /incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks

[mbo]

Author: mbo
Date: Wed Apr 20 14:43:27 2005
New Revision: 162078

URL: http://svn.apache.org/viewcvs?rev=162078view=rev
Log:
Change enhancer properties files: put the copyright notice in comments

Modified:

incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/jdoTest.properties

incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/jdoTest.properties

incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/jdoTest.properties

incubator/jdo/trunk/tck11/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/jdoTest.properties

incubator/jdo/trunk/tck11/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/jdoTest.properties

incubator/jdo/trunk/tck11/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/jdoTest.properties

incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/jdoTest.properties

incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/jdoTest.properties

incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/jdoTest.properties

incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/jdoTest.properties

incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/jdoTest.properties

incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/jdoTest.properties

Modified: 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/jdoTest.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/jdoTest.properties?rev=162078r1=162077r2=162078view=diff
==
--- 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/jdoTest.properties
 (original)
+++ 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/jdoTest.properties
 Wed Apr 20 14:43:27 2005
@@ -1,18 +1,18 @@
-
- Copyright 2005 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.
-
+#
+# Copyright 2005 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.
+#
 
 # Classnames can have the following attributes: 
 #  jdo:{persistent|transactional} 

Modified: 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/jdoTest.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/jdoTest.properties?rev=162078r1=162077r2=162078view=diff
==
--- 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/jdoTest.properties
 (original)
+++ 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/jdoTest.properties
 Wed Apr 20 14:43:27 2005
@@ -1,18 +1,18 @@
-
- Copyright 2005 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.
-
+#
+# Copyright 2005 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

svn commit: r162080 - /incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/WeakHashSet.java

[mbo]

Author: mbo
Date: Wed Apr 20 14:46:52 2005
New Revision: 162080

URL: http://svn.apache.org/viewcvs?rev=162080view=rev
Log:
Change WeakHashSet implementation: cleanup WeakHashSet on remove but not on size

Modified:
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/WeakHashSet.java

Modified: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/WeakHashSet.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/WeakHashSet.java?rev=162080r1=162079r2=162080view=diff
==
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/WeakHashSet.java 
(original)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/WeakHashSet.java Wed 
Apr 20 14:46:52 2005
@@ -92,17 +92,9 @@
  * @return codetrue/code if the set contained the specified element.
  */
 public boolean remove(Object o) {
-return super.remove(WeakElement.create(o));
-}
-
-/**
- * Returns the number of elements in this set (its cardinality).
- *
- * @return the number of elements in this set (its cardinality).
- */
-public int size() {
+boolean ret = super.remove(WeakElement.create(o));
 processQueue();
-return super.size();
+return ret;
 }
 
 /**

svn commit: r161591 - in incubator/jdo/trunk: ri11/project.properties ri11/project.xml tck11/project.properties tck11/project.xml tck20/project.properties tck20/project.xml

[mbo]

Author: mbo
Date: Sat Apr 16 11:32:19 2005
New Revision: 161591

URL: http://svn.apache.org/viewcvs?view=revrev=161591
Log:
Upadted jdo groupid to apache-jdo and version to SNAPSHOT in the dependency 
definitions in project.xml and project.properties

Modified:
incubator/jdo/trunk/ri11/project.properties
incubator/jdo/trunk/ri11/project.xml
incubator/jdo/trunk/tck11/project.properties
incubator/jdo/trunk/tck11/project.xml
incubator/jdo/trunk/tck20/project.properties
incubator/jdo/trunk/tck20/project.xml

Modified: incubator/jdo/trunk/ri11/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/project.properties?view=diffr1=161590r2=161591
==
--- incubator/jdo/trunk/ri11/project.properties (original)
+++ incubator/jdo/trunk/ri11/project.properties Sat Apr 16 11:32:19 2005
@@ -27,8 +27,8 @@
 org/apache/jdo/impl/jdoql/jdoqlc/Optimizer.java
 
 # dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo1-api')}
-jdo.jdobtree.jarfile = ${pom.getDependencyPath('jdo:jdo-btree')}
+jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('apache-jdo:jdo-btree')}
 junit.jarfile = ${pom.getDependencyPath('junit:junit')}
 antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
 jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}

Modified: incubator/jdo/trunk/ri11/project.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/project.xml?view=diffr1=161590r2=161591
==
--- incubator/jdo/trunk/ri11/project.xml (original)
+++ incubator/jdo/trunk/ri11/project.xml Sat Apr 16 11:32:19 2005
@@ -56,12 +56,12 @@
 version1.0.4/version
 /dependency
 dependency
-groupIdjdo/groupId
+groupIdapache-jdo/groupId
 artifactIdjdo1-api/artifactId
 versionSNAPSHOT/version
 /dependency
 dependency
-groupIdjdo/groupId
+groupIdapache-jdo/groupId
 artifactIdjdo-btree/artifactId
 versionSNAPSHOT/version
 /dependency

Modified: incubator/jdo/trunk/tck11/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/project.properties?view=diffr1=161590r2=161591
==
--- incubator/jdo/trunk/tck11/project.properties (original)
+++ incubator/jdo/trunk/tck11/project.properties Sat Apr 16 11:32:19 2005
@@ -43,9 +43,9 @@
 jdo.tck.resultprinterclass = org.apache.jdo.tck.util.BatchResultPrinter
 
 # dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo1-api')}
-jdo.jdobtree.jarfile = ${pom.getDependencyPath('jdo:jdo-btree')}
-jdo.jdori.jarfile = ${pom.getDependencyPath('jdo:jdo1-ri')}
+jdo.jdoapi.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('apache-jdo:jdo-btree')}
+jdo.jdori.jarfile = ${pom.getDependencyPath('apache-jdo:jdo1-ri')}
 junit.jarfile = ${pom.getDependencyPath('junit:junit')}
 antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
 jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}

Modified: incubator/jdo/trunk/tck11/project.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/project.xml?view=diffr1=161590r2=161591
==
--- incubator/jdo/trunk/tck11/project.xml (original)
+++ incubator/jdo/trunk/tck11/project.xml Sat Apr 16 11:32:19 2005
@@ -59,19 +59,19 @@
 version1.0.1B-rc2/version
 /dependency
 dependency
-groupIdjdo/groupId
+groupIdapache-jdo/groupId
 artifactIdjdo1-api/artifactId
-version1.1/version
+versionSNAPSHOT/version
 /dependency
 dependency
-groupIdjdo/groupId
+groupIdapache-jdo/groupId
 artifactIdjdo-btree/artifactId
-version1.1/version
+versionSNAPSHOT/version
 /dependency
 dependency
-groupIdjdo/groupId
+groupIdapache-jdo/groupId
 artifactIdjdo1-ri/artifactId
-version1.1/version
+versionSNAPSHOT/version
 /dependency
 dependency
 idcommons-logging/id

Modified: incubator/jdo/trunk/tck20/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?view=diffr1=161590r2=161591
==
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Sat Apr 16 11:32:19 2005
@@ -47,13 +47,11 @@
 jdo.tck.database=derby
 
 # dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo2-api

svn commit: r161168 [1/2] - in incubator/jdo/trunk/ri11/src/java/org/apache/jdo: impl/enhancer/meta/model/ impl/jdoql/jdoqlc/ impl/model/java/ impl/model/java/reflection/ impl/model/java/runtime/ impl/model/jdo/util/ impl/model/jdo/xml/ model/java/

[mbo]

Author: mbo
Date: Wed Apr 13 02:11:13 2005
New Revision: 161168

URL: http://svn.apache.org/viewcvs?view=revrev=161168
Log:
Changed java model implementation in ri11 to reduce dependencies between 
enhancer and runtime

Added:

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/BaseReflectionJavaField.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/BaseReflectionJavaType.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/reflection/

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/reflection/ReflectionJavaField.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/reflection/ReflectionJavaModel.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/reflection/ReflectionJavaType.java
Removed:

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/ReflectionJavaField.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/ReflectionJavaType.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/runtime/RuntimeJavaField.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/jdo/util/Assertion.java
Modified:

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaModel.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaType.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/TypeSupport.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/JavaModel-Impl.jpg

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/PredefinedType.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/runtime/RuntimeJavaModel.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/runtime/RuntimeJavaModelFactory.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/runtime/RuntimeJavaType.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/jdo/xml/JDOParser.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModel.mdl

Modified: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaModel.java?view=diffr1=161167r2=161168
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaModel.java
 (original)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaModel.java
 Wed Apr 13 02:11:13 2005
@@ -19,7 +19,7 @@
 import java.io.InputStream;
 
 import org.apache.jdo.impl.enhancer.util.ResourceLocator;
-import org.apache.jdo.impl.model.java.runtime.RuntimeJavaModel;
+import org.apache.jdo.impl.model.java.reflection.ReflectionJavaModel;
 import org.apache.jdo.model.java.JavaType;
 import org.apache.jdo.model.jdo.JDOModel;
 
@@ -30,7 +30,7 @@
  * @author Martin Zaun
  */
 public class EnhancerJavaModel
-extends RuntimeJavaModel
+extends ReflectionJavaModel
 {
 /**
  * The package jdo file.
@@ -71,7 +71,7 @@
  * @param clazz the Class instance representing the type
  * @return a new JavaType instance
  */
-protected JavaType createJavaType(Class clazz, JDOModel jdoModel)
+protected JavaType createJavaType(Class clazz)
 {
 return new EnhancerJavaType(clazz, getJDOModel(), this);
 }

Modified: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaType.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaType.java?view=diffr1=161167r2=161168
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaType.java
 (original)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/meta/model/EnhancerJavaType.java
 Wed Apr 13 02:11:13 2005
@@ -17,7 +17,7 @@
 package org.apache.jdo.impl.enhancer.meta.model;
 
 import org.apache.jdo.impl.enhancer.meta.EnhancerMetaDataFatalError;
-import org.apache.jdo.impl.model.java.runtime.RuntimeJavaType;
+import org.apache.jdo.impl.model.java.reflection.ReflectionJavaType;
 import org.apache.jdo.model.java.JavaModel;
 import org.apache.jdo.model.java.JavaType;
 import org.apache.jdo.model.jdo.JDOModel;
@@ -31,7 +31,7 @@
  * @since JDO 1.0.1
  */
 public class EnhancerJavaType
-extends RuntimeJavaType
+extends ReflectionJavaType
 {
 /** The declaring EnhancerJavaModel instance. */
 private JavaModel javaModel = null;

Modified: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/TypeSupport.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org

svn commit: r161168 [2/2] - in incubator/jdo/trunk/ri11/src/java/org/apache/jdo: impl/enhancer/meta/model/ impl/jdoql/jdoqlc/ impl/model/java/ impl/model/java/reflection/ impl/model/java/runtime/ impl/model/jdo/util/ impl/model/jdo/xml/ model/java/

[mbo]

Modified: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModel.mdl
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModel.mdl?view=diffr1=161167r2=161168
==
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModel.mdl 
(original)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModel.mdl 
Wed Apr 13 02:11:13 2005
@@ -58,7 +58,7 @@
(object Role declaringModel
quid3DBD566401F4
label   declaringModel
-   supplierLogical 
View::com::sun::jdori::model::java::JavaModel
+   supplierLogical 
View::org.apache.jdo.model.java::JavaModel
quidu   3DB7F9FB00D9
client_cardinality  (value cardinality 1..1)
is_navigableTRUE
@@ -66,7 +66,7 @@
(object Role declaredTypes
quid3DBD566401F5
label   declaredTypes
-   supplierLogical 
View::com::sun::jdori::model::java::JavaType
+   supplierLogical 
View::org.apache.jdo.model.java::JavaType
quidu   3DB7A32B028B
client_cardinality  (value cardinality 0..n)
is_navigableTRUE)))
@@ -76,14 +76,14 @@
(object Role parent
quid3DBD582C0242
label   parent
-   supplierLogical 
View::com::sun::jdori::model::java::JavaModel
+   supplierLogical 
View::org.apache.jdo.model.java::JavaModel
quidu   3DB7F9FB00D9
client_cardinality  (value cardinality 0..1)
is_navigableTRUE)
(object Role children
quid3DBD582C0243
label   children
-   supplierLogical 
View::com::sun::jdori::model::java::JavaModel
+   supplierLogical 
View::org.apache.jdo.model.java::JavaModel
quidu   3DB7F9FB00D9
client_cardinality  (value cardinality 0..n)
is_navigableTRUE)))
@@ -93,885 +93,863 @@
(object Role jdoModel
quid3DBD649E003E
label   jdoModel
-   supplierLogical 
View::com::sun::jdori::model::jdo::JDOModel
+   supplierLogical 
View::org.apache.jdo.model.jdo::JDOModel
quidu   3DB7FBE10241
client_cardinality  (value cardinality 1..1)
is_navigableTRUE)
(object Role javaModel
quid3DBD649E003F
label   javaModel
-   supplierLogical 
View::com::sun::jdori::model::java::JavaModel
+   supplierLogical 
View::org.apache.jdo.model.java::JavaModel
quidu   3DB7F9FB00D9
client_cardinality  (value cardinality 1..1)
is_navigableTRUE)))
-   (object Class_Category com
-   quid3DB79E9F02CE
+   (object Class_Category org.apache.jdo.model.java
+   quid425CCDF20148
exportControl   Public
logical_models  (list unit_reference_list
-   (object Class_Category sun
-   quid3DB79EAF0353
-   exportControl   Public
-   logical_models  (list unit_reference_list
-   (object Class_Category jdori
-   quid3DB79EB40238
-   exportControl   Public
-   logical_models  (list unit_reference_list
-   (object Class_Category model
-   quid3DB7A30001E9
-   exportControl   Public
-   logical_models  (list 
unit_reference_list
-   (object Class ModelException
-   quid3DEB7DCC01B5
-   languageJava)
-   (object Class ModelFatalException
-   quid   

svn commit: r161034 - in incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util: I18NHelper.java JDOJdk14Logger.java JDORIVersion.java Pool.java

[mbo]

Author: mbo
Date: Tue Apr 12 01:22:54 2005
New Revision: 161034

URL: http://svn.apache.org/viewcvs?view=revrev=161034
Log:
Remove dependencies of util classes on exception classes from javax.jdo

Modified:
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/I18NHelper.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDOJdk14Logger.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDORIVersion.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/Pool.java

Modified: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/I18NHelper.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/I18NHelper.java?view=diffr1=161033r2=161034
==
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/I18NHelper.java 
(original)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/I18NHelper.java Tue 
Apr 12 01:22:54 2005
@@ -21,12 +21,10 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import javax.jdo.JDOFatalInternalException;
-
 /** Helper class for constructing messages from bundles.  The intended usage
  * of this class is to construct a new instance bound to a bundle, as in
  * P
- * codeI18NHelper msg = I18NHelper.getInstance(javax.jdo.Bundle);/code
+ * codeI18NHelper msg = 
I18NHelper.getInstance(org.apache.jdo.util.jdo.Bundle);/code
  * P
  * This call uses the class loader that loaded the I18NHelper class to find
  * the specified Bundle. The class provides two overloaded getInstance
@@ -229,14 +227,14 @@
 /** Assert resources available
  * @param key the message key 
  * @since 1.0.2
- * @throws JDOFatalInternalException if the resource bundle could not
+ * @throws RuntimeException if the resource bundle could not
  * be loaded during construction.
  */
 private void assertBundle (String key) {
 if (failure != null)
-throw new JDOFatalInternalException (
+throw new RuntimeException (
 No resources could be found to annotate error message key:\ 
+ 
-key + \, failure);
+key + \  + failure);
 }
 
 /**

Modified: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDOJdk14Logger.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDOJdk14Logger.java?view=diffr1=161033r2=161034
==
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDOJdk14Logger.java 
(original)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDOJdk14Logger.java 
Tue Apr 12 01:22:54 2005
@@ -24,8 +24,6 @@
 
 import java.util.logging.LogManager;
 
-import javax.jdo.JDOFatalUserException;
-
 import org.apache.commons.logging.impl.Jdk14Logger;
 
 /**
@@ -77,14 +75,14 @@
 return null;
 }
 catch (IOException ex) {
-throw new JDOFatalUserException(
+throw new RuntimeException(
 msg.msg(EXC_LoggerSetupIOException, //NOI18N
-PROPERIES_FILE), ex); 
+PROPERIES_FILE) + ex); 
 }
 catch (SecurityException ex) {
-throw new JDOFatalUserException(
+throw new RuntimeException(
 msg.msg(EXC_LoggerSetupSecurityException, // NOI18N
-PROPERIES_FILE), ex);
+PROPERIES_FILE) + ex);
 }
 }
 });

Modified: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDORIVersion.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDORIVersion.java?view=diffr1=161033r2=161034
==
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDORIVersion.java 
(original)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/JDORIVersion.java Tue 
Apr 12 01:22:54 2005
@@ -31,9 +31,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
-
-import javax.jdo.JDOException;
-
 /**
  * Helper class to handle properties object with version number and vendor 
name.
  *
@@ -98,7 +95,7 @@
 temp_properties.load(in);
 in.close();
 } catch (java.io.IOException e) {
-throw new JDOException(null, e);
+throw new RuntimeException(e.toString());
 }
 
 _properties = new Properties();

Modified: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/Pool.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/util/Pool.java?view=diffr1=161033r2=161034

svn commit: r161077 - incubator/jdo/trunk/ri11/test/runtest.xml

[mbo]

Author: mbo
Date: Tue Apr 12 10:52:57 2005
New Revision: 161077

URL: http://svn.apache.org/viewcvs?view=revrev=161077
Log:
name of jdo-api file changed to jdo1-api-1.1.jar

Modified:
incubator/jdo/trunk/ri11/test/runtest.xml

Modified: incubator/jdo/trunk/ri11/test/runtest.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/test/runtest.xml?view=diffr1=161076r2=161077
==
--- incubator/jdo/trunk/ri11/test/runtest.xml (original)
+++ incubator/jdo/trunk/ri11/test/runtest.xml Tue Apr 12 10:52:57 2005
@@ -42,7 +42,7 @@
 !-- JAR files required to run the tests
 --
 property name=builddir value=${basedir}/../target/
-property name=jdoapi 
value=${user.home}/.maven/repository/jdo/jars/jdo-api-1.1.jar/
+property name=jdoapi 
value=${user.home}/.maven/repository/jdo/jars/jdo1-api-1.1.jar/
 property name=jdobtree 
value=${user.home}/.maven/repository/jdo/jars/jdo-btree-1.1.jar/
 property name=jdori value=${builddir}/classes/
 property name=jdoritests value=${builddir}/test-classes/jdo-ri-tests.jar/

svn commit: r160802 - incubator/jdo/trunk/project.properties

[mbo]

Author: mbo
Date: Sun Apr 10 13:41:29 2005
New Revision: 160802

URL: http://svn.apache.org/viewcvs?view=revrev=160802
Log:
changed top-level project.properties: replaced duplicated entry 
maven.compile.target by maven.compile.source

Modified:
incubator/jdo/trunk/project.properties

Modified: incubator/jdo/trunk/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/project.properties?view=diffr1=160801r2=160802
==
--- incubator/jdo/trunk/project.properties (original)
+++ incubator/jdo/trunk/project.properties Sun Apr 10 13:41:29 2005
@@ -15,7 +15,7 @@
 #
 
 # Make sure the compiled class still work with J2SE 1.3
-maven.compile.target = 1.3
+maven.compile.source = 1.3
 maven.compile.target = 1.3
 
 # Set the javadoc title 

svn commit: r160266 - in incubator/jdo/trunk: ./ api11/ api11/xdocs/ api20/ api20/xdocs/ ri11/ ri11/xdocs/ tck11/ tck20/

[mbo]

Author: mbo
Date: Wed Apr  6 01:29:55 2005
New Revision: 160266

URL: http://svn.apache.org/viewcvs?view=revrev=160266
Log:
use different artifactId for 1.1 vs. 2.0 projects

Modified:
incubator/jdo/trunk/api11/project.xml
incubator/jdo/trunk/api11/xdocs/index.xml
incubator/jdo/trunk/api11/xdocs/navigation.xml
incubator/jdo/trunk/api20/project.xml
incubator/jdo/trunk/api20/xdocs/index.xml
incubator/jdo/trunk/api20/xdocs/navigation.xml
incubator/jdo/trunk/project.properties
incubator/jdo/trunk/ri11/project.properties
incubator/jdo/trunk/ri11/project.xml
incubator/jdo/trunk/ri11/xdocs/index.xml
incubator/jdo/trunk/ri11/xdocs/navigation.xml
incubator/jdo/trunk/tck11/project.properties
incubator/jdo/trunk/tck11/project.xml
incubator/jdo/trunk/tck20/project.properties
incubator/jdo/trunk/tck20/project.xml

Modified: incubator/jdo/trunk/api11/project.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/project.xml?view=diffr1=160265r2=160266
==
--- incubator/jdo/trunk/api11/project.xml (original)
+++ incubator/jdo/trunk/api11/project.xml Wed Apr  6 01:29:55 2005
@@ -21,11 +21,11 @@
 !-- == --
 !-- Identification --
 !-- == --
-nameJDO API 1.1/name
-artifactIdjdo-api/artifactId
+nameJDO1 API/name
+artifactIdjdo1-api/artifactId
 currentVersion1.1/currentVersion
 packagejavax.jdo/package
-shortDescriptionJava Data Object (JDO) API 1.1/shortDescription
+shortDescriptionJava Data Object (JDO) API/shortDescription
 descriptionThe Java Data Objects (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request 12 under the auspices of the Java Community Process./description

Modified: incubator/jdo/trunk/api11/xdocs/index.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/xdocs/index.xml?view=diffr1=160265r2=160266
==
--- incubator/jdo/trunk/api11/xdocs/index.xml (original)
+++ incubator/jdo/trunk/api11/xdocs/index.xml Wed Apr  6 01:29:55 2005
@@ -16,10 +16,10 @@
 --
 
 document
-  properties titleJDO API/title /properties
+  properties titleAbout/title /properties
 
   body
-section name=JDO API
+section name=JDO1 API
   pThe Java Data Objects (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed as 
 a href=http://www.jcp.org/en/jsr/detail?id=12;Java Specification 

Modified: incubator/jdo/trunk/api11/xdocs/navigation.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/xdocs/navigation.xml?view=diffr1=160265r2=160266
==
--- incubator/jdo/trunk/api11/xdocs/navigation.xml (original)
+++ incubator/jdo/trunk/api11/xdocs/navigation.xml Wed Apr  6 01:29:55 2005
@@ -15,9 +15,7 @@
 limitations under the License.
 --
 
-project name=JDO API
-
-  titleJDO API/title
+project name=JDO1 API
 
   body
 links

Modified: incubator/jdo/trunk/api20/project.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/project.xml?view=diffr1=160265r2=160266
==
--- incubator/jdo/trunk/api20/project.xml (original)
+++ incubator/jdo/trunk/api20/project.xml Wed Apr  6 01:29:55 2005
@@ -21,12 +21,12 @@
 !-- == --
 !-- Identification --
 !-- == --
-nameJDO/name
-artifactIdjdo-api/artifactId
+nameJDO2 API/name
+artifactIdjdo2-api/artifactId
 currentVersion2.0/currentVersion
 packagejavax.jdo/package
-shortDescriptionJava Data Object (JDO) API 2.0/shortDescription
-descriptionThe Java Data Objects (JDO) API is a standard interface-based 
+shortDescriptionJava Data Object 2.0 (JDO) API/shortDescription
+descriptionThe Java Data Objects 2.0 (JDO) API is a standard 
interface-based 
 Java model abstraction of persistence, developed as Java Specification 
 Request 243 under the auspices of the Java Community Process./description
 repository /

Modified: incubator/jdo/trunk/api20/xdocs/index.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/xdocs/index.xml?view=diffr1=160265r2=160266
==
--- incubator/jdo/trunk/api20/xdocs/index.xml (original)
+++ incubator/jdo/trunk/api20/xdocs/index.xml Wed Apr  6 01:29:55 2005
@@ -16,11 +16,11 @@
 --
 
 document
-  properties titleJDO API/title /properties
+  properties titleAbout/title /properties
 
   body
-section name=JDO API
-  pThe Java Data Objects (JDO) API is a standard interface-based 
+section name=JDO2 API
+  pThe Java Data Objects 2.0 (JDO) API is a standard interface-based 
 Java model abstraction of persistence, developed

svn commit: r158179 [22/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,1085 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.pc.fieldtypes;
+
+import java.io.Serializable;
+
+public class FieldsOfDouble { 
+  public int identifier;
+  private Double Double0;
+  private Double Double1;
+  private Double Double2;
+  private Double Double3;
+  private Double Double4;
+  private Double Double5;
+  private Double Double6;
+  private Double Double7;
+  private static Double Double8;
+  private transient Double Double9;
+  private transient Double Double10;
+  private transient Double Double11;
+  private transient Double Double12;
+  private transient Double Double13;
+  private transient Double Double14;
+  private final Double Double15 = new Double((double)5);
+  private volatile Double Double16;
+  private volatile Double Double17;
+  private volatile Double Double18;
+  private volatile Double Double19;
+  private volatile Double Double20;
+  private volatile Double Double21;
+  private volatile Double Double22;
+  private volatile Double Double23;
+  private static transient Double Double24;
+  private static final Double Double25 = new Double((double)5);
+  private static volatile Double Double26;
+  private transient final Double Double27 = new Double((double)5);
+  private transient volatile Double Double28;
+  private transient volatile Double Double29;
+  private transient volatile Double Double30;
+  private transient volatile Double Double31;
+  private transient volatile Double Double32;
+  private transient volatile Double Double33;
+  private static transient final Double Double34 = new Double((double)5);
+  private static transient volatile Double Double35;
+  public Double Double36;
+  public Double Double37;
+  public Double Double38;
+  public Double Double39;
+  public Double Double40;
+  public Double Double41;
+  public Double Double42;
+  public Double Double43;
+  public static Double Double44;
+  public transient Double Double45;
+  public transient Double Double46;
+  public transient Double Double47;
+  public transient Double Double48;
+  public transient Double Double49;
+  public transient Double Double50;
+  public final Double Double51 = new Double((double)5);
+  public volatile Double Double52;
+  public volatile Double Double53;
+  public volatile Double Double54;
+  public volatile Double Double55;
+  public volatile Double Double56;
+  public volatile Double Double57;
+  public volatile Double Double58;
+  public volatile Double Double59;
+  public static transient Double Double60;
+  public static final Double Double61 = new Double((double)5);
+  public static volatile Double Double62;
+  public transient final Double Double63 = new Double((double)5);
+  public transient volatile Double Double64;
+  public transient volatile Double Double65;
+  public transient volatile Double Double66;
+  public transient volatile Double Double67;
+  public transient volatile Double Double68;
+  public transient volatile Double Double69;
+  public static transient final Double Double70 = new Double((double)5);
+  public static transient volatile Double Double71;
+  protected Double Double72;
+  protected Double Double73;
+  protected Double Double74;
+  protected Double Double75;
+  protected Double Double76;
+  protected Double Double77;
+  protected Double Double78;
+  protected Double Double79;
+  protected static Double Double80;
+  protected transient Double Double81;
+  protected transient Double Double82;
+  protected transient Double Double83;
+  protected transient Double Double84;
+  protected transient Double Double85;
+  protected transient Double Double86;
+  protected final Double Double87 = new Double((double)5);
+  protected volatile Double Double88;
+  protected volatile Double Double89;
+  protected volatile Double Double90;
+  protected volatile Double Double91;
+  protected volatile Double 

svn commit: r158179 [31/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,954 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.pc.fieldtypes;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+public class HashMapStringKeyCollections { 
+  public int identifier;
+  public HashMap HashMapOfString_Object0;
+  public HashMap HashMapOfString_Object1;
+  public HashMap HashMapOfString_Object2;
+  public HashMap HashMapOfString_SimpleClass3;
+  public HashMap HashMapOfString_SimpleClass4;
+  public HashMap HashMapOfString_SimpleClass5;
+  public HashMap HashMapOfString_SimpleInterface6;
+  public HashMap HashMapOfString_SimpleInterface7;
+  public HashMap HashMapOfString_SimpleInterface8;
+  public HashMap HashMapOfString_String9;
+  public HashMap HashMapOfString_String10;
+  public HashMap HashMapOfString_String11;
+  public HashMap HashMapOfString_Date12;
+  public HashMap HashMapOfString_Date13;
+  public HashMap HashMapOfString_Date14;
+  public HashMap HashMapOfString_Locale15;
+  public HashMap HashMapOfString_Locale16;
+  public HashMap HashMapOfString_Locale17;
+  public HashMap HashMapOfString_BigDecimal18;
+  public HashMap HashMapOfString_BigDecimal19;
+  public HashMap HashMapOfString_BigDecimal20;
+  public HashMap HashMapOfString_BigInteger21;
+  public HashMap HashMapOfString_BigInteger22;
+  public HashMap HashMapOfString_BigInteger23;
+  public HashMap HashMapOfString_Byte24;
+  public HashMap HashMapOfString_Byte25;
+  public HashMap HashMapOfString_Byte26;
+  public HashMap HashMapOfString_Double27;
+  public HashMap HashMapOfString_Double28;
+  public HashMap HashMapOfString_Double29;
+  public HashMap HashMapOfString_Float30;
+  public HashMap HashMapOfString_Float31;
+  public HashMap HashMapOfString_Float32;
+  public HashMap HashMapOfString_Integer33;
+  public HashMap HashMapOfString_Integer34;
+  public HashMap HashMapOfString_Integer35;
+  public HashMap HashMapOfString_Long36;
+  public HashMap HashMapOfString_Long37;
+  public HashMap HashMapOfString_Long38;
+  public HashMap HashMapOfString_Short39;
+  public HashMap HashMapOfString_Short40;
+  public HashMap HashMapOfString_Short41;
+  public HashMap HashMapOfString_Object42;
+  public HashMap HashMapOfString_Object43;
+  public HashMap HashMapOfString_Object44;
+  public HashMap HashMapOfString_SimpleClass45;
+  public HashMap HashMapOfString_SimpleClass46;
+  public HashMap HashMapOfString_SimpleClass47;
+  public HashMap HashMapOfString_SimpleInterface48;
+  public HashMap HashMapOfString_SimpleInterface49;
+  public HashMap HashMapOfString_SimpleInterface50;
+  public HashMap HashMapOfString_String51;
+  public HashMap HashMapOfString_String52;
+  public HashMap HashMapOfString_String53;
+  public HashMap HashMapOfString_Date54;
+  public HashMap HashMapOfString_Date55;
+  public HashMap HashMapOfString_Date56;
+  public HashMap HashMapOfString_Locale57;
+  public HashMap HashMapOfString_Locale58;
+  public HashMap HashMapOfString_Locale59;
+  public HashMap HashMapOfString_BigDecimal60;
+  public HashMap HashMapOfString_BigDecimal61;
+  public HashMap HashMapOfString_BigDecimal62;
+  public HashMap HashMapOfString_BigInteger63;
+  public HashMap HashMapOfString_BigInteger64;
+  public HashMap HashMapOfString_BigInteger65;
+  public HashMap HashMapOfString_Byte66;
+  public HashMap HashMapOfString_Byte67;
+  public HashMap HashMapOfString_Byte68;
+  public HashMap HashMapOfString_Double69;
+  public HashMap HashMapOfString_Double70;
+  public HashMap HashMapOfString_Double71;
+  public HashMap HashMapOfString_Float72;
+  public HashMap HashMapOfString_Float73;
+  public HashMap HashMapOfString_Float74;
+  public HashMap HashMapOfString_Integer75;
+  public HashMap HashMapOfString_Integer76;
+  public HashMap HashMapOfString_Integer77;
+  public HashMap HashMapOfString_Long78;
+  public 

svn commit: r158179 [47/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/Multiplication.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/Multiplication.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/Multiplication.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/Multiplication.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.query.operators;
+
+import java.util.Collection;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PrimitiveTypes;
+import org.apache.jdo.tck.query.QueryTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *BTitle:/B Multiplication Query Operator
+ *BR
+ *BKeywords:/B query
+ *BR
+ *BAssertion ID:/B A14.6.2-30.
+ *BR
+ *BAssertion Description: /B
+The multiplication operator (code*/code) is supported for all types as
+they are defined in the Java language. This includes the following types:
+UL
+LIcodebyte, short, int, long, char, Byte, Short Integer, Long, 
Character/code/LI
+LIcodefloat, double, Float, Double/code/LI
+LIcodeBigDecimal, BigInteger/code/LI
+/UL
+The operation on object-valued fields of wrapper types (codeBoolean, Byte,
+Short, Integer, Long, Float/code, and codeDouble/code), and numeric types
+(codeBigDecimal/code and codeBigInteger/code)
+use the wrapped values as operands.
+ */
+
+public class Multiplication extends QueryTest {
+
+/** */
+private static final String ASSERTION_FAILED = 
+Assertion A14.6.2-30 (Multiplication) failed: ;
+
+/**
+ * The codemain/code is called when the class
+ * is directly executed from the command line.
+ * @param args The arguments passed to the program.
+ */
+public static void main(String[] args) {
+BatchTestRunner.run(Multiplication.class);
+}
+
+/** */
+public void test() {
+pm = getPM();
+
+try {
+loadPrimitiveTypes(pm);
+runTest(pm);
+}
+finally {
+cleanupDatabase(pm, PrimitiveTypes.class);
+pm.close();
+pm = null;
+}
+}
+
+/** */
+void runTest(PersistenceManager pm) {
+if (debug) logger.debug(\nExecuting test Multiplication() ...);
+
+Transaction tx = pm.currentTransaction();
+tx.begin();
+
+Collection instance4 = (Collection)pm.newQuery(
+PrimitiveTypes.class, id == 4).execute();
+
+runSimplePrimitiveTypesQuery(id * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(byteNotNull * 2 == 8,
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(shortNotNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED); 
   
+runSimplePrimitiveTypesQuery(intNotNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED); 
   
+runSimplePrimitiveTypesQuery(longNotNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(floatNotNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(doubleNotNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(byteNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(shortNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(intNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(longNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(floatNull * 2 == 8, 
+ pm, instance4, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(doubleNull * 2 == 8, 
+   

svn commit: r158175 [2/4] - in incubator/jdo/trunk/api11: ./ src/ src/dtd/ src/dtd/javax/ src/dtd/javax/jdo/ src/java/ src/java/javax/ src/java/javax/jdo/ src/java/javax/jdo/spi/ test/ test/java/ test/java/javax/ test/java/javax/jdo/ test/java/javax/jdo/pc/ test/java/javax/jdo/spi/ test/java/javax/jdo/util/ xdocs/

[mbo]

Added: incubator/jdo/trunk/api11/src/java/javax/jdo/JDOUserException.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/src/java/javax/jdo/JDOUserException.java?view=autorev=158175
==
--- incubator/jdo/trunk/api11/src/java/javax/jdo/JDOUserException.java (added)
+++ incubator/jdo/trunk/api11/src/java/javax/jdo/JDOUserException.java Fri Mar 
18 16:53:48 2005
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * JDOUserException.java
+ *
+ * Created on March 8, 2000, 8:33 AM
+ */
+
+package javax.jdo;
+
+/** This class represents user errors that can possibly be retried.
+ *
+ * @author  Craig Russell
+ * @version 1.0
+ */
+public class JDOUserException extends JDOCanRetryException {
+
+  /**
+   * Constructs a new codeJDOUserException/code without a detail message.
+   */
+  public JDOUserException() {
+  }
+  
+
+  /**
+   * Constructs a new codeJDOUserException/code with the specified detail 
message.
+   * @param msg the detail message.
+   */
+  public JDOUserException(String msg) {
+super(msg);
+  }
+
+  /**
+   * Constructs a new codeJDOUserException/code with the specified detail 
message
+   * and nested codeThrowable/codes.
+   * @param msg the detail message.
+   * @param nested the nested codeThrowable[]/code.
+   */
+  public JDOUserException(String msg, Throwable[] nested) {
+super(msg, nested);
+  }
+
+  /**
+   * Constructs a new codeJDOUserException/code with the specified detail 
message
+   * and nested codeThrowable/codes.
+   * @param msg the detail message.
+   * @param nested the nested codeThrowable/code.
+   */
+  public JDOUserException(String msg, Throwable nested) {
+super(msg, nested);
+  }
+  
+  /** Constructs a new codeJDOUserException/code with the specified detail 
message
+   * and failed object.
+   * @param msg the detail message.
+   * @param failed the failed object.
+   */
+  public JDOUserException(String msg, Object failed) {
+super(msg, failed);
+  }
+  
+  /** Constructs a new codeJDOUserException/code with the specified detail 
message,
+   * nested codeThrowable/codes, and failed object.
+   * @param msg the detail message.
+   * @param nested the nested codeThrowable[]/code.
+   * @param failed the failed object.
+   */
+  public JDOUserException(String msg, Throwable[] nested, Object failed) {
+super(msg, nested, failed);
+  }
+  
+  /** Constructs a new codeJDOUserException/code with the specified detail 
message,
+   * nested codeThrowable/codes, and failed object.
+   * @param msg the detail message.
+   * @param nested the nested codeThrowable/code.
+   * @param failed the failed object.
+   */
+  public JDOUserException(String msg, Throwable nested, Object failed) {
+super(msg, nested, failed);
+  }
+}
+

Added: incubator/jdo/trunk/api11/src/java/javax/jdo/PersistenceManager.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/src/java/javax/jdo/PersistenceManager.java?view=autorev=158175
==
--- incubator/jdo/trunk/api11/src/java/javax/jdo/PersistenceManager.java (added)
+++ incubator/jdo/trunk/api11/src/java/javax/jdo/PersistenceManager.java Fri 
Mar 18 16:53:48 2005
@@ -0,0 +1,596 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * PersistenceManager.java
+ *
+ * Created on February 25, 2000
+ */
+ 
+package javax.jdo;
+import java.util.Collection;
+import java.lang.Class;
+
+/** codePersistenceManager/code is the primary interface for JDO-aware 
application
+ * components.  It is the factory for codeQuery/code and 
codeTransaction/code instances,
+ * and contains methods to manage the life cycle of 
codePersistenceCapable/code
+ * instances.
+ *
+ * PA 

svn commit: r158175 [4/4] - in incubator/jdo/trunk/api11: ./ src/ src/dtd/ src/dtd/javax/ src/dtd/javax/jdo/ src/java/ src/java/javax/ src/java/javax/jdo/ src/java/javax/jdo/spi/ test/ test/java/ test/java/javax/ test/java/javax/jdo/ test/java/javax/jdo/pc/ test/java/javax/jdo/spi/ test/java/javax/jdo/util/ xdocs/

[mbo]

Added: incubator/jdo/trunk/api11/src/java/javax/jdo/spi/StateManager.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/src/java/javax/jdo/spi/StateManager.java?view=autorev=158175
==
--- incubator/jdo/trunk/api11/src/java/javax/jdo/spi/StateManager.java (added)
+++ incubator/jdo/trunk/api11/src/java/javax/jdo/spi/StateManager.java Fri Mar 
18 16:53:48 2005
@@ -0,0 +1,462 @@
+/*
+ * Copyright 2005 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 javax.jdo.spi;
+
+import javax.jdo.PersistenceManager;
+
+/** This interface is the point of contact between managed instances of
+ * codePersistenceCapable/code classes and the JDO implementation.  It 
contains
+ * the methods used by codePersistenceCapable/code instances to delegate 
behavior to 
+ * the JDO implementation.
+ *PEach managed codePersistenceCapable/code instance contains a 
reference to a
+ * codeStateManager/code.  A codeStateManager/code might manage one or 
multiple instances of
+ * codePersistenceCapable/code instances, at the choice of the 
implementation.
+ *
+ * @author  Craig Russell
+ * @version 1.0
+ *
+ */
+public interface StateManager {
+
+/** The owning codeStateManager/code uses this method to supply the 
+ * value of the flags to the codePersistenceCapable/code instance.
+ * @param pc the calling codePersistenceCapable/code instance
+ * @return the value of codejdoFlags/code to be stored in the 
codePersistenceCapable/code instance
+ */
+byte replacingFlags(PersistenceCapable pc);
+
+/** Replace the current value of codejdoStateManager/code.
+ * P
+ * This method is called by the codePersistenceCapable/code whenever
+ * codejdoReplaceStateManager/code is called and there is already
+ * an owning codeStateManager/code.  This is a security precaution
+ * to ensure that the owning codeStateManager/code is the only
+ * source of any change to its reference in the 
codePersistenceCapable/code.
+ * @return the new value for the codejdoStateManager/code
+ * @param pc the calling codePersistenceCapable/code instance
+ * @param sm the proposed new value for the codejdoStateManager/code
+ */ 
+StateManager replacingStateManager (PersistenceCapable pc, StateManager 
sm);
+
+/** Tests whether this object is dirty.
+ *
+ * Instances that have been modified, deleted, or newly 
+ * made persistent in the current transaction return codetrue/code.
+ *
+ *PTransient nontransactional instances return codefalse/code.
+ *P
+ * @see PersistenceCapable#jdoMakeDirty(String fieldName)
+ * @param pc the calling codePersistenceCapable/code instance
+ * @return codetrue/code if this instance has been modified in the 
current transaction.
+ */
+boolean isDirty(PersistenceCapable pc);
+
+/** Tests whether this object is transactional.
+ *
+ * Instances that respect transaction boundaries return codetrue/code. 
 These instances
+ * include transient instances made transactional as a result of being the
+ * target of a codemakeTransactional/code method call; newly made 
persistent or deleted
+ * persistent instances; persistent instances read in data store
+ * transactions; and persistent instances modified in optimistic 
transactions.
+ *
+ *PTransient nontransactional instances return codefalse/code.
+ *P
+ * @param pc the calling codePersistenceCapable/code instance
+ * @return codetrue/code if this instance is transactional.
+ */
+boolean isTransactional(PersistenceCapable pc);
+
+/** Tests whether this object is persistent.
+ *
+ * Instances whose state is stored in the data store return 
codetrue/code.
+ *
+ *PTransient instances return codefalse/code.
+ *P
+ * @see PersistenceManager#makePersistent(Object pc)
+ * @param pc the calling codePersistenceCapable/code instance
+ * @return codetrue/code if this instance is persistent.
+ */
+boolean isPersistent(PersistenceCapable pc);
+
+/** Tests whether this object has been newly made persistent.
+ *
+ * Instances that have been made persistent in the current transaction 
+ * return codetrue/code.
+ *
+ *PTransient instances return codefalse/code.
+ *P
+ * @see PersistenceManager#makePersistent(Object 

svn commit: r158176 [1/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Author: mbo
Date: Fri Mar 18 17:02:29 2005
New Revision: 158176

URL: http://svn.apache.org/viewcvs?view=revrev=158176
Log:
ri11 subproject

Added:
incubator/jdo/trunk/ri11/
incubator/jdo/trunk/ri11/LICENSE.txt
incubator/jdo/trunk/ri11/maven.xml
incubator/jdo/trunk/ri11/project.properties
incubator/jdo/trunk/ri11/project.xml
incubator/jdo/trunk/ri11/src/
incubator/jdo/trunk/ri11/src/conf/
incubator/jdo/trunk/ri11/src/conf/commons-logging.properties
incubator/jdo/trunk/ri11/src/conf/logging.properties
incubator/jdo/trunk/ri11/src/conf/simplelog.properties
incubator/jdo/trunk/ri11/src/java/
incubator/jdo/trunk/ri11/src/java/org/
incubator/jdo/trunk/ri11/src/java/org/apache/
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/ejb/
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/ejb/EJBHelper.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/ejb/EJBImplHelper.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/ejb/package.html
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/enhancer/
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/enhancer/EnhancerMain.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/enhancer/Main.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/enhancer/package.html
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/Bundle.properties

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/ClassArgMain.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/ClassArgOptions.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/ClassFileEnhancer.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/ClassFileEnhancerHelper.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/ClassFileEnhancerTimer.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/EnhancerClassLoader.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/EnhancerFatalError.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/EnhancerOptions.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/EnhancerUserException.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/GenericMain.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/GenericOptions.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/JdoMetaMain.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/JdoMetaOptions.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/LogSupport.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/OptionSet.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/OutputStreamWrapper.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/PersistenceLauncher.java
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/AnnotatedClassAttribute.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/AnnotatedMethodAttribute.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/AttributeVector.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ClassAttribute.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ClassField.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ClassFile.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ClassMember.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ClassMethod.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ClassPrint.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/CodeAttribute.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/CodeEnv.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ConstBasic.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ConstBasicMemberRef.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ConstClass.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ConstDouble.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ConstFieldRef.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ConstFloat.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/ConstInteger.java

incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile

svn commit: r158176 [22/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStoreStoreManager.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStoreStoreManager.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStoreStoreManager.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStoreStoreManager.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,720 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.impl.fostore;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.io.IOException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import javax.jdo.Extent;
+import javax.jdo.JDOException;
+import javax.jdo.JDODataStoreException;
+import javax.jdo.JDOFatalInternalException;
+import javax.jdo.JDOUserException;
+import javax.jdo.JDOFatalUserException;
+import javax.jdo.Transaction;
+import javax.jdo.spi.JDOImplHelper;
+import javax.jdo.spi.PersistenceCapable;
+import javax.jdo.spi.StateManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jdo.impl.model.java.runtime.RuntimeJavaModelFactory;
+import org.apache.jdo.jdoql.BasicQueryResult;
+import org.apache.jdo.jdoql.QueryResult;
+import org.apache.jdo.jdoql.QueryResultHelper;
+import org.apache.jdo.model.jdo.JDOClass;
+import org.apache.jdo.model.jdo.JDOIdentityType;
+import org.apache.jdo.pm.PersistenceManagerInternal;
+import org.apache.jdo.state.StateManagerInternal;
+import org.apache.jdo.store.Connector;
+import org.apache.jdo.store.StoreManagerImpl;
+import org.apache.jdo.util.I18NHelper;
+
+//
+// Note the exception handling herein; it is intentional: if we catch a
+// subclass of JDOException, rethrow it as it is expected by calling code,
+// but if it is not, then create a subclass of JDOException (as are all
+// FOStore exceptions) and throw that.  In other words, the intent is that
+// only JDOException subclasses be thrown by this class.
+//
+
+/**
+* StoreManager represents the datastore to the rest of the JDO components.
+* It provides the means to write and read instances, to get the extent of
+* classes, and to get the object id for a persistence capable object.
+*
+* @author Dave Bristor
+*/
+class FOStoreStoreManager extends StoreManagerImpl {
+private final FOStorePMF pmf;
+private final FOStoreConnector connector;
+private final RequestFactory rf;
+
+/** I18N support. */
+private static final I18NHelper msg = I18NHelper.getInstance(
+I18N.NAME, FOStoreStoreManager.class.getClassLoader());
+
+/** Logger */
+static final Log logger = LogFactory.getFactory().getInstance(
+org.apache.jdo.impl.fostore); // NOI18N
+
+/** JDOImplHelper instance. */
+private static final JDOImplHelper jdoImplHelper = 
+(JDOImplHelper) AccessController.doPrivileged (
+new PrivilegedAction () {
+public Object run () {
+try {
+return JDOImplHelper.getInstance();
+}
+catch (SecurityException e) {
+throw new JDOFatalUserException (msg.msg(
+ERR_Security, e.getMessage()), e); // NOI18N
+}
+}
+}
+);
+
+/** RuntimeJavaModelFactory. */
+private static final RuntimeJavaModelFactory javaModelFactory =
+(RuntimeJavaModelFactory) AccessController.doPrivileged(
+new PrivilegedAction () {
+public Object run () {
+return RuntimeJavaModelFactory.getInstance();
+}
+}
+);
+
+FOStoreStoreManager(FOStorePMF pmf) {
+this.pmf = pmf;
+this.connector = new FOStoreConnector(pmf);
+this.rf = pmf.getRequestFactory();
+}
+
+//
+// Implement org.apache.jdo.store.StoreManager
+//
+
+/**
+* @see org.apache.jdo.store.StoreManager#getConnector
+*/
+public Connector getConnector() {
+return connector;
+}
+
+/**
+* @see 

svn commit: r158176 [32/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/VariableChecker.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/VariableChecker.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/VariableChecker.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/VariableChecker.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * VariableChecker.java
+ *
+ * Created on September 12, 2001
+ */
+
+package org.apache.jdo.impl.jdoql.jdoqlc;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.HashSet;
+
+import javax.jdo.JDOUnsupportedOptionException;
+import javax.jdo.JDOFatalInternalException;
+
+import org.apache.jdo.jdoql.JDOQueryException;
+import org.apache.jdo.util.I18NHelper;
+
+
+/**
+ * Checks variable declarations/application.
+ *
+ * @author  Michael Bouschen
+ * @version 0.1
+ */
+public class VariableChecker
+{
+/** I18N support */
+protected final static I18NHelper msg = I18NHelper.getInstance(
+org.apache.jdo.impl.jdoql.Bundle, 
VariableChecker.class.getClassLoader()); //NOI18N
+
+/**
+ * A VarInfo consists of two info fields:
+ * - constraint: the variable is constraint with the specified expr
+ * - used: the variable is used
+ */
+static class VarInfo
+{
+/**
+ * The constraint expression.
+ */
+JDOQLAST constraint;
+
+/**
+ * Set of JDOQLAST nodes denoting an access of this variable.
+ */
+Set used;
+
+/**
+ * Dependency for this variable. 
+ * The constraint for this variable may use another variable. 
+ */
+String dependsOn;
+
+/**
+ * Flag whether this varInfo is checked already (see checkConstraints)
+ */
+int status;
+
+static final int UNCHECKED = 0;
+static final int IN_PROGRESS = 1;
+static final int CHECKED = 2;
+
+VarInfo()
+{
+this.constraint = null;
+this.used = new HashSet();
+this.dependsOn = null;
+this.status = UNCHECKED;
+}
+
+VarInfo(VarInfo other)
+{
+this.constraint = other.constraint;
+this.used = new HashSet(other.used);
+this.dependsOn = other.dependsOn;
+this.status = other.status;
+}
+}
+
+/**
+ * Map of variable infos
+ */
+protected Map varInfos;
+
+/**
+ * Create an empty variable table
+ */
+public VariableChecker()
+{
+varInfos = new HashMap();
+}
+
+/**
+ * Create a variable table initialized with the entries of the other 
variable table.
+ * The constructor creates copies of the values stored in the map 
(instances of class VarInfo).
+ */
+public VariableChecker(VariableChecker other)
+{
+varInfos = new HashMap();
+for (Iterator i = other.varInfos.entrySet().iterator(); i.hasNext();) {
+Map.Entry entry = (Map.Entry)i.next();
+varInfos.put(entry.getKey(), new 
VarInfo((VarInfo)entry.getValue()));
+}
+}
+
+/**
+ * Creates a new entry in the variable table with the specified name as 
key and 
+ * an empty value.
+ */
+public void add(String name)
+{
+// init var entry as not constraint and unused
+varInfos.put(name, new VarInfo());
+}
+
+/**
+ * Mark the specified variable as used. 
+ * The method sets the info field of the VarInfo object to true.
+ */
+public void markUsed(JDOQLAST variable, String dependendVar)
+{
+String name = variable.getText();
+VarInfo entry = (VarInfo)varInfos.get(name);
+if (entry == null) {
+throw new JDOFatalInternalException(
+msg.msg(ERR_VariableCheckerUndefinedVariable, //NOI18N
+markUsed, name)); //NOI18N
+}
+entry.used.add(variable);
+if (dependendVar != null) {
+VarInfo dependendVarInfo = (VarInfo)varInfos.get(dependendVar);
+if 

svn commit: r158176 [31/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/Semantic.g
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/Semantic.g?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/Semantic.g 
(added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/jdoqlc/Semantic.g 
Fri Mar 18 17:02:29 2005
@@ -0,0 +1,1727 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * Semantic.g
+ *
+ * Created on August 28, 2001
+ */
+
+header
+{
+package org.apache.jdo.impl.jdoql.jdoqlc;
+
+import java.util.Collection;
+
+import org.apache.jdo.model.java.JavaType;
+import org.apache.jdo.model.java.JavaField;
+import org.apache.jdo.impl.model.java.ErrorType;
+import org.apache.jdo.impl.model.java.NullType;
+import org.apache.jdo.impl.model.java.PrimitiveType;
+import org.apache.jdo.impl.model.java.WrapperClassType;
+import org.apache.jdo.impl.model.java.PredefinedType;
+
+import org.apache.jdo.impl.jdoql.tree.*;
+import org.apache.jdo.impl.jdoql.scope.ParameterTable;
+import org.apache.jdo.impl.jdoql.scope.SymbolTable;
+import org.apache.jdo.impl.jdoql.scope.TypeNames;
+import org.apache.jdo.impl.jdoql.scope.VariableTable;
+
+import org.apache.jdo.util.I18NHelper; 
+}
+
+/**
+ * This class defines the semantic analysis of the JDOQL compiler.
+ * Input of this pass is the AST as produced by the parser,
+ * that consists of JDOQLAST nodes.
+ * The result is a typed JDOQLAST tree.
+ * p
+ * TBD:
+ * ul
+ * li Check for non portable contains queries
+ * /ul 
+ *
+ * @author  Michael Bouschen
+ */
+class Semantic extends TreeParser;
+
+options
+{
+importVocab = JDOQL;
+buildAST = true;
+defaultErrorHandler = false;
+ASTLabelType = JDOQLAST; //NOI18N
+}
+
+{
+/** The error message support class. */
+protected ErrorMsg errorMsg;
+
+/** Symbol table handling names of variables and parameters. */
+protected SymbolTable symtab;
+
+/** Table of type names handling imports. */
+protected TypeNames typeNames;
+
+/** The type support. */
+protected TypeSupport typeSupport;
+
+/** The query parameter table */
+protected ParameterTable paramtab;
+
+/** The variable table. */
+protected VariableTable vartab;
+
+/** The variable checker. */
+protected VariableChecker varChecker;
+
+/** Candidate class. */
+protected JavaType candidateClass; 
+
+/** I18N support */
+protected final static I18NHelper msg = I18NHelper.getInstance(
+org.apache.jdo.impl.jdoql.Bundle, Semantic.class.getClassLoader()); 
//NOI18N
+
+/**
+ *
+ */
+public void init(TypeSupport typeSupport, ParameterTable paramtab, 
+ VariableTable vartab, ErrorMsg errorMsg)
+{
+this.errorMsg = errorMsg;
+this.symtab = new SymbolTable();
+this.typeNames = new TypeNames(typeSupport);
+this.vartab = vartab;
+this.typeSupport = typeSupport;
+this.paramtab = paramtab;
+this.varChecker = new VariableChecker();
+}
+
+/**
+ *
+ */
+public void reportError(RecognitionException ex) {
+errorMsg.fatal(msg.msg(ERR_SemanticError), ex); //NOI18N
+}
+
+/**
+ *
+ */
+public void reportError(String s) {
+errorMsg.fatal(msg.msg(ERR_SemanticError) + s); //NOI18N
+}
+
+/**
+ * Combines partial ASTs into one query AST.
+ */
+public JDOQLAST createQueryTree(Class candidateClass, JDOQLAST importsAST, 
+JDOQLAST paramsAST, JDOQLAST varsAST, 
+JDOQLAST orderingAST, JDOQLAST filterAST)
+{
+CandidateClassImpl candidateClassAST = new CandidateClassImpl();
+candidateClassAST.setType(CANDIDATE_CLASS);
+candidateClassAST.setText(candidateClass.getName());
+candidateClassAST.setCandidateClass(candidateClass);
+JDOQLAST query = new NodeImpl();
+query.setType(QUERY_TREE);
+query.setText(query); //NOI18N
+query.addChild(candidateClassAST);
+if (importsAST != null)
+query.addChild(importsAST);
+if (paramsAST != 

svn commit: r158176 [24/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Main.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Main.java?view=autorev=158176
==
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Main.java 
(added)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/Main.java Fri 
Mar 18 17:02:29 2005
@@ -0,0 +1,472 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * Main.java
+ *
+ * Created on June 4, 2001, 9:59 AM
+ */
+
+package org.apache.jdo.impl.fostore;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import javax.jdo.JDOFatalInternalException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jdo.util.I18NHelper;
+
+/**
+ * Standalone server for FOStore databases.
+ * p
+ * This class is codepublic/code because it has a codemain/code entry
+ * point for running as a standalone program.
+ *
+ * @author  Craig Russell
+ * @version 1.0
+ */
+public class Main {
+   
+/** I18N support. */
+private static final I18NHelper msg = I18NHelper.getInstance(I18N.NAME);
+
+/** Logger */
+static final Log logger = LogFactory.getFactory().getInstance(
+org.apache.jdo.impl.fostore); // NOI18N
+
+/** The port number to use for incoming connections.
+ */
+int port;
+
+/** The backlog for Socket.listen.
+ */
+int backlog;
+
+/** Default backlog.
+ */
+private static final int DEFAULT_BACKLOG = 5;
+
+/** The number of seconds with no activity before shutting down.
+ */
+int timeout; 
+
+/** Default timeout.
+ */
+private static final int DEFAULT_TIMEOUT = 60;
+
+/** The root of the file system for database path names.
+ * Currently this property is ignored.
+ */
+String root = null;
+
+/** The time this server started running.
+ */
+final Date startTime = new Date();
+
+/** A flag indicating that the server is shutting down.
+ */
+static boolean shutdown = false;
+
+/** The synchronizing Object for the shutdown flag.
+ */
+static Object shutdownSynchronizer = new Object();
+
+/** The Thread responsible for detecting inactivity.
+ */
+static Thread timeoutThread = null;
+
+/** The Thread responsible for listening for incoming connection requests.
+ */
+Thread listenerThread = null;
+
+/** The set of Threads servicing incoming connections.
+ */
+HashSet serviceThreads = new HashSet ();
+
+/** Creates new Main */
+public Main () {
+}
+
+/** The main routine.
+ * @param args the command line arguments
+ */
+public static void main (String args[]) {
+if (args.length == 0) {
+usage();
+}
+Main main = new Main();
+main.run (args);
+}
+
+/** Print the usage message on standard output.
+ */
+static void usage () {
+// Turn int into a String to avoid having the formatter localize it by
+// (e.g., with EN_US) putting in a comma (i.e., print 9919, not 9,919).
+print(msg.msg(MSG_MainUsage1, // NOI18N
+  new 
Integer(FOStoreRemoteConnection.DEFAULT_PORT).toString()));
+print(msg.msg(MSG_MainUsage2, DEFAULT_BACKLOG)); // NOI18N
+print(msg.msg(MSG_MainUsage3, DEFAULT_TIMEOUT)); // NOI18N
+}
+
+/** Run the main program.
+ * @param args the command line arguments
+ */
+void run (String args[]) {
+boolean debug = logger.isDebugEnabled();
+if (debug) {
+logger.debug(FOStore Main started:  + startTime); // NOI18N
+}
+timeout = Integer.getInteger(
+timeout, DEFAULT_TIMEOUT).intValue(); // NOI18N
+port = Integer.getInteger(
+port, FOStoreRemoteConnection.DEFAULT_PORT).intValue(); // NOI18N
+backlog = Integer.getInteger(

svn commit: r158176 [11/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/core/Builder.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/core/Builder.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/core/Builder.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/core/Builder.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,4716 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.impl.enhancer.core;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Enumeration;
+
+import org.apache.jdo.impl.enhancer.classfile.AttributeVector;
+import org.apache.jdo.impl.enhancer.classfile.ClassField;
+import org.apache.jdo.impl.enhancer.classfile.ClassFile;
+import org.apache.jdo.impl.enhancer.classfile.CodeAttribute;
+import org.apache.jdo.impl.enhancer.classfile.ConstClass;
+import org.apache.jdo.impl.enhancer.classfile.ConstFieldRef;
+import org.apache.jdo.impl.enhancer.classfile.ConstNameAndType;
+import org.apache.jdo.impl.enhancer.classfile.ConstUtf8;
+import org.apache.jdo.impl.enhancer.classfile.ConstantPool;
+import org.apache.jdo.impl.enhancer.classfile.Descriptor;
+import org.apache.jdo.impl.enhancer.classfile.ExceptionRange;
+import org.apache.jdo.impl.enhancer.classfile.ExceptionTable;
+import org.apache.jdo.impl.enhancer.classfile.ExceptionsAttribute;
+import org.apache.jdo.impl.enhancer.classfile.Insn;
+import org.apache.jdo.impl.enhancer.classfile.InsnIInc;
+import org.apache.jdo.impl.enhancer.classfile.InsnInterfaceInvoke;
+import org.apache.jdo.impl.enhancer.classfile.InsnLookupSwitch;
+import org.apache.jdo.impl.enhancer.classfile.InsnTableSwitch;
+import org.apache.jdo.impl.enhancer.classfile.InsnTarget;
+import org.apache.jdo.impl.enhancer.classfile.InsnUtils;
+import org.apache.jdo.impl.enhancer.classfile.VMConstants;
+import org.apache.jdo.impl.enhancer.util.InternalError;
+import org.apache.jdo.impl.enhancer.util.Support;
+
+/**
+ * Helper object to create the generic JDO methods for a class.
+ */
+class Builder
+extends Support
+implements VMConstants, JDOConstants, EnhancerConstants
+{
+/**
+ * The augmentation controller for this class.
+ */
+private final Augmenter augmenter;
+
+/**
+ * The class analyzer for this class.
+ */
+private final Analyzer analyzer;
+
+/**
+ * The classfile to be annotated.
+ */
+private final ClassFile classFile;
+
+/**
+ * The class name in VM form.
+ */
+private final String className;
+
+/**
+ * The class name in user ('.' delimited) form.
+ */
+private final String userClassName;
+
+/**
+ * The classfile's constant pool.
+ */
+private final ConstantPool pool;
+
+/**
+ * Repository for the enhancement options.
+ */
+private final Environment env;
+
+/**
+ * The constant utf8 string for the CodeAttribute.
+ */
+private ConstUtf8 codeAttributeUtf8;
+/**
+
+ * The constant field ref for the jdoStateManager field.
+ */
+private ConstFieldRef jdoStateManagerFieldRef;
+
+/**
+ * The constant field ref for the jdoFlags field.
+ */
+private ConstFieldRef jdoFlagsFieldRef;
+
+/**
+ * The constant field ref for the jdoFieldNames field.
+ */
+private ConstFieldRef jdoFieldNamesFieldRef;
+
+/**
+ * The constant field ref for the jdoFieldTypes field.
+ */
+private ConstFieldRef jdoFieldTypesFieldRef;
+
+/**
+ * The constant field ref for the jdoFieldFlags field.
+ */
+private ConstFieldRef jdoFieldFlagsFieldRef;
+
+/**
+ * The constant field ref for the jdoPersistenceCapableSuperclass field.
+ */
+private ConstFieldRef jdoPersistenceCapableSuperclassFieldRef;
+
+/**
+ * The constant field refs for the annotated fields sorted by their
+ * relative field index.
+ */
+private ConstFieldRef[] annotatedFieldRefs;
+
+/**
+ * The constant field refs for the key fields sorted by
+ * ascending relative field index.
+ */
+private ConstFieldRef[] keyFieldRefs;
+
+/**
+ * The constant field refs on the key class for the key fields sorted by
+ * ascending relative 

svn commit: r158179 [49/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/SignInversion.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/SignInversion.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/SignInversion.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/SignInversion.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.query.operators;
+
+import java.util.Collection;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PrimitiveTypes;
+import org.apache.jdo.tck.query.QueryTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *BTitle:/B Sign Inversion Query Operator
+ *BR
+ *BKeywords:/B query
+ *BR
+ *BAssertion ID:/B A14.6.2-29.
+ *BR
+ *BAssertion Description: /B
+The numeric sign inversion operator (code-/code) is supported for all types
+as they are defined in the Java language. This includes the following types:
+UL
+LIcodebyte, short, int, long, char, Byte, Short Integer, Long, 
Character/code/LI
+LIcodefloat, double, Float, Double/code/LI
+LIcodeBigDecimal, BigInteger/code/LI/UL
+The operation on object-valued fields of wrapper types (codeBoolean, Byte,
+Short, Integer, Long, Float/code, and codeDouble/code), and numeric types
+(codeBigDecimal/code and codeBigInteger/code)
+use the wrapped values as operands.
+
+ */
+
+public class SignInversion extends QueryTest {
+
+/** */
+private static final String ASSERTION_FAILED = 
+Assertion A14.6.2-29 (SignInversion) failed: ;
+
+/**
+ * The codemain/code is called when the class
+ * is directly executed from the command line.
+ * @param args The arguments passed to the program.
+ */
+public static void main(String[] args) {
+BatchTestRunner.run(SignInversion.class);
+}
+
+/** */
+public void test() {
+pm = getPM();
+
+try {
+loadPrimitiveTypes(pm);
+runTest(pm);
+}
+finally {
+cleanupDatabase(pm, PrimitiveTypes.class);
+pm.close();
+pm = null;
+}
+}
+
+/** */
+void runTest(PersistenceManager pm) {
+Transaction tx = pm.currentTransaction();
+tx.begin();
+
+Collection instance9 = (Collection)pm.newQuery(
+PrimitiveTypes.class, id == 9).execute();
+Collection allOddInstances = (Collection)pm.newQuery(
+PrimitiveTypes.class, booleanNull).execute();
+
+runSimplePrimitiveTypesQuery(-id == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-byteNotNull == -9,
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-shortNotNull == -9, 
+ pm, instance9, ASSERTION_FAILED); 
   
+runSimplePrimitiveTypesQuery(-intNotNull == -9, 
+ pm, instance9, ASSERTION_FAILED); 
   
+runSimplePrimitiveTypesQuery(-longNotNull == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-floatNotNull == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-doubleNotNull == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-byteNull == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-shortNull == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-intNull == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-longNull == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-floatNull == -9, 
+ pm, instance9, ASSERTION_FAILED);
+runSimplePrimitiveTypesQuery(-doubleNull == 

svn commit: r158179 [39/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/QueryWithNoFilter.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/QueryWithNoFilter.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/QueryWithNoFilter.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/QueryWithNoFilter.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.query;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *BTitle:/B Query with no Filter
+ *BR
+ *BKeywords:/B query
+ *BR
+ *BAssertion ID:/B A14.6.2-1.
+ *BR
+ *BAssertion Description: /B If the codeQuery/code filter is not
+ *specified, then it defaults to codetrue/code, which has the effect of
+ *filtering the input codeCollection/code only for class type.
+ */
+
+public class QueryWithNoFilter extends QueryTest {
+
+/** */
+private static final String ASSERTION_FAILED = 
+Assertion A14.6.2-1 (QueryWithNoFilter) failed: ;
+
+/**
+ * The codemain/code is called when the class
+ * is directly executed from the command line.
+ * @param args The arguments passed to the program.
+ */
+public static void main(String[] args) {
+BatchTestRunner.run(QueryWithNoFilter.class);
+}
+
+/** */
+public void test() {
+pm = getPM();
+
+initDatabase(pm, PCPoint.class);
+runTestQueryWithNoFilter(pm);
+
+pm.close();
+pm = null;
+}
+
+/** */
+void runTestQueryWithNoFilter(PersistenceManager pm) {
+if(debug) logger.debug(\nExecuting test QueryWithNoFilter() ...);
+
+Transaction tx = pm.currentTransaction();
+try {
+tx.begin();
+
+Query query = pm.newQuery();
+query.setClass(PCPoint.class);
+query.setCandidates(pm.getExtent(PCPoint.class, false));
+Object results = query.execute();
+
+// check query result
+List expected = new ArrayList();
+Object p1 = new PCPoint(0, 0);
+Object p2 = new PCPoint(1, 1);
+Object p3 = new PCPoint(2, 2);
+Object p4 = new PCPoint(3, 3);
+Object p5 = new PCPoint(4, 4);
+expected.add(p1);
+expected.add(p2);
+expected.add(p3);
+expected.add(p4);
+expected.add(p5);
+expected = getFromInserted(expected);
+printOutput(results, expected);
+checkQueryResultWithoutOrder(ASSERTION_FAILED, results, expected);
+
+tx.commit();
+tx = null;
+}
+finally {
+if ((tx != null)  tx.isActive())
+tx.rollback();
+}
+}
+}

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/RestoredSerializedQueryInstanceLosesAssociationWithPM.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2005 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 
+ * 

svn commit: r158179 [42/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.query.operators;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.query.QueryTest;
+import org.apache.jdo.tck.pc.mylib.PrimitiveTypes;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *BTitle:/B Equality and Comparisons Between Primitives and Wrapper
+ Instances
+ *BR
+ *BKeywords:/B query
+ *BR
+ *BAssertion ID:/B A14.6.2-3.
+ *BR
+ *BAssertion Description: /B Equality and ordering comparisons between 
+ * primitives and instances of wrapper classes are valid in a 
codeQuery/code
+ * filter.
+ */
+
+public class EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances 
+extends QueryTest {
+
+/** */
+private static final String ASSERTION_FAILED = 
+Assertion A14.6.2-3 
(EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances) failed: ;
+
+/**
+ * The codemain/code is called when the class
+ * is directly executed from the command line.
+ * @param args The arguments passed to the program.
+ */
+public static void main(String[] args) {
+
BatchTestRunner.run(EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.class);
+}
+
+/** */
+public void test() {
+pm = getPM();
+
+try {
+loadPrimitiveTypes(pm);
+runTest(pm);
+}
+finally {
+cleanupDatabase(pm, PrimitiveTypes.class);
+pm.close();
+pm = null;
+}
+}
+
+/** */
+void runTest(PersistenceManager pm) {
+Transaction tx = pm.currentTransaction();
+tx.begin();
+
+Collection instance9 = (Collection)pm.newQuery(
+PrimitiveTypes.class, id == 9).execute();
+Collection instancesLess3 = (Collection)pm.newQuery(
+PrimitiveTypes.class, id  3).execute();
+Collection allOddInstances = (Collection)pm.newQuery(
+PrimitiveTypes.class, booleanNull).execute();
+Collection allInstances = (Collection)pm.newQuery(
+PrimitiveTypes.class, true).execute();
+Collection empty = new HashSet();
+
+// case Integer == int
+runSimplePrimitiveTypesQuery(intNull == 9, 
+ pm, instance9, ASSERTION_FAILED); 
+
+// case Integer == long
+runSimplePrimitiveTypesQuery(intNull == 9L, 
+ pm, instance9, ASSERTION_FAILED); 
+
+// case char == Character
+runSimplePrimitiveTypesQuery('O' == charNull, 
+ pm, allOddInstances, ASSERTION_FAILED); 
+
+// case int = Integer
+runParameterPrimitiveTypesQuery(
+intNotNull = param, java.lang.Integer param, new Integer(2),
+pm, instancesLess3, ASSERTION_FAILED); 
+
+// case Double  double
+runSimplePrimitiveTypesQuery(doubleNull  0.0, 
+ pm, allInstances, ASSERTION_FAILED); 
+
+tx.commit();
+}
+}

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java?view=autorev=158179
==
--- 

svn commit: r158176 [36/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/Bundle.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/Bundle.properties?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/Bundle.properties
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/Bundle.properties
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,104 @@
+#
+# Copyright 2005 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.
+
+#
+# Generic messages
+#
+
+# {0} - location (class.method)
+#NOI18N
+ERR_InvalidNullFieldInstance={0}: specified Field instance is null.
+
+
+# {0} - class name
+# {1} - detailed message of the cause
+EXC_ClassLoadingError=Error during loading of class ''{0}'': {1}.
+
+#
+# ReflectionJavaType
+#
+
+# {0} - error location (class.method)
+#NOI18N
+ERR_InvalidNullClassInstance={0}: specified Class instance is null.
+
+#
+# ReflectionJavaField
+#
+# {0} - class name
+EXC_CannotGetDeclaredField=A SecurityException was thrown when trying to \
+get a declared field of class ''{0}''.  You must grant \
+java.lang.RuntimePermission(accessDeclaredMembers) to the codeBase \
+containing the JDO Reference Implementation (jdori.jar).
+
+#
+# AbstractJavaModelFactory
+#
+
+# {0} - class name
+# {1} - method name
+EXC_MethodNotSupported=Class {0} does not support method {1}.
+
+EXC_CannotCreateJavaModel=Problems during JavaModel creation.
+
+#
+# ReflectionJavaField
+#
+#NOI18N
+ERR_MissingFieldInstance={0}: cannot find reflection field instance for field 
{1}.
+
+
+#
+# RuntimeJavaModelFactory
+#
+
+EXC_CannotGetJDOImplHelper=A SecurityException was thrown when trying to get \
+the singleton JDOImplHelper instance. In order to get runtime metadata, you \
+must grant javax.jdo.spi.JDOPermission(getMetadata) to the codeBases \
+containing the JDO Reference Implementation (jdo.jar and jdori.jar).
+
+EXC_CannotGetRuntimeJavaModelFactory=A SecurityException was thrown when 
trying \
+to get the singleton RuntimeJavaModelFactory instance. In order to get runtime 
\
+metadata, you must grant javax.jdo.spi.JDOPermission(getMetadata) to the \
+codeBases containing the JDO Reference Implementation (jdo.jar and jdori.jar).
+
+# {0} - class instance
+EXC_CannotGetClassLoader=A SecurityException was thrown when trying to get the 
\
+class loader of class instance ''{0}''. In order to get runtime metadata, you \
+must grant ReflectPermission(getClassLoader) to the codeBase containing the \
+JDO Reference Implementation (jdori.jar).
+
+# {0} - key instance
+EXC_InvalidJavaModelKey=Invalid key for runtime JavaModel lookup: \
+expected ''java.lang.ClassLoader'' instance, found ''{0}'' instance.
+
+# {0} - type description instance
+EXC_InvalidTypeDesc=Invalid type description for runtime JavaType lookup: \
+expected ''java.lang.Class'' instance, found ''{0}'' instance.
+
+# {0} - JavaType instance
+EXC_InvalidJavaType=Invalid JavaType instance for getJavaClass method: \
+expected ''org.apache.jdo.impl.model.java.ReflectionJavaType'' instance, \
+found ''{0}'' instance.
+
+#
+# RuntimeJavaType
+#
+
+# {0} - error location (class.method)
+# {1} - implementation method name
+# {2} - field name
+#NOI18N
+ERR_MultipleJavaField={0}: multiple JavaField ''{1}'' for class '{2}''.

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/ErrorType.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/ErrorType.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/ErrorType.java 
(added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/model/java/ErrorType.java 
Fri Mar 18 17:02:29 2005
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2005 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. 
+ * 

svn commit: r158176 [20/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStoreConnectionFactory.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStoreConnectionFactory.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStoreConnectionFactory.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/FOStoreConnectionFactory.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,715 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.impl.fostore;
+
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.UnknownHostException;
+import java.net.ConnectException;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.jdo.JDOFatalException;
+import javax.jdo.JDOFatalInternalException;
+import javax.jdo.JDOFatalDataStoreException;
+import javax.jdo.JDOUserException;
+import javax.jdo.JDOFatalUserException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jdo.pm.Accessor;
+import org.apache.jdo.util.I18NHelper;
+import org.apache.jdo.util.Pool;
+
+/**
+ * A connection factory for FOStore.  Allows both same- and remote-address
+ * space connections.  For the same address space-connections, the URL must
+ * not include the Host (Server) parameter.  For remote address space
+ * connections, the URL's protocol is ignored.
+ * p
+ * This class is codepublic/code so that clients can create instances of it
+ * with codenew/code.
+ *
+ * @author Dave Bristor
+ */
+public class FOStoreConnectionFactory implements Serializable {
+private String url;
+private String userName;
+private String password;
+private String driverName;
+private boolean create;
+
+private FOStorePMF pmf;
+
+private int loginTimeout;
+
+private transient PrintWriter logWriter;
+
+/** Connections are created by the FOStoreURLStreamHandler.
+ */
+private final FOStoreURLStreamHandler streamHandler = 
+FOStoreURLStreamHandler.getInstance();
+
+/** Connections are pooled.  Each unique combination of url, 
+ * user, password has its own pool.  The hashmap associates 
+ * a FOStoreConnectionId with its pool of connections.
+ */
+private final HashMap connectionMap = new HashMap();
+
+/** For now, set the pool size to 1.
+ */
+// XXX this needs to be configurable...
+private static final int poolSize = 1;
+
+private FOStoreConnectionId defaultConnectionId;
+
+private FOStoreConnectionId userConnectionId;
+
+/** True until setConfigured has been invoked.  Allows properties to be
+ * set if true.
+ */
+private boolean configurable = true;
+
+/** This table maps from names to CFAccessors.  The names are the same as 
the
+ * persistence manager factory's property names, but with 
+ * org.apache.jdo.FOStoreConnectionFactory.option prepended.
+ */
+protected static HashMap CFpropsAccessors = new HashMap(9);
+
+/** I18N support. */
+private static final I18NHelper msg = I18NHelper.getInstance(I18N.NAME);
+
+/** Logger */
+static final Log logger = LogFactory.getFactory().getInstance(
+org.apache.jdo.impl.fostore); // NOI18N
+
+/**
+ * First time a FOStoreConnectionFactory is created, initialize accessors
+ * which are used to store/save instances via JNDI.
+ */
+public FOStoreConnectionFactory() {
+if (logger.isDebugEnabled()) logger.debug(FOCF()); // NOI18N
+initPropsAccessors();
+}
+
+/** Set the url, user, and password into the ConnectionIds for this
+ * connection factory.
+ */
+private void setConfigured() {
+if (logger.isDebugEnabled()) {
+logger.debug(FOCF.setConfigured: URL:  + url); // NOI18N
+}
+configurable = false;
+defaultConnectionId =
+new FOStoreConnectionId(url, userName, password, create);
+userConnectionId = new 

svn commit: r158176 [65/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/Test_EmpDeptSerialization.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/Test_EmpDeptSerialization.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/Test_EmpDeptSerialization.java
 (added)
+++ 
incubator/jdo/trunk/ri11/test/java/org/apache/jdo/test/Test_EmpDeptSerialization.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,257 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * Test_EmpDeptSerialization.java
+ *
+ * Created on June 29, 2001, 3:37 PM
+ */
+
+package org.apache.jdo.test;
+
+import java.util.*;
+import java.io.*;
+
+import javax.jdo.*;
+
+import org.apache.jdo.test.util.AbstractTest;
+import org.apache.jdo.test.util.JDORITestRunner;
+
+import org.apache.jdo.impl.fostore.FOStorePMF;
+import org.apache.jdo.pc.empdept.PCDepartment;
+import org.apache.jdo.pc.empdept.PCEmployee;
+import org.apache.jdo.pc.empdept.PCFullTimeEmployee;
+import org.apache.jdo.pc.empdept.PCInsurance;
+import org.apache.jdo.pc.empdept.PCPartTimeEmployee;
+import org.apache.jdo.pc.empdept.PCProject;
+
+/** This class measures the difference between Serialization and JDO as a
+ * persistence strategy.  
+ * Some number of instances are created, and then the test starts timing.
+ * First the objects are serialized; then a transaction is started, the 
+ * objects are made persistent in JDO, and the transaction is committed.
+ *
+ * @author  Craig Russell
+ * @version 1.0
+ */
+public class Test_EmpDeptSerialization extends AbstractTest {
+
+ArrayList allObjects = new ArrayList();
+PCEmployee scott;
+PCEmployee ed;
+PCInsurance scottIns;
+PCInsurance edIns;
+PCDepartment board;
+PCDepartment emg;
+PCProject solaris;
+PCProject sparc;
+
+/**
+ * @param args the command line arguments
+ */
+public static void main (String args[]) {
+switch (args.length) {
+case 0:
+JDORITestRunner.run(Test_EmpDeptSerialization.class);
+break;
+case 2:
+runLocal(args[0], args[1]);
+break;
+default: 
+System.err.println (usage: \nTest_EmpDeptSerialization url 
file\n\turl: the url for fostore\n\tfile: the file name for 
serialization);
+break;
+}
+}
+
+/** */
+public void test() throws Exception {
+doTest(serialize.tmp);
+}
+
+/** Run the test.  */
+void doTest(String fileName) throws Exception {
+createObjects();
+long serializeTime = serializeObjects(fileName);
+long fostoreTime = persistObjects();
+}
+
+/** */
+void createObjects() {
+HashSet h;
+
+// Create and set up employees.  Scott is Ed's manager.  Ed is
+// Scott's sole employee.
+//
+GregorianCalendar born =
+new GregorianCalendar(TimeZone.getTimeZone(America/New_York));
+GregorianCalendar hired =
+new GregorianCalendar(TimeZone.getTimeZone(America/New_York));
+
+born.set(1969, 7, 20);
+hired.set(1982, 5, 5);
+scott =
+new PCFullTimeEmployee(
+Scott, McNealy, born.getTime(), 
+1L, hired.getTime(), 
+//null, null, null, null, null,
+20.0);
+born.set(1960, 4, 8);
+hired.set(1985, 2, 3);
+ed = 
+new PCPartTimeEmployee(
+Ed, Zander, born.getTime(), 
+100L, hired.getTime(), 
+//null, null, null, null, null,
+400.0); 
+allObjects.add(ed);
+allObjects.add(scott);
+ed.setManager(scott);
+
+h = new HashSet();
+h.add(ed);
+scott.setEmployees(h);
+
+// Set up their departments.
+board =
+new PCDepartment(100L, board);
+h = new HashSet();
+h.add(scott);
+board.setEmployees(h);
+scott.setDepartment(board);
+
+emg =
+new PCDepartment(200L, emg);
+h = new HashSet();
+h.add(ed);
+emg.setEmployees(h);
+ed.setDepartment(emg);
+
+// Insure these guys
+scottIns = new PCInsurance(1000, Aetna, scott);
+

svn commit: r158176 [55/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Propchange: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModel.mdl
--
svn:executable = *

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModelFactory.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModelFactory.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModelFactory.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaModelFactory.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.model.java;
+
+import org.apache.jdo.model.ModelException;
+import org.apache.jdo.model.ModelFatalException;
+
+/**
+ * The JavaModelFactory is the interface to use to obtain JavaModel
+ * instances. It defines methods to create and retrieve JavaModel
+ * instances. Furthermore it defines a convenience method to retrieve a
+ * JavaType by an implementation specific type description. 
+ * 
+ * @author Michael Bouschen
+ * @since JDO 1.0.1
+ */
+public interface JavaModelFactory 
+{
+/**
+ * Creates a new empty JavaModel instance. A factory implementation may
+ * use the specified key when caching the new JavaModel instance. 
+ * p
+ * Each JavaModelFactory imposes its own restrictions for the keys to
+ * cache JavaModel instances. Some implementations will allow only keys
+ * of a certain type. Some implementations will prohibit
+ * codenull/code keys. Attempting to use an ineligible key will
+ * result in a [EMAIL PROTECTED] org.apache.jdo.model.ModelException}. 
This means
+ * the specified key is of an inappropriate type for this
+ * JavaModelFactory or if the key is codenull/code and this 
+ * JavaModelFactory does not support codenull/code keys.
+ * @param key the key that may be used to cache the returned JavaModel
+ * instance. 
+ * @return a new JavaModel instance.
+ * @exception ModelException if impossible; the key is of an
+ * inappropriate type or the key is codenull/code and this
+ * JavaModelFactory does not support codenull/code keys.
+ */
+public JavaModel createJavaModel(Object key)
+throws ModelException;
+
+/**
+ * Returns the JavaModel instance for the specified key.
+ * p
+ * The method throws a [EMAIL PROTECTED] 
org.apache.jdo.model.ModelFatalException},
+ * if the specified key is of an inappropriate type for this
+ * JavaModelFactory or if the key is codenull/code and this
+ * JavaModelFactory does not support codenull/code keys.
+ * @param key the key used to cache the returned JavaModel instance.
+ * @return a JavaModel instance for the specified key.
+ * @exception ModelFatalException the key is of an inappropriate type
+ * or the key is codenull/code and this JavaModelFactory does not
+ * support codenull/code keys.
+ */
+public JavaModel getJavaModel(Object key)
+throws ModelFatalException;
+
+/**
+ * Returns a JavaType instance for the specified type description
+ * (optional operation). This method is a convenience method and a
+ * short cut for codegetJavaModel(key).getJavaType(typeName)/code. 
+ * If the factory supports this method, it needs to be able to get the
+ * key for the JavaModel lookup and the type name for the JavaType
+ * lookup from the specified typeDesc. An example for such an type
+ * description is the java.lang.Class instance in the runtime
+ * environment. 
+ * p
+ * The method throws a [EMAIL PROTECTED] 
org.apache.jdo.model.ModelFatalException}, 
+ * if this factory does not support this short cut or if it does not
+ * support the specified type description.
+ * @param typeDesc the type description.
+ * @return a JavaType instance for the specified type.
+ * @exception ModelFatalException this factory does not support this
+ * short cut or does not support the specified type description.
+ */
+public JavaType getJavaType(Object typeDesc)
+throws ModelFatalException;
+}

Added: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/model/java/JavaType.java
URL: 

svn commit: r158176 [44/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/sco/Date.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/sco/Date.java?view=autorev=158176
==
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/sco/Date.java (added)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/sco/Date.java Fri Mar 
18 17:02:29 2005
@@ -0,0 +1,247 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.impl.sco;
+
+import javax.jdo.JDOHelper;
+
+import org.apache.jdo.sco.SCO;
+import org.apache.jdo.sco.SCODate;
+import org.apache.jdo.state.StateManagerInternal;
+
+
+
+/**
+ * A mutable 2nd class object that represents java.util.Date.
+ * @author Marina Vatkina
+ * @version 1.0
+ * @see java.util.Date
+ */
+public class Date extends java.util.Date implements SCODate {
+
+private transient StateManagerInternal owner;
+
+private transient int fieldNumber = -1;
+
+private final static String _Date = Date; // NOI18N
+
+/**
+ * Creates a codeDate/code object that represents the time at which
+ * it was allocated.
+ */
+public Date() {
+super();
+}
+
+/**
+ * Creates a codeDate/code object that represents the given time
+ * in milliseconds.
+ * @param date  the number of milliseconds
+ */
+public Date(long date) {
+super(date);
+}
+
+/**
+ * Sets the ttDate/tt object to represent a point in time that is
+ * tttime/tt milliseconds after January 1, 1970 00:00:00 GMT.
+ *   
+ * @param   time   the number of milliseconds.
+ * @see java.util.Date
+ */  
+public void setTime(long time) {
+SCOHelper.debug(_Date, setTime); // NOI18N
+
+this.makeDirty();
+super.setTime(time);
+}
+
+/**
+ * Creates and returns a copy of this object.
+ *
+ * PMutable Second Class Objects are required to provide a public
+ * clone method in order to allow for copying PersistenceCapable
+ * objects. In contrast to Object.clone(), this method must not throw a
+ * CloneNotSupportedException.
+ */
+public Object clone() {
+SCOHelper.debug(_Date, clone); // NOI18N
+
+Object obj = super.clone();
+if (obj instanceof SCO) 
+((SCO)obj).unsetOwner(owner, fieldNumber);
+
+return obj;
+}
+
+/** ---Depricated Methods--*/
+
+/**
+ * Sets the year of this ttDate/tt object to be the specified
+ * value plus 1900. 
+ *   
+ * @param   yearthe year value.
+ * @see java.util.Calendar
+ * @see java.util.Date
+ * @deprecated As of JDK version 1.1,
+ * replaced by codeCalendar.set(Calendar.YEAR, year + 1900)/code.
+ */  
+public void setYear(int year) {
+SCOHelper.debug(_Date, setYear); // NOI18N
+
+this.makeDirty();
+super.setYear(year);
+}  
+
+/**
+ * Sets the month of this date to the specified value.  
+ * @param   month   the month value between 0-11.
+ * @see java.util.Calendar
+ * @see java.util.Date
+ * @deprecated As of JDK version 1.1,
+ * replaced by codeCalendar.set(Calendar.MONTH, int month)/code.
+ */
+public void setMonth(int month) {
+SCOHelper.debug(_Date, setMonth); // NOI18N
+
+this.makeDirty();
+super.setMonth(month);
+}
+
+/**
+ * Sets the day of the month of this ttDate/tt object to the
+ * specified value. 
+ *   
+ * @param   date   the day of the month value between 1-31.
+ * @see java.util.Calendar
+ * @see java.util.Date
+ * @deprecated As of JDK version 1.1,
+ * replaced by codeCalendar.set(Calendar.DAY_OF_MONTH, int date)/code.
+ */  
+public void setDate(int date) {
+SCOHelper.debug(_Date, setDate); // NOI18N
+
+this.makeDirty();
+super.setDate(date);
+} 
+
+/**
+ * Sets the hour of this ttDate/tt object to the specified value.
+ *   
+ * @param   hours   the hour value.
+ * @see java.util.Calendar
+ * @see java.util.Date
+ * @deprecated As of JDK version 1.1,
+ * replaced by codeCalendar.set(Calendar.HOUR_OF_DAY, int hours)/code.
+ */  
+public void setHours(int hours) {
+   

svn commit: r158176 [42/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerImpl.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerImpl.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerImpl.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,2173 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * PersistenceManagerImpl.java
+ *
+ * Created on December 1, 2000
+ */
+
+package org.apache.jdo.impl.pm;
+
+import java.util.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import java.lang.reflect.Constructor;
+import javax.transaction.Status;
+
+import javax.jdo.*;
+import javax.jdo.spi.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jdo.impl.jdoql.QueryImpl;
+import org.apache.jdo.impl.model.java.runtime.RuntimeJavaModelFactory;
+import org.apache.jdo.model.java.JavaModel;
+import org.apache.jdo.model.java.JavaType;
+import org.apache.jdo.model.jdo.JDOClass;
+import org.apache.jdo.pm.PersistenceManagerFactoryInternal;
+import org.apache.jdo.pm.PersistenceManagerInternal;
+import org.apache.jdo.sco.SCOCollection;
+import org.apache.jdo.sco.SCOMap;
+import org.apache.jdo.state.StateManagerInternal;
+import org.apache.jdo.store.StoreManager;
+import org.apache.jdo.util.I18NHelper;
+import org.apache.jdo.util.JDORIVersion;
+
+/** 
+ * This is the StoreManager independent implemetation of the 
+ * org.apache.jdo.pm.PersistenceManagerInternal interface. Delegates most of 
+ * the method execution to the corresponding instance of the CacheManagerImpl.
+ * 
+ * @author Marina Vatkina
+ */ 
+public class PersistenceManagerImpl implements PersistenceManagerInternal {
+private final boolean DEBUG = true;
+
+/**
+ * True if this PersistenceManager is closed
+ */
+private boolean _isClosed = true;
+
+/**
+ * Associated Transaction
+ */
+private TransactionImpl _transaction = null;
+
+/**
+ *  Reference to the associated JTA Transaction if any
+ */
+private Object _jta = null;
+
+/**
+ * Current PersistenceManagerWrapper as PersistenceManagerInternal
+ */
+private PersistenceManagerWrapper current = null;
+
+/**
+ * PersistenceManagerFactory that created (and could be pooling)
+ * this PersistenceManager
+ */
+private PersistenceManagerFactoryImpl pmf = null;
+
+/**
+ * Reference to the CacheManager
+ */
+private CacheManagerImpl _txCache = null;
+
+/**
+ * Flag for Query. 
+ * Constructor defaults it to the PMF setting.
+ */
+private boolean _ignoreCache;
+
+/**
+ * Flag for active transaction
+ */
+private boolean _activeTransaction = false;
+
+/**
+ * Flag for optimistic transaction
+ */
+private boolean optimistic = true;
+
+/**
+ * Flag for multithreaded support.
+ */
+private boolean multithreaded = true;
+
+/**
+ * User Object
+ */
+private Object _userObject = null;
+
+/**
+ * Flag for flushing process
+ */
+private boolean _flushing = false;
+
+/**
+ * This is the ClassLoader that was the
+ * Thread.currentThread().getContextClassLoader()
+ * at the time this PersistenceManagerImpl was created.
+ */
+private final ClassLoader myClassLoader;
+
+/**
+ * Constructor signatures 
+ */
+private static final Class[] sigSCO_Short = new Class []{
+java.lang.Object.class,
+java.lang.String.class};
+
+/** The signature for SCO  Collections.
+ */
+private static final Class[] sigSCO_Collection = new Class []{
+java.lang.Class.class,
+boolean.class,
+int.class};
+
+/** The signature for SCO  Maps.
+ */
+private static final Class[] sigSCO_Map = new Class []{
+java.lang.Class.class,
+java.lang.Class.class,
+boolean.class,
+int.class};
+
+/** The signature for SCO HashSet.
+ */
+private static final Class[] sigSCO_HashSet = new Class []{
+

svn commit: r158176 [41/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerFactoryImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerFactoryImpl.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerFactoryImpl.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/pm/PersistenceManagerFactoryImpl.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,1677 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * PersistenceManagerFactoryImpl.java
+ *
+ * Created on December 1, 2000
+ */
+ 
+package org.apache.jdo.impl.pm;
+
+import java.util.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import javax.jdo.*;
+import javax.jdo.spi.JDOPermission;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.jdo.ejb.EJBImplHelper;
+import org.apache.jdo.impl.jdoql.tree.Tree;
+import org.apache.jdo.impl.model.java.runtime.RuntimeJavaModelFactory;
+import org.apache.jdo.jdoql.tree.QueryTree;
+import org.apache.jdo.model.jdo.JDOClass;
+import org.apache.jdo.pm.Accessor;
+import org.apache.jdo.pm.PersistenceManagerFactoryInternal;
+import org.apache.jdo.util.I18NHelper;
+import org.apache.jdo.util.JDORIVersion;
+
+/** 
+ * This is an abstract PersistenceManagerFactoryImpl class that provides the 
+ * StoreManager independent implementation of javax.jdo.PersistenceManager
+ * interface. 
+ * p
+ * Subclasses must override the following methods declared abstract:
+ * ul
+ * li [EMAIL PROTECTED] #getOptionArray()}
+ * li [EMAIL PROTECTED] #createPersistenceManager(String userid, String 
password)}
+ * li [EMAIL PROTECTED] #setPMFClassProperty (Properties props)}
+ * li [EMAIL PROTECTED] #encrypt(String s)}
+ * li [EMAIL PROTECTED] #decrypt(String s)}
+ * li [EMAIL PROTECTED] #setCFProperties(Properties p)}
+ * li [EMAIL PROTECTED] #getCFFromProperties(Properties p)}
+ * li [EMAIL PROTECTED] #isConnectionFactoryConfigured()}
+ * li and all methods from 
org.apache.jdo.pm.PersistenceManagerFactoryInternal.
+ * /ul 
+ *
+ * @author  Marina Vatkina
+ * @version 0.1
+ */
+
+abstract public class PersistenceManagerFactoryImpl implements 
+PersistenceManagerFactoryInternal {
+
+//
+// PersistenceManagerFactory properties
+//
+private String URL = null;
+private String userName = null;
+protected String password = null;
+private String driverName = null;
+
+private Object connectionFactory = null;
+private String connectionFactoryName = null;
+
+private Object connectionFactory2 = null;
+private String connectionFactory2Name = null;
+
+private boolean multithreaded = false;
+
+private boolean optimistic = true;
+private boolean retainValues = true;
+private boolean restoreValues = true;
+private boolean nontransactionalRead = true;
+private boolean nontransactionalWrite = false;
+private boolean ignoreCache = true;
+
+private int queryTimeout = 0;
+private int updateTimeout = 0;
+
+private int minPool = 1;
+private int maxPool = 1;
+private int msWait = 0;
+
+/** Cached hashCode for this PMF.  Changes every time a property of this
+* PMF is changed to a non-default value.  Fixed after setConfigured()
+* (mostly).
+* @see #setConfigured()
+* @see #setNonconfigured()
+*/
+private int myHashCode;
+
+//
+// Once false, attempts to change properties above will fail (see
+// assertConfigurable).
+//
+private boolean configurable = true;
+
+
+//
+// The PMF is serialized in one of 3 forms, depending on how it is
+// configured.
+//
+private static final int PERSIST_CF = 1;
+private static final int PERSIST_CF_NAME = 2;
+private static final int PERSIST_PROPS = 3;
+
+/** These are used for implementing close().
+ */
+protected boolean closed = false;
+
+/** The closeLock protects the close flag and pmSet.
+ */
+protected Object closeLock = new Object();
+
+/** The set of all PersistenceManagers that are not closed.  In order
+ * for this to work, it is important that PersistenceManager implement
+ * equals to be equivalent to 

svn commit: r158176 [29/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/QueryImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/QueryImpl.java?view=autorev=158176
==
--- incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/QueryImpl.java 
(added)
+++ incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/QueryImpl.java 
Fri Mar 18 17:02:29 2005
@@ -0,0 +1,732 @@
+/*
+ * Copyright 2005 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.
+ */
+
+/*
+ * QueryImpl.java
+ *
+ * Created on August 31, 2001
+ */
+
+package org.apache.jdo.impl.jdoql;
+
+import java.io.IOException;
+import java.util.*;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.Query;
+import javax.jdo.Extent;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.impl.jdoql.jdoqlc.JDOQLAST;
+import org.apache.jdo.impl.jdoql.jdoqlc.JDOQLC;
+import org.apache.jdo.impl.jdoql.scope.ParameterTable;
+import org.apache.jdo.impl.jdoql.scope.VariableTable;
+import org.apache.jdo.impl.jdoql.tree.Tree;
+import org.apache.jdo.jdoql.JDOQueryException;
+import org.apache.jdo.jdoql.QueryResult;
+import org.apache.jdo.pm.PersistenceManagerInternal;
+import org.apache.jdo.store.StoreManager;
+import org.apache.jdo.util.I18NHelper;
+
+
+/** 
+ * This class implements the JDO query interface 
+ * (see [EMAIL PROTECTED] javax.jdo.Query}).
+ *
+ * @author  Michael Bouschen
+ */
+public class QueryImpl
+implements Query
+{
+/** The pm for this query instance. */
+private transient PersistenceManagerInternal pm;
+
+/** The candidate class as specified by setClass. */
+private transient Class candidateClass;
+
+/** The name of the candidate class (Needed for serialization support). */
+private String candidateClassName;
+
+/** The candidates as specified by setCandidates. */
+private transient Object candidates;
+
+/** The import declaration string as specified by declareImports. */
+private String importDeclarations;
+
+/** The parameter declaration string as specified by declareParameters. */
+private String parameterDeclarations;
+
+/** The variable declaration string as specified by declareVariables. */
+private String variableDeclarations;
+
+/** The ordering specification string as specified by setOrdering. */
+private String orderingSpecification;
+
+/** The filter expression string as specified by setFilter. */
+private String filterExpression;
+
+/** 
+ * The ignoreCache flag as specified by setIgnoreCache. The constructor
+ * defaults it to the PM setting.
+ */
+private boolean ignoreCache;
+
+/** The internal query representation as compilation result. */
+private transient Tree compiledTree = null;
+
+/** 
+ * The internal query representation set by the constructor taking a 
+ * compiled query.
+ */
+private Tree queryTree;
+
+/** Represents parameter values. */
+private ParameterTable paramtab;
+
+/** Represents variable values. */
+private VariableTable vartab;
+
+/** Set of open query result instances. */
+private transient Set openQueryResults = new HashSet();
+
+/** I18N support */
+private final static I18NHelper msg =  
+I18NHelper.getInstance(QueryImpl.class);
+
+/**
+ * Create an empty query instance with no elements.
+ */
+public QueryImpl(PersistenceManagerInternal pm)
+{
+// check valid PersistenceManager
+if (pm == null)
+throw new JDOQueryException(msg.msg(EXC_UnboundQuery)); //NOI18N
+
+this.pm = pm;
+this.ignoreCache = pm.getIgnoreCache();
+this.paramtab = new ParameterTable();
+this.vartab = new VariableTable();
+}
+
+/** 
+ * Create a new Query using elements from another Query.  The other Query
+ * must have been created by the same JDO implementation.  It might be 
active
+ * in a different PersistenceManager or might have been serialized and
+ * restored.
+ * PAll of the settings of the other Query are copied to this Query,
+ * except for the candidate Collection or Extent.
+ * @param compiled another Query from the same JDO implementation
+ */
+public QueryImpl(PersistenceManagerInternal pm, Object compiled)
+{
+

svn commit: r158176 [28/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/MemoryQuery.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/MemoryQuery.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/MemoryQuery.java 
(added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/jdoql/MemoryQuery.java 
Fri Mar 18 17:02:29 2005
@@ -0,0 +1,1484 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.impl.jdoql;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Collections;
+
+import javax.jdo.JDOHelper;
+import javax.jdo.PersistenceManager;
+
+import org.apache.jdo.impl.jdoql.scope.ParameterTable;
+import org.apache.jdo.impl.jdoql.scope.UNDEFINED;
+import org.apache.jdo.impl.jdoql.scope.VariableTable;
+import org.apache.jdo.jdoql.JDOQueryException;
+import org.apache.jdo.jdoql.tree.AbstractNodeVisitor;
+import org.apache.jdo.jdoql.tree.AndExpression;
+import org.apache.jdo.jdoql.tree.CastExpression;
+import org.apache.jdo.jdoql.tree.ComplementExpression;
+import org.apache.jdo.jdoql.tree.ConditionalAndExpression;
+import org.apache.jdo.jdoql.tree.ConditionalOrExpression;
+import org.apache.jdo.jdoql.tree.ConstantExpression;
+import org.apache.jdo.jdoql.tree.ContainsCallExpression;
+import org.apache.jdo.jdoql.tree.DivideExpression;
+import org.apache.jdo.jdoql.tree.EndsWithCallExpression;
+import org.apache.jdo.jdoql.tree.EqualsExpression;
+import org.apache.jdo.jdoql.tree.Expression;
+import org.apache.jdo.jdoql.tree.FieldAccessExpression;
+import org.apache.jdo.jdoql.tree.GreaterThanEqualsExpression;
+import org.apache.jdo.jdoql.tree.GreaterThanExpression;
+import org.apache.jdo.jdoql.tree.IsEmptyCallExpression;
+import org.apache.jdo.jdoql.tree.LessThanEqualsExpression;
+import org.apache.jdo.jdoql.tree.LessThanExpression;
+import org.apache.jdo.jdoql.tree.MinusExpression;
+import org.apache.jdo.jdoql.tree.NotEqualsExpression;
+import org.apache.jdo.jdoql.tree.NotExpression;
+import org.apache.jdo.jdoql.tree.OrExpression;
+import org.apache.jdo.jdoql.tree.OrderingExpression;
+import org.apache.jdo.jdoql.tree.ParameterAccessExpression;
+import org.apache.jdo.jdoql.tree.PlusExpression;
+import org.apache.jdo.jdoql.tree.StartsWithCallExpression;
+import org.apache.jdo.jdoql.tree.StaticFieldAccessExpression;
+import org.apache.jdo.jdoql.tree.ThisExpression;
+import org.apache.jdo.jdoql.tree.TimesExpression;
+import org.apache.jdo.jdoql.tree.TreeWalker;
+import org.apache.jdo.jdoql.tree.UnaryMinusExpression;
+import org.apache.jdo.jdoql.tree.UnaryPlusExpression;
+import org.apache.jdo.jdoql.tree.VariableAccessExpression;
+import org.apache.jdo.pm.PersistenceManagerInternal;
+import org.apache.jdo.util.I18NHelper;
+
+/**
+ * An instance of this class is used to evaluate a
+ * query tree in memory. For this purpose this class keeps references
+ * to a parameter/variable table and to the current object corresponding
+ * with a codeThisExpression/code.
+ * It extends codeAbstractNodeVisitor/code.
+ * To evaluate a query tree, you need to pass the query tree instance and
+ * an instance of this class to method codewalk/code of a tree walker
+ * instance.
+ *
+ * @author Michael Watzek
+ */
+public class MemoryQuery extends AbstractNodeVisitor
+{
+/** I18N support */
+final static I18NHelper msg = I18NHelper.getInstance(MemoryQuery.class);
+final static UNDEFINED  undefined = UNDEFINED.getInstance();
+
+final TreeWalkerwalker = new TreeWalker();
+final List  boundVariables = new ArrayList();
+VariableAccessExpressionunboundVariableAccess = null;
+BoundVariable   removedBoundVariable = null;
+
+final PersistenceManagerInternal pm;
+final ParameterTableparameters;
+final VariableTable variables;
+Object  current;
+
+/**
+ * Constructs an instance of this class for the specified paramter table
+ * and variable table. This query evaluator uses reflection for
+ * field accesses.
+ * @param parameters the parameter table
+ * @param variables the variable 

svn commit: r158176 [23/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/GetExtentHandler.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/GetExtentHandler.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/GetExtentHandler.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/fostore/GetExtentHandler.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.impl.fostore;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+
+/**
+* Process GetExtent requests.
+*
+* @author Dave Bristor
+*/
+// This is server-side code.  It does not need to live in the client.
+class GetExtentHandler extends RequestHandler {
+
+private GetExtentHandler(Reply reply, int length,
+ FOStoreServerConnection con) {
+
+super(reply, length, con);
+}
+
+public static final HandlerFactory factory =
+new HandlerFactory() {
+public RequestHandler getHandler(Reply reply, int length,
+ FOStoreServerConnection con) {
+return new GetExtentHandler(reply, length, con);
+}};
+
+/**
+* The desired extent's class can be specified either by CLID (i.e., the
+* class's CLID was already loaded from store to the client) or classname
+* and FSUID (in case the CLID wasn't known).  In the latter case, look
+* up the CLID.
+* br
+* With the CLID, get the set of extents: it will be only one if
+* subclasses is false, an aribtrary number otherwise.
+* br
+* Iterate over the extents, writing the items into the reply.
+* @see RequestHandler#handleRequest
+* @see GetExtentRequest#doRequestBody
+*/
+RequestFinisher handleRequest()
+throws IOException, FOStoreDatabaseException {
+
+FOStoreInput in = con.getInputFromClient();
+FOStoreDatabase db = con.getDatabase();
+HashSet dbExtents = null;
+
+// true = resulting extent to include subclasses of indicated class.
+boolean subclasses;
+
+int maxInstances = in.readInt();
+
+// By CLID or by classname/fsuid?
+boolean isCLID = in.readBoolean();
+
+CLID clid = null;
+if (isCLID) {
+clid = CLID.read(in);
+subclasses = in.readBoolean();
+
+} else {
+// Find the clid for the given name/fsuid.
+
+String name = in.readUTF();
+FOStoreSchemaUID fsuid = FOStoreSchemaUID.read(in);
+subclasses = in.readBoolean();
+
+if (logger.isDebugEnabled()) {
+logger.debug(
+GetExtentHandler for name= + name); // NOI18N
+}
+
+for (Iterator i = db.getDBInfo().getDBClasses(); i.hasNext();) {
+DBClass dbClass = (DBClass)i.next();
+if (fsuid.equals(dbClass.getFSUID()) 
+name.equals(dbClass.getName())) {
+clid = dbClass.getCLID();
+// break because there can be only one match.
+break;
+}
+}
+}
+
+// Get the set of CLIDs of extents
+if (null != clid) {
+dbExtents = getDBExtents(clid, subclasses, db);
+}
+
+if (logger.isDebugEnabled()) {
+if (null == dbExtents) {
+logger.debug(GetExtentHandler.hr: no extents); // NOI18N
+} else {
+for (Iterator i = dbExtents.iterator(); i.hasNext();) {
+logger.debug(
+GetExtentHandler.hr: extent= + i.next()); // NOI18N
+}
+}
+}
+
+Status status = null;
+int extentSize = 0;
+int numInstances = 0;
+int numOIDs = 0;
+
+// Write instances into the reply
+if (null == dbExtents) {
+reply.writeInt(0);
+reply.writeInt(0);
+reply.writeInt(0);
+status = Status.OK;
+
+} else {
+// Save space for writing various 

svn commit: r158176 [7/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/Descriptor.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/Descriptor.java?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/Descriptor.java
 (added)
+++ 
incubator/jdo/trunk/ri11/src/java/org/apache/jdo/impl/enhancer/classfile/Descriptor.java
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,556 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.impl.enhancer.classfile;
+
+import java.util.Stack;
+import java.util.Map;
+
+//@olsen: subst: Hashtable - Map, HashMap
+
+
+/**
+ * A collection of static methods which manipulate type descriptors
+ */
+public class Descriptor implements VMConstants {
+/** 
+ * Return the number of words of arguments to the method 
+ * based on the method signature
+ */
+public static int countMethodArgWords(String sig) {
+if (sig.charAt(0) != '(')
+throw new InsnError (not a method signature);
+int count = 0;
+for (int idx = 1; sig.charAt(idx) != ')'; idx++) {
+switch (sig.charAt(idx)) {
+case 'B': /* byte */
+case 'C': /* char */
+case 'S': /* short */
+case 'I': /* int */
+case 'F': /* float */
+case 'Z': /* boolean */
+count++;
+break;
+case 'J': /* long */
+case 'D': /* double */
+count += 2;
+break;
+case 'L':
+count++;
+idx = sig.indexOf(';', idx);
+break;
+case '[':
+count++;
+while (sig.charAt(idx) == '[' || sig.charAt(idx) == ']')
+idx++;
+if (sig.charAt(idx) == 'L')
+idx = sig.indexOf(';', idx);
+/* else, let idx++ at loop iteration skip primitive descriptor 
*/
+break;
+default:
+throw new InsnError(missing case);
+}
+}
+return count;
+}
+
+/** 
+ * Return the number of words of return value for the method
+ * based on the method signature
+ */
+public static int countMethodReturnWords(String sig) {
+int idx = sig.lastIndexOf(')') + 1;
+if (idx == 0)
+throw new InsnError (not a method signature);
+switch (sig.charAt(idx)) {
+case 'J': /* long */
+case 'D': /* double */
+return 2;
+case 'B': /* byte */
+case 'C': /* char */
+case 'S': /* short */
+case 'I': /* int */
+case 'F': /* float */
+case 'Z': /* boolean */
+case 'L': /* object */
+case '[': /* array */
+return 1;
+case 'V': /* void */
+return 0;
+default:
+throw new InsnError(missing case);
+}
+}
+
+/**
+ * Return the stack descriptor for the result of a method
+ * invocation.  Void return values yield V.
+ */
+public static String extractResultSig(String methodSig) {
+return methodSig.substring(methodSig.indexOf(')')+1);
+}
+
+/**
+ * Return the stack descriptor for the arguments to a method
+ * invocation (not including any this argument)
+ */
+public static String extractArgSig(String methodSig) {
+return methodSig.substring(1, methodSig.indexOf(')'));
+}
+
+/**
+ * Return the reversed stack descriptor for the arguments to a method
+ * invocation (not including any this argument).  The top of stack
+ * element will be first.
+ */
+public static String extractReversedArgSig(String methodSig) {
+StringBuffer buf = new StringBuffer();;
+reverseArgSig(buf, methodSig, 1);
+return buf.toString();
+}
+
+/**
+ * Given a StringBuffer, a method descriptor, and a index to the 
+ * start of an argument descriptor, append the arguments to the
+ * string buffer in reverse order.
+ */
+private static void reverseArgSig(StringBuffer buf, String methodSig, 
+  int idx) {
+char c = methodSig.charAt(idx);
+   

svn commit: r158179 [54/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
 (added)
+++ 
incubator/jdo/trunk/tck11/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,202 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE jdo PUBLIC -//Sun Microsystems, Inc.//DTD Java Data Objects 
Metadata 1.0//EN http://java.sun.com/dtd/jdo_1_0.dtd;
+jdo
+package name=org.apache.jdo.tck.pc.fieldtypes
+class name=FieldsOfString identity-type=application
+objectid-class=org.apache.jdo.tck.pc.fieldtypes.FieldsOfString$Oid
+field name=identifier primary-key=true/
+field name=String1  embedded=true
+/field
+field name=String2  embedded=false
+/field
+field name=String3 persistence-modifier=none 
+/field
+field name=String4 persistence-modifier=persistent 
+/field
+field name=String5 persistence-modifier=persistent embedded=true
+/field
+field name=String6 persistence-modifier=persistent embedded=false
+/field
+field name=String7 persistence-modifier=transactional 
+/field
+field name=String10 persistence-modifier=none 
+/field
+field name=String11 persistence-modifier=persistent 
+/field
+field name=String12 persistence-modifier=persistent embedded=true
+/field
+field name=String13 persistence-modifier=persistent embedded=false
+/field
+field name=String14 persistence-modifier=transactional 
+/field
+field name=String17  embedded=true
+/field
+field name=String18  embedded=false
+/field
+field name=String19 persistence-modifier=none 
+/field
+field name=String20 persistence-modifier=persistent 
+/field
+field name=String21 persistence-modifier=persistent embedded=true
+/field
+field name=String22 persistence-modifier=persistent embedded=false
+/field
+field name=String23 persistence-modifier=transactional 
+/field
+field name=String29 persistence-modifier=none 
+/field
+field name=String30 persistence-modifier=persistent 
+/field
+field name=String31 persistence-modifier=persistent embedded=true
+/field
+field name=String32 persistence-modifier=persistent embedded=false
+/field
+field name=String33 persistence-modifier=transactional 
+/field
+field name=String37  embedded=true
+/field
+field name=String38  embedded=false
+/field
+field name=String39 persistence-modifier=none 
+/field
+field name=String40 persistence-modifier=persistent 
+/field
+field name=String41 persistence-modifier=persistent embedded=true
+/field
+field name=String42 persistence-modifier=persistent embedded=false
+/field
+field name=String43 persistence-modifier=transactional 
+/field
+field name=String46 persistence-modifier=none 
+/field
+field name=String47 persistence-modifier=persistent 
+/field
+field name=String48 persistence-modifier=persistent embedded=true
+/field
+field name=String49 persistence-modifier=persistent embedded=false
+/field
+field name=String50 persistence-modifier=transactional 
+/field
+field name=String53  embedded=true
+/field
+field name=String54  embedded=false
+/field
+field name=String55 persistence-modifier=none 
+/field
+field name=String56 persistence-modifier=persistent 
+/field
+field name=String57 persistence-modifier=persistent embedded=true
+/field
+field name=String58 persistence-modifier=persistent embedded=false
+/field
+field name=String59 persistence-modifier=transactional 
+/field
+field name=String65 persistence-modifier=none 
+/field
+field name=String66 persistence-modifier=persistent 
+/field
+field name=String67 persistence-modifier=persistent embedded=true
+/field
+field name=String68 persistence-modifier=persistent embedded=false
+/field
+field name=String69 persistence-modifier=transactional 
+/field
+field name=String73  embedded=true
+/field
+field name=String74  embedded=false
+/field
+field name=String75 persistence-modifier=none 
+/field
+field name=String76 persistence-modifier=persistent 
+/field
+field name=String77 persistence-modifier=persistent embedded=true
+/field
+field name=String78 persistence-modifier=persistent embedded=false
+/field
+field name=String79 persistence-modifier=transactional 
+/field
+field name=String82 persistence-modifier=none 
+/field
+field name=String83 persistence-modifier=persistent 
+/field
+field name=String84 persistence-modifier=persistent embedded=true
+/field
+field name=String85 persistence-modifier=persistent embedded=false
+/field
+field name=String86 persistence-modifier=transactional 
+/field
+field name=String89  embedded=true
+/field
+field name=String90  embedded=false
+/field
+field name=String91 persistence-modifier=none 
+/field
+field name=String92 persistence-modifier=persistent 
+/field

svn commit: r158179 [43/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/GreaterThan.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/GreaterThan.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/GreaterThan.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/GreaterThan.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,1194 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.query.operators;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import org.apache.jdo.tck.pc.fieldtypes.AllTypes;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+
+/**
+ *BTitle:/B Greater Than Query Operator
+ *BR
+ *BKeywords:/B query
+ *BR
+ *BAssertion ID:/B A14.6.2-16.
+ *BR
+ *BAssertion Description: /B
+The greater than operator (codegt;/code) is supported for all types as
+they are defined in the Java language. This includes the following types:
+UL
+LIcodebyte, short, int, long, char, Byte, Short Integer, Long, 
Character/code/LI
+LIcodefloat, double, Float, Double/code/LI
+LIcodeBigDecimal, BigInteger/code/LI
+LIcodeDate, String/code/LI
+/UL
+The operation on object-valued fields of wrapper types (codeBoolean, Byte,
+Short, Integer, Long, Float/code, and codeDouble/code), and numeric types
+(codeBigDecimal/code and codeBigInteger/code) use the wrapped
+values as operands.
+
+ */
+
+public class GreaterThan extends ComparisonTests {
+private static  String  boolean_filterL = value  
fld_boolean;
+private static  String  boolean_filterR = fld_boolean  
value;
+private static  String  boolean_filterT = fld_boolean  true;
+private static  String  boolean_filterF = false  
fld_boolean;
+private static  String  boolean_filterObj   = value.fld_boolean  
fld_boolean;
+
+private static  String  byte_filterL= value  fld_byte;
+private static  String  byte_filterR= fld_byte  value;
+private static  String  byte_filterObj  = value.fld_byte  
fld_byte;
+private static  String  byte_filterVal  = fld_byte  100;
+
+private static  String  char_filterL= value  fld_char;
+private static  String  char_filterR= fld_char  value;
+private static  String  char_filterObj  = value.fld_char  
fld_char;
+private static  String  char_filterVal  = 'M'  fld_char;
+
+private static  String  double_filterL  = value  fld_double;
+private static  String  double_filterR  = fld_double  value;
+private static  String  double_filterObj= value.fld_double  
fld_double;
+private static  String  double_filterVal= fld_double  100.0;
+
+private static  String  float_filterL   = value  fld_float;
+private static  String  float_filterR   = fld_float  value;
+private static  String  float_filterObj = fld_float  
value.fld_float;
+private static  String  float_filterVal = fld_float  100.0;
+
+private static  String  int_filterL = value  fld_int;
+private static  String  int_filterR = fld_int  value;
+private static  String  int_filterObj   = value.fld_int  
fld_int;
+private static  String  int_filterVal   = fld_int  1000;
+
+private static  String  long_filterL= value  fld_long;
+private static  String  long_filterR= fld_long  value;
+private static  String  long_filterObj  = fld_long  
value.fld_long;
+private static  String  long_filterVal  = fld_long  100;
+
+private static  String  short_filterL   = value  fld_short;
+private static  String  short_filterR   = fld_short  value;
+private static  String  short_filterObj = value.fld_short  
fld_short;
+private static  String  

svn commit: r158179 [44/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/GreaterThanOrEqual.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/GreaterThanOrEqual.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/GreaterThanOrEqual.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/query/operators/GreaterThanOrEqual.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,1200 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.query.operators;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import org.apache.jdo.tck.pc.fieldtypes.AllTypes;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *BTitle:/B Greater Than or Equal Query Operator
+ *BR
+ *BKeywords:/B query
+ *BR
+ *BAssertion ID:/B A14.6.2-18.
+ *BR
+ *BAssertion Description: /B
+The greater than or equal operator (codegt;=/code) is supported for all
+types as they are defined in the Java language. This includes the following 
types:
+UL
+LIcodebyte, short, int, long, char, Byte, Short Integer, Long, 
Character/code/LI
+LIcodefloat, double, Float, Double/code/LI
+LIcodeBigDecimal, BigInteger/code/LI
+LIcodeDate, String/code/LI
+/UL
+The operation on object-valued fields of wrapper types (codeBoolean, Byte,
+Short, Integer, Long, Float/code, and codeDouble/code), and numeric types
+(codeBigDecimal/code and codeBigInteger/code)
+use the wrapped values as operands.
+
+ */
+
+public class GreaterThanOrEqual extends ComparisonTests {
+private static  String  boolean_filterL = value = 
fld_boolean;
+private static  String  boolean_filterR = fld_boolean = 
value;
+private static  String  boolean_filterT = fld_boolean = 
true;
+private static  String  boolean_filterF = false = 
fld_boolean;
+private static  String  boolean_filterObj   = value.fld_boolean 
= fld_boolean;
+
+private static  String  byte_filterL= value = fld_byte;
+private static  String  byte_filterR= fld_byte = value;
+private static  String  byte_filterObj  = value.fld_byte = 
fld_byte;
+private static  String  byte_filterVal  = fld_byte = 100;
+
+private static  String  char_filterL= value = fld_char;
+private static  String  char_filterR= fld_char = value;
+private static  String  char_filterObj  = value.fld_char = 
fld_char;
+private static  String  char_filterVal  = 'M' = fld_char;
+
+private static  String  double_filterL  = value = 
fld_double;
+private static  String  double_filterR  = fld_double = 
value;
+private static  String  double_filterObj= value.fld_double = 
fld_double;
+private static  String  double_filterVal= fld_double = 
100.0;
+
+private static  String  float_filterL   = value = fld_float;
+private static  String  float_filterR   = fld_float = value;
+private static  String  float_filterObj = fld_float = 
value.fld_float;
+private static  String  float_filterVal = fld_float = 100.0;
+
+private static  String  int_filterL = value = fld_int;
+private static  String  int_filterR = fld_int = value;
+private static  String  int_filterObj   = value.fld_int = 
fld_int;
+private static  String  int_filterVal   = fld_int = 1000;
+
+private static  String  long_filterL= value = fld_long;
+private static  String  long_filterR= fld_long = value;
+private static  String  long_filterObj  = fld_long = 
value.fld_long;
+private static  String  long_filterVal  = fld_long = 
100;
+
+private static  String  short_filterL   = value = fld_short;
+private static  String  short_filterR   = fld_short = value;
+private static  String  

svn commit: r158179 [13/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,768 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.lifecycle;
+
+import java.util.Iterator;
+
+import javax.jdo.Extent;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.JDO_Test;
+import org.apache.jdo.tck.pc.lifecycle.StateTransitionObj;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *BTitle:/B Test State Transitions
+ *BR
+ *BKeywords:/B lifecycle
+ *BR
+ *BAssertion IDs:/B A5.9-1 through A5.9-190
+ *BAssertion Description: /B
+ All possible state transistions are being tested in this test.
+ */
+
+public class StateTransitions extends JDO_Test {
+
+/** */
+private static final String ASSERTION_FAILED = 
+Assertions A5.9-1 through A5.9-190 (StateTransitions) failed: ;
+
+/**
+ * The codemain/code is called when the class
+ * is directly executed from the command line.
+ * @param args The arguments passed to the program.
+ */
+public static void main(String[] args) {
+BatchTestRunner.run(StateTransitions.class);
+}
+
+private Transaction transaction;
+private int scenario;
+private int operation;
+private int current_state;
+private int expected_state;
+private int new_state;
+
+/**
+ * Operations that cause state changes
+ */
+private static final int MAKEPERSISTENT  = 0;
+private static final int DELETEPERSISTENT= 1;
+private static final int MAKETRANSACTIONAL   = 2;
+private static final int MAKENONTRANSACTIONAL= 3;
+private static final int MAKETRANSIENT   = 4;
+private static final int COMMITNORETAINVALUES= 5;
+private static final int COMMITRETAINVALUES  = 6;
+private static final int ROLLBACKNORESTOREVALUES = 7;
+private static final int ROLLBACKRESTOREVALUES   = 8;
+private static final int REFRESHDATASTORE= 9;
+private static final int REFRESHOPTIMISTIC   = 10;
+private static final int EVICT   = 11;
+private static final int READOUTSIDETX   = 12;
+private static final int READOPTIMISTIC  = 13;
+private static final int READDATASTORE   = 14;
+private static final int WRITEOUTSIDETX  = 15;
+private static final int WRITEINSIDETX   = 16;
+private static final int RETRIEVEOUTSIDETX   = 17;
+private static final int RETRIEVEINSIDETX= 18;
+
+private static final String[] operations = {
+makePersistent,
+deletePersistent,
+makeTransactional,
+makeNontransactional,
+makeTransient,
+commit, retainValues=false,
+commit, retainValues=true,
+rollback, restoreValues=false,
+rollback, restoreValues=true,
+refresh with active datastore tx,
+refresh with active optimistic tx,
+evict,
+read field outside tx,
+read field with active optimistic tx,
+read field with active datastore tx,
+write field outside tx,
+write field with active tx,
+retrieve outside tx,
+retrieve with active tx
+};
+private static final int NUM_OPERATIONS = 19;
+
+private static final boolean[] closes_transaction =
+{ false, false, false, false, false, true, true, true, true, false,
+  false, false, false, false, false, false, false, false, false };
+
+/**
+ * Illegal state transitions
+ */
+private static final int UNCHANGED   = -1;
+private static final int ERROR   = -2;
+private static final int IMPOSSIBLE  = -3;
+private static 

svn commit: r158179 [4/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.api.jdohelper;
+
+import javax.jdo.JDOHelper;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.JDO_Test;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+
+/**
+ *BTitle:/B Get Object Id For Null
+ *BR
+ *BKeywords:/B jdohelper
+ *BR
+ *BAssertion ID:/B A8.3-4.
+ *BR
+ *BAssertion Description: /B
+The jdohelper.getObjectId  method returns null if Object is null.
+  Evaluating to true when == is used.
+  
+ */
+
+ 
+ /*
+ * Revision History
+ * 
+ * Author :Date   :Version  
+ * Azita Kamangar  9/26/01  1.0
+ */
+ 
+public class GetObjectIdForNull extends JDO_Test {
+/** */
+private static final String ASSERTION_FAILED = 
+Assertion A8.3-4 (GetObjectIdForNull) failed: ;
+
+/**
+ * The codemain/code is called when the class
+ * is directly executed from the command line.
+ * @param args The arguments passed to the program.
+ */
+public static void main(String[] args) {
+BatchTestRunner.run(GetObjectIdForNull.class);
+}
+
+/* test jdohelper.getObjectId(Object pc)
+ */  
+public void testGetObjectIdForNull() {
+pm = getPM();
+   Transaction tx = pm.currentTransaction();
+tx.begin();
+Object p1 = null;
+   Object oid = JDOHelper.getObjectId(p1);
+tx.commit();
+   if (oid != null)
+fail(ASSERTION_FAILED,
+ JDOHelper.getObjectId called for null instance returned 
non-null ObjectId);
+pm.close();
+pm = null;
+}
+}

Added: 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java?view=autorev=158179
==
--- 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
 (added)
+++ 
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
 Fri Mar 18 17:07:39 2005
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2005 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 org.apache.jdo.tck.api.jdohelper;
+
+import javax.jdo.JDOHelper;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.JDO_Test;
+import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *BTitle:/B Get Object Id For Transient
+ *BR
+ *BKeywords:/B jdohelper
+ *BR
+ *BAssertion ID:/B A8.3-2.
+ *BR
+ *BAssertion Description: /B
+The jdohelper.getObjectId method returns null if Object is a transient.
+Evaluating to true when == is used.
+ */
+
+ /*
+ * Revision History
+ * 
+ * Author :Date   :Version  
+ * Azita Kamangar  9/27/01  1.0
+ */
+ 
+public class GetObjectIdForTransient extends JDO_Test {
+
+/** */
+private static final String ASSERTION_FAILED = 
+Assertion A8.3-2 (GetObjectIdForTransient) failed: ;
+
+/**
+ * The codemain/code is called when the class
+ * is directly executed from the command line.
+   

svn commit: r158179 [2/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Added: incubator/jdo/trunk/tck11/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/project.properties?view=autorev=158179
==
--- incubator/jdo/trunk/tck11/project.properties (added)
+++ incubator/jdo/trunk/tck11/project.properties Fri Mar 18 17:07:39 2005
@@ -0,0 +1,255 @@
+#
+# Copyright 2005 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.
+
+# iut properties file
+iut.runtck.properties = ${basedir}/test/conf/jdori.properties
+iut.runtck.sysproperties = 
+
+# Flags indicating whether IUT supports application/datastore identity 
+iut.applicationidentity.supported = yes
+iut.datastoreidentity.supported = yes
+
+# The IUT enhancer, defaults to JDORI enhancer
+iut.enhanced.dir = ${maven.build.dir}/enhanced
+iut.enhancer.main = ${jdo.enhancer.main}
+iut.enhancer.options = -f -d ${iut.enhanced.dir} -s 
${iut.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}
+iut.enhancer.args = ${jdo.tck.pcclasses.files} ${jdo.tck.paclasses.files}
+iut.enhancer.sysproperties = 
+
+# JUnit settings
+# Start new JVM for junit tests
+maven.junit.fork = yes
+maven.junit.dir = ${jdo.tck.testdir}
+maven.junit.sysproperties = PMFProperties PMF2Properties
+PMFProperties = ${basedir}/test/conf/jdori.properties
+PMF2Properties = ${basedir}/test/conf/jdori2.properties
+
+# JDO TCK settings
+jdo.tck.configuration = ${basedir}/test/conf/datastoreidentity.conf
+jdo.tck.testclasses.dir = ${maven.build.dir}/test-classes
+jdo.tck.testdir = ${maven.build.dir}
+jdo.tck.resultprinterclass = org.apache.jdo.tck.util.BatchResultPrinter
+
+# dependencies
+jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo-api')}
+jdo.jdobtree.jarfile = ${pom.getDependencyPath('jdo:jdo-btree')}
+jdo.jdori.jarfile = ${pom.getDependencyPath('jdo:jdo-ri')}
+junit.jarfile = ${pom.getDependencyPath('junit:junit')}
+antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
+jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
+spring.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
+logging.jarfile = ${pom.getDependencyPath('commons-logging')}
+xmlparser =
+
+# JDORI enhancer
+jdo.enhancer.main = org.apache.jdo.enhancer.Main
+jdo.enhancer.options = -f -d ${jdo.tck.testclasses.dir} -s 
${jdo.enhancer.sourcepath}
+jdo.enhancer.args = ${jdo.tck.pcclasses.files} ${jdo.tck.paclasses.files}
+jdo.enhancer.sourcepath = 
${jdo.tck.testclasses.dir}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${logging.jarfile}
+jdo.enhancer.classpath = 
${jdo.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+
+jdo.tck.pcclasses.sources = \
+org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java \
+org/apache/jdo/tck/pc/company/Address.java \
+org/apache/jdo/tck/pc/company/Company.java \
+org/apache/jdo/tck/pc/company/Department.java \
+org/apache/jdo/tck/pc/company/Person.java \
+org/apache/jdo/tck/pc/company/Employee.java \
+org/apache/jdo/tck/pc/company/FullTimeEmployee.java \
+org/apache/jdo/tck/pc/company/Insurance.java \
+org/apache/jdo/tck/pc/company/DentalInsurance.java \
+org/apache/jdo/tck/pc/company/MedicalInsurance.java \
+org/apache/jdo/tck/pc/company/PartTimeEmployee.java \
+org/apache/jdo/tck/pc/company/Project.java \
+org/apache/jdo/tck/pc/fieldtypes/AllTypes.java \
+org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java \
+org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java \
+org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java \
+org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java \
+

svn commit: r158179 [1/61] - in incubator/jdo/trunk/tck11: ./ assertions/ iut_jars/ test/ test/conf/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/tck/ test/java/org/apache/jdo/tck/api/ test/java/org/apache/jdo/tck/api/instancecallbacks/ test/java/org/apache/jdo/tck/api/jdohelper/ test/java/org/apache/jdo/tck/api/persistencemanager/ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/ test/java/org/apache/jdo/tck/enhancement/ test/java/org/apache/jdo/tck/extents/ test/java/org/apache/jdo/tck/lifecycle/ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ test/java/org/apache/jdo/tck/models/ test/java/org/apache/jdo/tck/models/embedded/ test/java/org/apache/jdo/tck/models/fieldtypes/ test/java/org/apache/jdo/tck/models/inheritance/ test/java/org/apache/jdo/tck/pc/ test/java/org/apache/jdo/tck/pc/company/ test/java/org/apache/jdo/tck/pc/fieldtypes/ test/java/org/apache/jdo/tck/pc/inheritance/ test/java/org/apache/jdo/tck/pc/instancecallbacks/ test/java/org/apache/jdo/tck/pc/lifecycle/ test/java/org/apache/jdo/tck/pc/mylib/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/operators/ test/java/org/apache/jdo/tck/transactions/ test/java/org/apache/jdo/tck/util/ test/jdo/ test/jdo/applicationidentity/ test/jdo/applicationidentity/org/ test/jdo/applicationidentity/org/apache/ test/jdo/applicationidentity/org/apache/jdo/ test/jdo/applicationidentity/org/apache/jdo/tck/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/ test/jdo/datastoreidentity/ test/jdo/datastoreidentity/org/ test/jdo/datastoreidentity/org/apache/ test/jdo/datastoreidentity/org/apache/jdo/ test/jdo/datastoreidentity/org/apache/jdo/tck/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ test/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/

[mbo]

Author: mbo
Date: Fri Mar 18 17:07:39 2005
New Revision: 158179

URL: http://svn.apache.org/viewcvs?view=revrev=158179
Log:
tck11 subproject

Added:
incubator/jdo/trunk/tck11/
incubator/jdo/trunk/tck11/assertions/
incubator/jdo/trunk/tck11/assertions/JdoTckAssertionsTable.sxc   (with 
props)
incubator/jdo/trunk/tck11/iut_jars/
incubator/jdo/trunk/tck11/maven.xml
incubator/jdo/trunk/tck11/project.properties
incubator/jdo/trunk/tck11/project.xml
incubator/jdo/trunk/tck11/test/
incubator/jdo/trunk/tck11/test/conf/
incubator/jdo/trunk/tck11/test/conf/JDOTCKTestCases.list
incubator/jdo/trunk/tck11/test/conf/alltests.list
incubator/jdo/trunk/tck11/test/conf/applicationidentity.conf
incubator/jdo/trunk/tck11/test/conf/commons-logging.properties
incubator/jdo/trunk/tck11/test/conf/datastoreidentity.conf
incubator/jdo/trunk/tck11/test/conf/enhancement-test.properties
incubator/jdo/trunk/tck11/test/conf/jdori.properties
incubator/jdo/trunk/tck11/test/conf/jdori2.properties
incubator/jdo/trunk/tck11/test/conf/logging.properties
incubator/jdo/trunk/tck11/test/conf/simplelog.properties
incubator/jdo/trunk/tck11/test/java/
incubator/jdo/trunk/tck11/test/java/org/
incubator/jdo/trunk/tck11/test/java/org/apache/
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/JDO_Test.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java
incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java

incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java

svn commit: r158176 [79/79] - in incubator/jdo/trunk/ri11: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/ejb/ src/java/org/apache/jdo/enhancer/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/enhancer/ src/java/org/apache/jdo/impl/enhancer/classfile/ src/java/org/apache/jdo/impl/enhancer/core/ src/java/org/apache/jdo/impl/enhancer/generator/ src/java/org/apache/jdo/impl/enhancer/meta/ src/java/org/apache/jdo/impl/enhancer/meta/model/ src/java/org/apache/jdo/impl/enhancer/meta/prop/ src/java/org/apache/jdo/impl/enhancer/meta/util/ src/java/org/apache/jdo/impl/enhancer/util/ src/java/org/apache/jdo/impl/fostore/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/impl/model/ src/java/org/apache/jdo/impl/model/java/ src/java/org/apache/jdo/impl/model/java/runtime/ src/java/org/apache/jdo/impl/model/jdo/ src/java/org/apache/jdo/impl/model/jdo/caching/ src/java/org/apache/jdo/impl/model/jdo/util/ src/java/org/apache/jdo/impl/model/jdo/xml/ src/java/org/apache/jdo/impl/pm/ src/java/org/apache/jdo/impl/sco/ src/java/org/apache/jdo/impl/state/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/ src/java/org/apache/jdo/model/ src/java/org/apache/jdo/model/java/ src/java/org/apache/jdo/model/jdo/ src/java/org/apache/jdo/pm/ src/java/org/apache/jdo/sco/ src/java/org/apache/jdo/state/ src/java/org/apache/jdo/store/ src/java/org/apache/jdo/util/ test/ test/conf/ test/enhancer/ test/enhancer/sempdept/ test/enhancer/sempdept/src/ test/enhancer/sempdept/src/empdept/ test/fsuid2/ test/fsuid2/org/ test/fsuid2/org/apache/ test/fsuid2/org/apache/jdo/ test/fsuid2/org/apache/jdo/pc/ test/java/ test/java/org/ test/java/org/apache/ test/java/org/apache/jdo/ test/java/org/apache/jdo/impl/ test/java/org/apache/jdo/impl/fostore/ test/java/org/apache/jdo/pc/ test/java/org/apache/jdo/pc/appid/ test/java/org/apache/jdo/pc/empdept/ test/java/org/apache/jdo/pc/serializable/ test/java/org/apache/jdo/pc/xempdept/ test/java/org/apache/jdo/test/ test/java/org/apache/jdo/test/query/ test/java/org/apache/jdo/test/util/ test/jdo/ test/jdo/org/ test/jdo/org/apache/ test/jdo/org/apache/jdo/ test/jdo/org/apache/jdo/pc/ test/jdo/org/apache/jdo/pc/appid/ test/jdo/org/apache/jdo/pc/empdept/ test/jdo/org/apache/jdo/pc/serializable/ test/jdo/org/apache/jdo/pc/xempdept/ xdocs/

[mbo]

Added: 
incubator/jdo/trunk/ri11/test/jdo/org/apache/jdo/pc/xempdept/xempdept.jdoproperties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/test/jdo/org/apache/jdo/pc/xempdept/xempdept.jdoproperties?view=autorev=158176
==
--- 
incubator/jdo/trunk/ri11/test/jdo/org/apache/jdo/pc/xempdept/xempdept.jdoproperties
 (added)
+++ 
incubator/jdo/trunk/ri11/test/jdo/org/apache/jdo/pc/xempdept/xempdept.jdoproperties
 Fri Mar 18 17:02:29 2005
@@ -0,0 +1,99 @@
+# Classnames can have the following attributes: 
+#  jdo:{persistent|transient} 
+#  super: classname 
+#  oid: classname 
+#  access: {public|protected|package|private} 
+# Fieldnames can have the following attributes: 
+#  type:type 
+#  access: {public|protected|package|private} 
+#  jdo:{persistent|transactional|transient} 
+#  annotation:{key|dfg|mediated} 
+
+org.apache.jdo.pc.xempdept.Company=jdo:persistent
+org.apache.jdo.pc.xempdept.Company#name=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Company#founded=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Company#address=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Company#departments=jdo:persistent,annotation:mediated
+
+org.apache.jdo.pc.xempdept.Department=jdo:persistent
+org.apache.jdo.pc.xempdept.Department#deptid=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Department#name=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Department#company=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Department#employees=jdo:persistent,annotation:mediated
+
+org.apache.jdo.pc.xempdept.Person=jdo:persistent
+org.apache.jdo.pc.xempdept.Person#firstname=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Person#lastname=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Person#birthdate=jdo:persistent,annotation:mediated
+
+org.apache.jdo.pc.xempdept.Employee=jdo:persistent,super:org.apache.jdo.pc.xempdept.Person
+org.apache.jdo.pc.xempdept.Employee#empid=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#hiredate=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#weeklyhours=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#discriminator=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#reviewedProjects=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#projects=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#insurance=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#department=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#manager=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#team=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#mentor=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#protege=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#hradvisor=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Employee#hradvisees=jdo:persistent,annotation:mediated
+
+org.apache.jdo.pc.xempdept.FullTimeEmployee=jdo:persistent,super:org.apache.jdo.pc.xempdept.Employee
+org.apache.jdo.pc.xempdept.FullTimeEmployee#salary=jdo:persistent,annotation:mediated
+
+org.apache.jdo.pc.xempdept.PartTimeEmployee=jdo:persistent,super:org.apache.jdo.pc.xempdept.Employee
+org.apache.jdo.pc.xempdept.PartTimeEmployee#wage=jdo:persistent,annotation:mediated
+
+org.apache.jdo.pc.xempdept.Insurance=jdo:persistent
+org.apache.jdo.pc.xempdept.Insurance#insid=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Insurance#carrier=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Insurance#employee=jdo:persistent,annotation:mediated
+
+org.apache.jdo.pc.xempdept.Project=jdo:persistent
+org.apache.jdo.pc.xempdept.Project#projid=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Project#name=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Project#budget=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Project#reviewers=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.Project#employees=jdo:persistent,annotation:mediated
+
+org.apache.jdo.pc.xempdept.PrimitiveTypes=jdo:persistent
+org.apache.jdo.pc.xempdept.PrimitiveTypes#id=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.PrimitiveTypes#booleanNotNull=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.PrimitiveTypes#booleanNull=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.PrimitiveTypes#byteNotNull=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.PrimitiveTypes#byteNull=jdo:persistent,annotation:mediated
+org.apache.jdo.pc.xempdept.PrimitiveTypes#shortNotNull=jdo:persistent,annotation:mediated