Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 38330 invoked from network); 23 May 2005 05:19:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 May 2005 05:19:19 -0000 Received: (qmail 37258 invoked by uid 500); 23 May 2005 05:19:18 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 37228 invoked by uid 500); 23 May 2005 05:19:18 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 37213 invoked by uid 99); 23 May 2005 05:19:18 -0000 X-ASF-Spam-Status: No, hits=-9.7 required=10.0 tests=ALL_TRUSTED,NORMAL_HTTP_TO_IP,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 22 May 2005 22:19:17 -0700 Received: (qmail 38319 invoked by uid 65534); 23 May 2005 05:19:16 -0000 Message-ID: <20050523051916.38318.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r177924 - in /cocoon/blocks/unsupported/ojb/trunk/conf: OJB-logging.properties OJB.properties repository.dtd repository.xml repository_database.xml repository_internal.xml Date: Mon, 23 May 2005 05:19:15 -0000 To: cvs@cocoon.apache.org From: antonio@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: antonio Date: Sun May 22 22:19:14 2005 New Revision: 177924 URL: http://svn.apache.org/viewcvs?rev=3D177924&view=3Drev Log: Update db-ojb to 1.0.3 Modified: cocoon/blocks/unsupported/ojb/trunk/conf/OJB-logging.properties cocoon/blocks/unsupported/ojb/trunk/conf/OJB.properties cocoon/blocks/unsupported/ojb/trunk/conf/repository.dtd cocoon/blocks/unsupported/ojb/trunk/conf/repository.xml cocoon/blocks/unsupported/ojb/trunk/conf/repository_database.xml cocoon/blocks/unsupported/ojb/trunk/conf/repository_internal.xml Modified: cocoon/blocks/unsupported/ojb/trunk/conf/OJB-logging.properties URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/ojb/trunk/conf= /OJB-logging.properties?rev=3D177924&r1=3D177923&r2=3D177924&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/ojb/trunk/conf/OJB-logging.properties (origin= al) +++ cocoon/blocks/unsupported/ojb/trunk/conf/OJB-logging.properties Sun May= 22 22:19:14 2005 @@ -75,6 +75,16 @@ org.apache.ojb.broker.accesslayer.ConnectionManagerImpl.LogLevel=3DWARN # Logger for IndirectionHandler class org.apache.ojb.broker.core.proxy.IndirectionHandler.LogLevel=3DWARN +# Logger for MaterializationCache +org.apache.ojb.broker.cache.MaterializationCache.LogLevel=3DWARN +# Logger for CacheDistributor +org.apache.ojb.broker.cache.CacheDistributor.LogLevel=3DWARN +# Logger for ObjectCacheDefaultImpl +org.apache.ojb.broker.cache.ObjectCacheDefaultImpl.LogLevel=3DWARN +# Logger for ObjectCacheTwoLevelImpl +org.apache.ojb.broker.cache.ObjectCacheTwoLevelImpl.LogLevel=3DWARN +# Logger for Oracle9i platform, useful for tracing failing Oracle-extensio= ns or large LOB-support +org.apache.ojb.broker.platforms.PlatformOracle9iImpl.LogLevel=3DWARN # # Special Logger categories used in test suite and tutorials # Modified: cocoon/blocks/unsupported/ojb/trunk/conf/OJB.properties URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/ojb/trunk/conf= /OJB.properties?rev=3D177924&r1=3D177923&r2=3D177924&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/ojb/trunk/conf/OJB.properties (original) +++ cocoon/blocks/unsupported/ojb/trunk/conf/OJB.properties Sun May 22 22:1= 9:14 2005 @@ -18,7 +18,7 @@ # Version: 1.0 # (c) 2001, 2002, 2003 Apache Software Foundation # Author: Thomas Mahler and many others -# @version $Id: OJB.properties,v 1.75 2004/06/27 23:36:23 arminw Exp $ +# @version $Id: OJB.properties,v 1.75.2.7 2005/04/03 02:40:57 arminw Exp $ # #-------------------------------------------------------------------------= --------------- # repository file settings @@ -215,21 +215,13 @@ # RowReader on class-descriptor level. RowReaderDefaultClass=3Dorg.apache.ojb.broker.accesslayer.RowReaderDefault= Impl # +# #-------------------------------------------------------------------------= --------------- # 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=3Dorg.apache.ojb.broker.cache.ObjectCacheDefaultImpl -#ObjectCacheClass=3Dorg.apache.ojb.broker.cache.ObjectCacheEmptyImpl -#ObjectCacheClass=3Dorg.apache.ojb.broker.cache.ObjectCachePerBrokerImpl -#ObjectCacheClass=3Dorg.apache.ojb.broker.cache.ObjectCacheJCSPerClassImpl -#ObjectCacheClass=3Dorg.apache.ojb.broker.cache.ObjectCachePerClassImpl -# +# NOTE: ObjectCacheClass declaration in OJB.properties file was removed (s= ince OJB 1.0.2). +# The concrete ObjectCache implementation has to specified in the reposito= ry 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. @@ -240,88 +232,69 @@ # instances for the same class. descriptorBasedCaches=3Dfalse # -# -# 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=3Dorg.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=3Dorg.apache.ojb.odmg.locking.LockManagerDefaultImpl +# The 'LockManagerClass' specify the internal used LockManager implementat= ion. +# If OJB is running in distributed environment it is recommended to use th= e remote +# lock manager. It guarantees to provide Lockmanagement across multiple JV= M's. +# +# The deprecated odmg locking implementation. Needs enabled 'LockMapClass'= too. +#@deprecated LockManagerClass=3Dorg.apache.ojb.odmg.locking.LockManagerDef= aultImpl +# A servlet based lock implementation for distributed environments, needs = enabled +# property 'LockServletUrl' too. +#LockManagerClass=3Dorg.apache.ojb.broker.locking.LockManagerRemoteImpl +# Lock manager implementation using apache's commons-transaction locking a= pi +#LockManagerClass=3Dorg.apache.ojb.broker.locking.LockManagerCommonsImpl +LockManagerClass=3Dorg.apache.ojb.broker.locking.LockManagerInMemoryImpl +# +# The LockServletUrl entry points to the Lockserver servlet. +# This Servlet is addressed by all distributed JVMs if the RemoteLockMapIm= pl +# is used. +#LockServletUrl=3Dhttp://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 =3D 1 minute +LockTimeout=3D60000 +# # +# ------ 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 h= ave 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=3Dorg.apache.ojb.odmg.locking.RemoteLockMapImpl -LockMapClass=3Dorg.apache.ojb.odmg.locking.InMemoryLockMapImpl -# -# The LockTimeout entry defines the maximum time in milliseconds -# that a lock may be hold. Defaults to 60000 =3D 1 minute -LockTimeout=3D60000 -# -# 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=3Dtrue -#ImplicitLocking=3Dfalse -# -# -# The LockServletUrl entry points to the Lockserver servlet. -# This Servlet is addressed by all distributed JVMs if the RemoteLockMapIm= pl -# is used. -LockServletUrl=3Dhttp://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=3DREAD -LockAssociations=3DWRITE +# These settings are deprecated, only needed in conjunction with the old o= dmg 'LockManagerClass' +# @deprecated LockMapClass=3Dorg.apache.ojb.odmg.locking.RemoteLockMapImpl +# @deprecated LockMapClass=3Dorg.apache.ojb.odmg.locking.InMemoryLockMapIm= pl # # #-------------------------------------------------------------------------= --------------- # 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 featur= es 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=3Dorg.apache.ojb.odmg.collections.DListImpl_2 -# OqlCollectionClass=3Dorg.apache.ojb.broker.util.collections.ManageableAr= rayList -# OqlCollectionClass=3Dorg.apache.ojb.broker.util.ManageableVector +#OqlCollectionClass=3Dorg.apache.ojb.broker.util.collections.ManageableArr= ayList +OqlCollectionClass=3Dorg.apache.ojb.odmg.collections.DListImpl +# OqlCollectionClass=3Dorg.apache.ojb.broker.util.collections.ManageableVe= ctor # # The SqlInLimit entry limits the number of values in IN-sql statement, # -1 for no limits. This hint is used in Criteria. @@ -329,7 +302,7 @@ # # #-------------------------------------------------------------------------= --------------- -# ODMG settings +# ODMG-api settings #-------------------------------------------------------------------------= --------------- # Specify the used base class for ODMG API # - ImplementationDefaultImpl is the default class @@ -339,7 +312,6 @@ ImplementationClass=3Dorg.apache.ojb.odmg.ImplementationImpl #ImplementationClass=3Dorg.apache.ojb.odmg.ImplementationJTAImpl # -# # Specify the used tx handling. # - LocalTxManager use if you want the transaction to be associated by a t= hread # - JTATxManager use if you want the transaction to be associated via the = Transaction @@ -349,16 +321,49 @@ #OJBTxManagerClass=3Dorg.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=3Dfalse +# +# Enable disable cascading delete for 1:n references +cascadingDeleteOneToN=3Dfalse +# +# Enable disable cascading delete for m:n references +cascadingDeleteMToN=3Dfalse +# +# +# 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=3Dtrue +#ImplicitLocking=3Dfalse +# +# 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=3DREAD +LockAssociations=3DWRITE +# +# # Used ODMG collection implementation classes # (e.g. when do a Implementation#newDlist() call) # # org.odmg.DList implementation class -DListClass=3Dorg.apache.ojb.odmg.collections.DListImpl_2 -#DListClass=3Dorg.apache.ojb.odmg.collections.DListImpl +DListClass=3Dorg.apache.ojb.odmg.collections.DListImpl # # org.odmg.DArray implementation class -DArrayClass=3Dorg.apache.ojb.odmg.collections.DListImpl_2 -#DArrayClass=3Dorg.apache.ojb.odmg.collections.DListImpl +DArrayClass=3Dorg.apache.ojb.odmg.collections.DListImpl # # org.odmg.DMap implementation class DMapClass=3Dorg.apache.ojb.odmg.collections.DMapImpl @@ -405,7 +410,7 @@ #PersistentFieldClass=3Dorg.apache.ojb.broker.metadata.fieldaccess.Persist= entFieldAutoProxyImpl # # 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 test= ed by community too. +# 'old' ones on next release. They pass the test-suite and be tested the l= ast months. # The new implementations are about 50 times faster in handling nested fie= lds. PersistentFieldClass=3Dorg.apache.ojb.broker.metadata.fieldaccess.Persiste= ntFieldDirectAccessImplNew #PersistentFieldClass=3Dorg.apache.ojb.broker.metadata.fieldaccess.Persist= entFieldPrivilegedImplNew Modified: cocoon/blocks/unsupported/ojb/trunk/conf/repository.dtd URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/ojb/trunk/conf= /repository.dtd?rev=3D177924&r1=3D177923&r2=3D177924&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/ojb/trunk/conf/repository.dtd (original) +++ cocoon/blocks/unsupported/ojb/trunk/conf/repository.dtd Sun May 22 22:1= 9:14 2005 @@ -43,15 +43,15 @@ file to a given version of this dtd. This will help to avoid versions conflicts. =20 - 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 le= vel used + by OJB's pessimistic locking api. All jdbc-connection-descriptor or cl= ass-descriptor + that do not define a specific isolation level will use this. + Note: This does NOT touch the jdbc-level of the connection. --> =20 @@ -342,7 +342,7 @@ =20 --> + Modified: cocoon/blocks/unsupported/ojb/trunk/conf/repository_database.xml URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/ojb/trunk/conf= /repository_database.xml?rev=3D177924&r1=3D177923&r2=3D177924&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/ojb/trunk/conf/repository_database.xml (origi= nal) +++ cocoon/blocks/unsupported/ojb/trunk/conf/repository_database.xml Sun Ma= y 22 22:19:14 2005 @@ -45,6 +45,21 @@ useAutoCommit=3D"1" ignoreAutoCommitExceptions=3D"false" > + + + + + + + + + + + + + + + =20 =20 + + + + + + Modified: cocoon/blocks/unsupported/ojb/trunk/conf/repository_internal.xml URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/ojb/trunk/conf= /repository_internal.xml?rev=3D177924&r1=3D177923&r2=3D177924&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/ojb/trunk/conf/repository_internal.xml (origi= nal) +++ cocoon/blocks/unsupported/ojb/trunk/conf/repository_internal.xml Sun Ma= y 22 22:19:14 2005 @@ -57,43 +57,10 @@ /> =20 - - - - - - - - =20 - + @@ -164,64 +130,7 @@ /> =20 - - - - - - - - - - - - - - - - - - - + - @@ -258,14 +165,12 @@ primarykey=3D"true" autoincrement=3D"true" /> - @@ -313,15 +218,13 @@ primarykey=3D"true" autoincrement=3D"true" /> - @@ -345,17 +248,19 @@ jdbc-type=3D"INTEGER" /> =20 - + + +