incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r365477 - in /incubator/graffito/trunk/components/src/test: OJB.properties repository.dtd repository.xml repository_internal.xml
Date Mon, 02 Jan 2006 23:47:30 GMT
Author: clombart
Date: Mon Jan  2 15:47:24 2006
New Revision: 365477

URL: http://svn.apache.org/viewcvs?rev=365477&view=rev
Log:
Upgrade to OJB 1.0.3

Modified:
    incubator/graffito/trunk/components/src/test/OJB.properties
    incubator/graffito/trunk/components/src/test/repository.dtd
    incubator/graffito/trunk/components/src/test/repository.xml
    incubator/graffito/trunk/components/src/test/repository_internal.xml

Modified: incubator/graffito/trunk/components/src/test/OJB.properties
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/src/test/OJB.properties?rev=365477&r1=365476&r2=365477&view=diff
==============================================================================
--- incubator/graffito/trunk/components/src/test/OJB.properties (original)
+++ incubator/graffito/trunk/components/src/test/OJB.properties Mon Jan  2 15:47:24 2006
@@ -1,28 +1,24 @@
-# ========================================================================
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ========================================================================
-
-
-# OJB.properties file for Graffito unit tests
-
-
+#<!--
+#/* Copyright 2002-2004 The Apache Software Foundation
+# *
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *     http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+#-->
 # OJB.properties -- configuration of the OJB runtime environment
 # Version: 1.0
 # (c) 2001, 2002, 2003 Apache Software Foundation
 # Author: Thomas Mahler and many others
-# @version $Id: OJB.properties,v 1.5 2004/12/22 20:37:04 christophe Exp $
+# @version $Id: OJB.properties 239550 2005-08-24 09:26:20 +0200 (Wed, 24 Aug 2005) ate $
 #
 #----------------------------------------------------------------------------------------
 # repository file settings
@@ -50,7 +46,7 @@
 # PersistenceBrokerFactory / PersistenceBroker
 #----------------------------------------------------------------------------------------
 # The PersistenceBrokerFactoryClass entry decides which concrete
-# PersistenceBrokerFactory implemention is to be used.
+# PersistenceBrokerFactory implementon is to be used.
 PersistenceBrokerFactoryClass=org.apache.ojb.broker.core.PersistenceBrokerFactoryDefaultImpl
 # If in managed environment *only* the PB-api was used it's recommended to use this factory
 # to enable the PersistenceBroker instances to participate in the JTA transaction. This makes
@@ -134,11 +130,17 @@
 # take a look at the repository.dtd, there was a possibility to override
 # this default connection factory entry in each JDBCConnectionDescriptor.
 #
-                       
-#ConnectionFactoryClass=org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
-ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryPooledImpl
+
+# Note that due to using org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl as
+# ConnectionManager (see below) this connection factory class will be used
+# as a fallback only, i.e. if no special connection factory has been defined
+# in the JDBC connection descriptor.
+
+#ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryPooledImpl
 #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryNotPooledImpl
-#ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
+ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
+
+#ConnectionFactoryClass=org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
 #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl
 #
 #
@@ -146,7 +148,14 @@
 # ConnectionManager
 #----------------------------------------------------------------------------------------
 # The ConnectionManagerClass entry defines the ConnectionManager implemementation to be used
-ConnectionManagerClass=org.apache.ojb.broker.accesslayer.ConnectionManagerImpl
+#
+# It is recommended to use the improved connection manager provided by Jetspeed.
+# Instead of always using the ConnectionFactoryClass specified above, it uses the 
+# specific class configured for a JDBC connection descriptor (and the class specified
+# above as a fallback only).
+
+#ConnectionManagerClass=org.apache.ojb.broker.accesslayer.ConnectionManagerImpl
+ConnectionManagerClass=org.apache.jetspeed.components.rdbms.ojb.ConnectionManagerImpl
 #
 #
 #----------------------------------------------------------------------------------------
@@ -217,21 +226,13 @@
 # RowReader on class-descriptor level.
 RowReaderDefaultClass=org.apache.ojb.broker.accesslayer.RowReaderDefaultImpl
 #
+#
 #----------------------------------------------------------------------------------------
 # Object cache
 #----------------------------------------------------------------------------------------
-# The ObjectCacheClass entry tells OJB which concrete ObjectCache
-# implementation is to be used as standard cache.
-# Its also possible to override this entry adding object-cache elements
-# on jdbc-connection-descriptor level and
-# per class-descriptor in repository file. More info see documentation.
-#
-#ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCacheDefaultImpl
-#ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCacheEmptyImpl
-ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCachePerBrokerImpl
-#ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCacheJCSPerClassImpl
-#ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCachePerClassImpl
-#
+# NOTE: ObjectCacheClass declaration in OJB.properties file was removed (since OJB 1.0.2).
+# The concrete ObjectCache implementation has to specified in the repository file using
+# the 'object-cache' element. See documentation for more detailed info.
 #
 # This property is only relevant if the per class-descriptor object-cache
 # declaration was used in conjunction with metadata runtime changes.
@@ -242,88 +243,69 @@
 # instances for the same class.
 descriptorBasedCaches=false
 #
-#
-# Use CacheFilters to do filter operations before caching methods were
-# called. Build your own filter class by implementing org.apache.ojb.cache.CacheFilter.
-# It is possible to use a arbitrary number of CacheFilters, but this slows
-# down the performance of the cache, thus handle with care.
-#
-# - org.apache.ojb.broker.cache.CacheFilterClassImpl
-# allows filtering of classes
-# - org.apache.ojb.broker.cache.CacheFilterPackageImpl
-# allows filtering of packages
-# More info see Javadoc of the according classes.
-# Set a comma separated list of CacheFilter.
-#ObjectCacheFilter=org.apache.ojb.broker.cache.CacheFilterClassImpl,org.apache.ojb.broker.cache.CacheFilterPackageImpl
-#
+# NOTE: CacheFilters declaration was removed (since OJB 1.0.2). To exclude
+# object of whole packages from being cache use a specific property in
+# cache declaration - see caching guide in reference docs.
 #----------------------------------------------------------------------------------------
 # Locking
 #----------------------------------------------------------------------------------------
-# The LockManagerClass entry tells OJB which concrete LockManager
-# implementation is to be used.
-LockManagerClass=org.apache.ojb.odmg.locking.LockManagerDefaultImpl
+# The 'LockManagerClass' specify the internal used LockManager implementation.
+# If OJB is running in distributed environment it is recommended to use the remote
+# lock manager. It guarantees to provide Lockmanagement across multiple JVM's.
+#
+# The deprecated odmg locking implementation. Needs enabled 'LockMapClass' too.
+#@deprecated LockManagerClass=org.apache.ojb.odmg.locking.LockManagerDefaultImpl
+# A servlet based lock implementation for distributed environments, needs enabled
+# property 'LockServletUrl' too.
+#LockManagerClass=org.apache.ojb.broker.locking.LockManagerRemoteImpl
+# Lock manager implementation using apache's commons-transaction locking api
+#LockManagerClass=org.apache.ojb.broker.locking.LockManagerCommonsImpl
+LockManagerClass=org.apache.ojb.broker.locking.LockManagerInMemoryImpl
 #
+# The LockServletUrl entry points to the Lockserver servlet.
+# This Servlet is addressed by all distributed JVMs if the RemoteLockMapImpl
+# is used.
+#LockServletUrl=http://127.0.0.1:8080/ojb-lockserver
+#
+# The LockTimeout entry defines the maximum time in milliseconds
+# that a lock may be hold. Defaults to 60000 = 1 minute
+LockTimeout=60000
+#
+#
+# ------ deprecated ------
 # The LockMapClass entry tells OJB which concrete LockMap
 # implementation is to be used.
 # If OJB is running on multiple concurrent clients it is recommended
-# to use the RemoteLockMapImpl. It guarantees to provide
+# to use the LockMapRemoteImpl. It guarantees to provide
 # Lockmanagement across multiple JVMs.
 # This Implemenation relies on a Servlet based Lockserver. To use it you have to
 # deploy the ojb-lockserver.war into a Servlet engine.
 # and you have to set the Property LockServletUrl to point to this servlet.
 # (see LockServletUrl section below).
 # If OJB is running in a single JVM (e.g. in a desktop app, or in a servlet
-# engine) it is save to use the InMemoryLockMapImpl. Using it will result
+# engine) it is save to use the LockMapInMemoryImpl. Using it will result
 # in a large performance gain.
-#LockMapClass=org.apache.ojb.odmg.locking.RemoteLockMapImpl
-LockMapClass=org.apache.ojb.odmg.locking.InMemoryLockMapImpl
-#
-# The LockTimeout entry defines the maximum time in milliseconds
-# that a lock may be hold. Defaults to 60000 = 1 minute
-LockTimeout=60000
-#
-# The ImplicitLocking entry defines if implicit lock acquisition is
-# to be used. If set to true OJB implicitely locks objects to ODMG
-# transactions after performing OQL queries.
-# If implicit locking is used locking objects is recursive, that is
-# associated objects are also locked.
-# If ImplicitLocking is set to false, no locks are obtained in OQL
-# queries and there is also no recursive locking.
-ImplicitLocking=true
-#ImplicitLocking=false
-#
-#
-# The LockServletUrl entry points to the Lockserver servlet.
-# This Servlet is addressed by all distributed JVMs if the RemoteLockMapImpl
-# is used.
-LockServletUrl=http://127.0.0.1:8080/ojb-lockserver
-#
-#
-# The LockAssociations entry defines the behaviour for the OJB
-# implicit locking feature. If set to WRITE (default) acquiring a write-
-# lock on a given object x implies write locks on all objects associated
-# to x. If set to READ implicit read-locks are acquired.
-# Acquiring a read-lock on x thus allways results in implicit read-locks
-# on all associated objects.
-#LockAssociations=READ
-LockAssociations=WRITE
+# These settings are deprecated, only needed in conjunction with the old odmg 'LockManagerClass'
+# @deprecated LockMapClass=org.apache.ojb.odmg.locking.RemoteLockMapImpl
+# @deprecated LockMapClass=org.apache.ojb.odmg.locking.InMemoryLockMapImpl
 #
 #
 #----------------------------------------------------------------------------------------
 # OQL / SQL settings
 #----------------------------------------------------------------------------------------
 # The OqlCollectionClass entry defines the collection type returned
-# from OQL queries. By default this value is set to DListImpl.
-# This will be good for most situations as DList allows maximum flexibility
-# in a ODMG environment. See also section 'ODMG settings'.
+# from OQL queries. By default this value is set to a List.
+# This will be good for most situations. If you need the additional features of
+# DList (DList itself is persistable, support of predicate) comment in the DList
+# implementation. See also section 'ODMG settings' (DListClass entry).
 # Using DLists for large resultsets may be bad for application performance.
 # For these scenarios you can use ArrayLists or Vectors.
 # Important note: the collections class to be used MUST implement the
-# interface org.apache.ojb.broker.ManageableCollection.
+# interface 'org.apache.ojb.broker.ManageableCollection'.
 #
-OqlCollectionClass=org.apache.ojb.odmg.collections.DListImpl_2
-# OqlCollectionClass=org.apache.ojb.broker.util.collections.ManageableArrayList
-# OqlCollectionClass=org.apache.ojb.broker.util.ManageableVector
+OqlCollectionClass=org.apache.ojb.broker.util.collections.ManageableArrayList
+# OqlCollectionClass=org.apache.ojb.odmg.collections.DListImpl
+# OqlCollectionClass=org.apache.ojb.broker.util.collections.ManageableVector
 #
 # The SqlInLimit entry limits the number of values in IN-sql statement,
 # -1 for no limits. This hint is used in Criteria.
@@ -331,7 +313,7 @@
 #
 #
 #----------------------------------------------------------------------------------------
-# ODMG settings
+# ODMG-api settings
 #----------------------------------------------------------------------------------------
 # Specify the used base class for ODMG API
 # - ImplementationDefaultImpl is the default class
@@ -341,7 +323,6 @@
 ImplementationClass=org.apache.ojb.odmg.ImplementationImpl
 #ImplementationClass=org.apache.ojb.odmg.ImplementationJTAImpl
 #
-#
 # Specify the used tx handling.
 # - LocalTxManager use if you want the transaction to be associated by a thread
 # - JTATxManager use if you want the transaction to be associated via the Transaction
@@ -351,16 +332,49 @@
 #OJBTxManagerClass=org.apache.ojb.odmg.JTATxManager
 #
 #
+# Specify the cascading delete behavior of the odmg-api. The
+# specified settings will be used by odmg-api as default settings. It
+# is also possible to change these settings at runtime using the
+# TransactionExt#setCascadingDelete method.
+#
+# Enable disable cascading delete for 1:1 references
+cascadingDeleteOneToOne=false
+#
+# Enable disable cascading delete for 1:n references
+cascadingDeleteOneToN=false
+#
+# Enable disable cascading delete for m:n references
+cascadingDeleteMToN=false
+#
+#
+# The ImplicitLocking entry defines if implicit lock acquisition is
+# to be used. If set to 'true' OJB implicitely locks objects to ODMG
+# transactions after performing OQL queries and lookup objects.
+# If implicit locking is used locking objects is recursive, that is
+# associated objects are also locked.
+# If ImplicitLocking is set to 'false', no locks are obtained in OQL
+# queries, lookup objects and there is also no recursive locking.
+ImplicitLocking=true
+#ImplicitLocking=false
+#
+# The LockAssociations entry defines the behaviour for the OJB
+# implicit locking feature. If set to WRITE (default) acquiring a write-
+# lock on a given object x implies write locks on all objects associated
+# to x. If set to READ implicit read-locks are acquired.
+# Acquiring a read-lock on x thus allways results in implicit read-locks
+# on all associated objects.
+#LockAssociations=READ
+LockAssociations=WRITE
+#
+#
 # Used ODMG collection implementation classes
 # (e.g. when do a Implementation#newDlist() call)
 #
 # org.odmg.DList implementation class
-DListClass=org.apache.ojb.odmg.collections.DListImpl_2
-#DListClass=org.apache.ojb.odmg.collections.DListImpl
+DListClass=org.apache.ojb.odmg.collections.DListImpl
 #
 # org.odmg.DArray implementation class
-DArrayClass=org.apache.ojb.odmg.collections.DListImpl_2
-#DArrayClass=org.apache.ojb.odmg.collections.DListImpl
+DArrayClass=org.apache.ojb.odmg.collections.DListImpl
 #
 # org.odmg.DMap implementation class
 DMapClass=org.apache.ojb.odmg.collections.DMapImpl
@@ -407,7 +421,7 @@
 #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldAutoProxyImpl
 #
 # Here are the new upcoming PersistentField implementations. These classes will replace the
-# 'old' ones on next release. They pass the test-suite, but should be tested by community
too.
+# 'old' ones on next release. They pass the test-suite and be tested the last months.
 # The new implementations are about 50 times faster in handling nested fields.
 PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectAccessImplNew
 #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldPrivilegedImplNew

Modified: incubator/graffito/trunk/components/src/test/repository.dtd
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/src/test/repository.dtd?rev=365477&r1=365476&r2=365477&view=diff
==============================================================================
--- incubator/graffito/trunk/components/src/test/repository.dtd (original)
+++ incubator/graffito/trunk/components/src/test/repository.dtd Mon Jan  2 15:47:24 2006
@@ -1,21 +1,21 @@
-<!-- 
- Copyright 2002-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-
 <!-- @version $Id: $ -->
 <!--
+#/* Copyright 2004 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.
+# */
+-->
+<!--
 	ObJectRelationalBridge - Bridging Java objects and relational dabatases
 	This DTD describes the grammar of the Descriptor repository
 	Author: Thomas Mahler, (c) 2000, 2001, 2002, 2003
@@ -43,15 +43,15 @@
     file to a given version of this dtd. This will help to
     avoid versions conflicts.
 
-    The isolation attribute defines the default isolation level for
-    class-descriptor on ODMG api level that do not define a
-    specific isolation level (this does NOT touch the jdbc-level
-    of the connection).
+    The isolation-level attribute defines the default locking isolation level used
+    by OJB's pessimistic locking api. All jdbc-connection-descriptor or class-descriptor
+    that do not define a specific isolation level will use this.
+    Note: This does NOT touch the jdbc-level of the connection.
   -->
 <!ATTLIST descriptor-repository
 	version (1.0) #REQUIRED
 	isolation-level (read-uncommitted | read-committed | repeatable-read |
-	                 serializable | optimistic) "read-uncommitted"
+	                 serializable | optimistic | none) "read-uncommitted"
 	proxy-prefetching-limit CDATA "50"
 >
 
@@ -342,7 +342,7 @@
 
   -->
 <!ELEMENT class-descriptor
-	((documentation?, extent-class+, attribute*) |
+	((documentation?, object-cache?, extent-class+, attribute*) |
 	(documentation?, object-cache?, extent-class*, field-descriptor+,
 	 reference-descriptor*, collection-descriptor*,
      index-descriptor*, attribute*,
@@ -354,9 +354,10 @@
 	As this attribute is of type ID there can only be one class-descriptor per
 	class.
 
-	The isolation-level attribute specifies the transactional isolation to be
-	used for this class on ODMG api level (this does NOT touch the jdbc-level
-    of the connection).
+	The isolation-level attribute defines the locking isolation level of the
+    specified class (used by OJB's pessimistic locking api). Default is "empty String"
+    to use isolation-level defined on "descriptor-repository" level.
+    Note: This does NOT touch the jdbc-level of the connection.
 
 	If the proxy attribute is set, proxies are used for all loading operations
 	of instances of this class. If set to "dynamic", dynamic proxies are used.
@@ -399,7 +400,7 @@
 <!ATTLIST class-descriptor
 	class ID #REQUIRED
 	isolation-level (read-uncommitted | read-committed | repeatable-read |
-	                 serializable | optimistic) "read-uncommitted"
+	                 serializable | optimistic | none) ""
 	proxy CDATA #IMPLIED
 	proxy-prefetching-limit CDATA #IMPLIED
 	schema CDATA #IMPLIED
@@ -597,13 +598,13 @@
 	The auto-update attribute specifies whether OJB automatically stores
 	this reference attribute on storing the persistent object or not or only
     link the reference.
-	This attribute must be set to 'false' if using the OTM, ODMG or JDO layer.
-    More info see OJB documentation.
+	This attribute must be set to 'false' if using the OTM or JDO layer.
+    For ODMG it must be 'none' (since OJB 1.0.2). More info see OJB documentation.
 
 	The auto-delete attribute specifies whether OJB automatically deletes
 	this reference attribute on deleting the persistent object or not.
-	This attribute must be set to 'false' if using the OTM, ODMG or JDO layer.
-    More info see OJB documentation.
+	This attribute must be set to 'false' if using the OTM or JDO layer.
+    For ODMG it must be 'none' (since OJB 1.0.2). More info see OJB documentation.
 
 	The otm-dependent attribute specifies whether the OTM layer automatically
     creates the referred object or deletes it if the reference field is set to null.
@@ -713,13 +714,13 @@
 
 	The auto-update attribute specifies whether OJB automatically stores
 	the referenced objects on storing the persistent object or not or only link.
-	This attribute must be set to 'false' if using the OTM, ODMG or JDO layer.
-    More info see OJB documentation.
+	This attribute must be set to 'false' if using the OTM or JDO layer.
+    For ODMG it must be 'none' (since OJB 1.0.2). More info see OJB documentation.
 
 	The auto-delete attribute specifies whether OJB automatically deletes
 	the referenced objects on deleting the persistent object or not.
-	This attribute must be set to false if using the OTM, ODMG or JDO layer.
-    More info see OJB documentation.
+	This attribute must be set to 'false' if using the OTM or JDO layer.
+    For ODMG it must be 'none' (since OJB 1.0.2). More info see OJB documentation.
 
 	The otm-dependent attribute specifies whether the OTM layer automatically
     creates collection elements that were included into the collectionelements

Modified: incubator/graffito/trunk/components/src/test/repository.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/src/test/repository.xml?rev=365477&r1=365476&r2=365477&view=diff
==============================================================================
--- incubator/graffito/trunk/components/src/test/repository.xml (original)
+++ incubator/graffito/trunk/components/src/test/repository.xml Mon Jan  2 15:47:24 2006
@@ -23,7 +23,7 @@
 
 <descriptor-repository version="1.0" isolation-level="read-uncommitted">
 
-	<jdbc-connection-descriptor   jcd-alias="graffitoMasterStoreDB"  platform="Hsqldb"  default-connection="true"
 jdbc-level="2.0"      
+	<jdbc-connection-descriptor   jcd-alias="graffitoMasterStoreDB"  platform="MySQL"  default-connection="true"
 jdbc-level="2.0"      
                                                    jndi-datasource-name="java:comp/env/jdbc/graffitotest"
 batch-mode="false">
     
 		<connection-pool    maxActive="21" validationQuery="" />

Modified: incubator/graffito/trunk/components/src/test/repository_internal.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/src/test/repository_internal.xml?rev=365477&r1=365476&r2=365477&view=diff
==============================================================================
--- incubator/graffito/trunk/components/src/test/repository_internal.xml (original)
+++ incubator/graffito/trunk/components/src/test/repository_internal.xml Mon Jan  2 15:47:24
2006
@@ -1,23 +1,30 @@
-<!-- 
- Copyright 2002-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
+<!-- OJB INTERNAL MAPPINGS START HERE, DO NOT EDIT -->
+<!--
+#/* Copyright 2002-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<!-- The OJB HIGH/LOW SequenceManagerTable -->
    <class-descriptor
-   	  class="org.apache.ojb.broker.util.sequence.HighLowSequence"
-   	  table="OJB_HL_SEQ"
+      class="org.apache.ojb.broker.util.sequence.HighLowSequence"
+      table="OJB_HL_SEQ"
    >
-      <field-descriptor
+
+       <object-cache class="org.apache.ojb.broker.cache.ObjectCacheEmptyImpl">
+       </object-cache>
+
+       <field-descriptor
          name="tableName"
          column="TABLENAME"
          jdbc-type="VARCHAR"
@@ -32,7 +39,7 @@
       <field-descriptor
          name="maxKey"
          column="MAX_KEY"
-         jdbc-type="INTEGER"
+         jdbc-type="BIGINT"
       />
       <field-descriptor
          name="grabSize"
@@ -48,42 +55,9 @@
    </class-descriptor>
 
 
+<!-- THIS IS THE OJB NAMED ROOTS TABLE, DO NOT EDIT-->
    <class-descriptor
-   	  class="org.apache.ojb.odmg.locking.LockEntry"
-   	  table="OJB_LOCKENTRY"
-   >
-      <field-descriptor
-         name="oidString"
-         column="OID_"
-         jdbc-type="VARCHAR"
-         primarykey="true"
-      />
-      <field-descriptor
-         name="transactionId"
-         column="TX_ID"
-         jdbc-type="VARCHAR"
-         primarykey="true"
-      />
-      <field-descriptor
-         name="timestamp"
-         column="TIMESTAMP_"
-         jdbc-type="BIGINT"
-      />
-      <field-descriptor
-         name="isolationLevel"
-         column="ISOLATIONLEVEL"
-         jdbc-type="INTEGER"
-      />
-      <field-descriptor
-         name="lockType"
-         column="LOCKTYPE"
-         jdbc-type="INTEGER"
-      />
-   </class-descriptor>
-
-
-   <class-descriptor
-   	  class="org.apache.ojb.odmg.NamedRootsEntry"
+   	  class="org.apache.ojb.odmg.NamedRootsMap$NamedEntry"
    	  table="OJB_NRM"
    >
       <field-descriptor
@@ -99,7 +73,7 @@
       />
    </class-descriptor>
 
-
+<!-- THIS IS THE OJB DLIST IMPLEMENTATION, DO NOT EDIT-->
    <class-descriptor
    	  class="org.apache.ojb.odmg.collections.DListImpl"
    	  table="OJB_DLIST"
@@ -111,19 +85,19 @@
          primarykey="true"
          autoincrement="true"
       />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
+
       <collection-descriptor
          name="elements"
          element-class-ref="org.apache.ojb.odmg.collections.DListEntry"
+          auto-retrieve = "true"
+          auto-update="none"
+          auto-delete="none"
       >
          <inverse-foreignkey field-ref="dlistId"/>
       </collection-descriptor>
    </class-descriptor>
 
+<!-- THIS IS THE OJB DLIST ENTRY IMPLEMENTATION, DO NOT EDIT-->
    <class-descriptor
       class="org.apache.ojb.odmg.collections.DListEntry"
       table="OJB_DLIST_ENTRIES"
@@ -153,7 +127,7 @@
       />
    </class-descriptor>
 
-
+   <!-- THIS IS THE OJB DBAG IMPLEMENTATION, DO NOT EDIT-->
    <class-descriptor
    	  class="org.apache.ojb.odmg.collections.DBagImpl"
    	  table="OJB_DLIST"
@@ -165,14 +139,12 @@
          primarykey="true"
          autoincrement="true"
       />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
       <collection-descriptor
          name="elements"
          element-class-ref="org.apache.ojb.odmg.collections.DListEntry"
+          auto-retrieve = "true"
+          auto-update="none"
+          auto-delete="none"
       >
          <inverse-foreignkey field-ref="dlistId"/>
       </collection-descriptor>
@@ -190,14 +162,12 @@
          primarykey="true"
          autoincrement="true"
       />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
       <collection-descriptor
          name="elements"
          element-class-ref="org.apache.ojb.odmg.collections.DSetEntry"
+          auto-retrieve = "true"
+          auto-update="none"
+          auto-delete="none"
       >
          <inverse-foreignkey field-ref="dlistId"/>
       </collection-descriptor>
@@ -245,15 +215,13 @@
          primarykey="true"
          autoincrement="true"
       />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
       <collection-descriptor
          name="entries"
          element-class-ref="org.apache.ojb.odmg.collections.DMapEntry"
          collection-class="org.apache.ojb.broker.util.collections.ManageableHashSet"
+          auto-retrieve = "true"
+          auto-update="none"
+          auto-delete="none"
       >
          <inverse-foreignkey field-ref="dmapId"/>
       </collection-descriptor>
@@ -277,18 +245,19 @@
          jdbc-type="INTEGER"
       />
       <field-descriptor
-         name="keyOID"
+         name="keyOid"
          column="KEY_OID"
          jdbc-type="LONGVARBINARY"
          conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"
       />
       <field-descriptor
-         name="valueOID"
+         name="valueOid"
          column="VALUE_OID"
          jdbc-type="LONGVARBINARY"
          conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"
       />
    </class-descriptor>
+
 
 
    <!-- END OF OJB INTERNAL MAPPINGS-->



Mime
View raw message