You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dl...@apache.org on 2004/03/18 20:42:05 UTC

cvs commit: jakarta-jetspeed-2/portal/src/java repository.dtd.rc5 repository_internal.xml.rc5 OJB.properties.rc5 repository_internal.xml repository.dtd OJB.properties

dlestrat    2004/03/18 11:42:05

  Modified:    portal/src/java repository_internal.xml repository.dtd
                        OJB.properties
  Added:       portal/src/java repository.dtd.rc5
                        repository_internal.xml.rc5 OJB.properties.rc5
  Log:
  Issue when running the application. Back to OJB RC4 ;(...
  
  Revision  Changes    Path
  1.4       +4 -66     jakarta-jetspeed-2/portal/src/java/repository_internal.xml
  
  Index: repository_internal.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/repository_internal.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- repository_internal.xml	18 Mar 2004 06:12:12 -0000	1.3
  +++ repository_internal.xml	18 Mar 2004 19:42:05 -0000	1.4
  @@ -2,14 +2,10 @@
   
   <!-- 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"
      >
  -
  -       <object-cache class="org.apache.ojb.broker.cache.ObjectCacheEmptyImpl">
  -       </object-cache>
  -
  -       <field-descriptor
  +      <field-descriptor
            name="tableName"
            column="TABLENAME"
            jdbc-type="VARCHAR"
  @@ -24,7 +20,7 @@
         <field-descriptor
            name="maxKey"
            column="MAX_KEY"
  -         jdbc-type="BIGINT"
  +         jdbc-type="INTEGER"
         />
         <field-descriptor
            name="grabSize"
  @@ -148,63 +144,6 @@
         />
      </class-descriptor>
   
  -   <!-- THIS IS THE OJB DLIST IMPLEMENTATION, DO NOT EDIT-->
  -   <!-- alternative implementation of DList -->
  -   <class-descriptor
  -   	  class="org.apache.ojb.odmg.collections.DListImpl_2"
  -   	  table="OJB_DLIST"
  -   >
  -      <field-descriptor
  -         name="id"
  -         column="ID"
  -         jdbc-type="INTEGER"
  -         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_2"
  -         auto-retrieve = "true"
  -      >
  -         <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_2"
  -      table="OJB_DLIST_ENTRIES"
  -   >
  -      <field-descriptor
  -         name="id"
  -         column="ID"
  -         jdbc-type="INTEGER"
  -         primarykey="true"
  -         autoincrement="true"
  -      />
  -      <field-descriptor
  -         name="dlistId"
  -         column="DLIST_ID"
  -         jdbc-type="INTEGER"
  -      />
  -      <field-descriptor
  -         name="position"
  -         column="POSITION_"
  -         jdbc-type="INTEGER"
  -      />
  -      <field-descriptor
  -         name="oid"
  -         column="OID_"
  -         jdbc-type="LONGVARBINARY"
  -         conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"
  -      />
  -   </class-descriptor>
  -
      <!-- THIS IS THE OJB DBAG IMPLEMENTATION, DO NOT EDIT-->
      <class-descriptor
      	  class="org.apache.ojb.odmg.collections.DBagImpl"
  @@ -341,7 +280,6 @@
            conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"
         />
      </class-descriptor>
  -
   
   
      <!-- END OF OJB INTERNAL MAPPINGS-->
  
  
  
  1.3       +24 -220   jakarta-jetspeed-2/portal/src/java/repository.dtd
  
  Index: repository.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/repository.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- repository.dtd	18 Mar 2004 06:12:12 -0000	1.2
  +++ repository.dtd	18 Mar 2004 19:42:05 -0000	1.3
  @@ -1,4 +1,3 @@
  -<!-- @version $Id$ -->
   <!--
   	ObJectRelationalBridge - Bridging Java objects and relational dabatases
   	This DTD describes the grammar of the Descriptor repository
  @@ -19,8 +18,7 @@
   	class-descriptor elements specify o/r mapping information for
   	persistent classes.
     -->
  -<!ELEMENT descriptor-repository (documentation?, attribute*,
  -        jdbc-connection-descriptor*, class-descriptor*)>
  +<!ELEMENT descriptor-repository (documentation?, attribute*, jdbc-connection-descriptor*, class-descriptor*)>
   
   <!--
   	The version attribute is used to bind a repository.xml
  @@ -36,7 +34,6 @@
   	version (1.0) #REQUIRED
   	isolation-level (read-uncommitted | read-committed | repeatable-read |
   	                 serializable | optimistic) "read-uncommitted"
  -	proxy-prefetching-limit CDATA "50"
   >
   
   <!--
  @@ -45,15 +42,14 @@
   -->
   <!ELEMENT documentation (#PCDATA)>
   
  +<!ELEMENT database-repository (jdbc-connection-descriptor*)>
  +
   <!--
   	The attribute element allows to add custom attributes.
   
       The jdbc-connection-descriptor element specifies the a jdbc
   	connection for the repository.
   
  -    The object-cache element specifies the object-cache implementation
  -    class associated with this class.
  -
   	A connection-pool element may be used to define connection pool
   	properties for the specified JDBC connection.
   
  @@ -61,8 +57,8 @@
       define which sequence manager implementation should be used within
       the defined connection.
     -->
  -<!ELEMENT jdbc-connection-descriptor (documentation?, attribute*,
  -                object-cache?, connection-pool?, sequence-manager?)>
  +<!ELEMENT jdbc-connection-descriptor (documentation?, attribute*, connection-pool?, sequence-manager?)>
  +
   
   <!--
       The jcdAlias attribute is a shortcut name for the defined connection
  @@ -84,16 +80,12 @@
   	level of the used Jdbc driver.
   
       The eager-release attribute was adopt to solve a problem occured when
  -    using OJB within JBoss (3.0 <= version < 3.2.2, seems to be fixed in jboss 3.2.2).
  -    Only use within JBoss.
  +    using OJB within JBoss (>=3.0). Only use within JBoss.
   
  -    The batch-mode attribute allow to enable JDBC connection batch support
  -    (if supported by used database), 'true' value allows to enable per-session
  -    batch mode, whereas 'false' prohibits it.
  -    PB.serviceConnectionManager.setBatchMode(...) method can be used
  -    to switch on/off batch modus, if batch-mode was enabled. On PB.close()
  -    OJB switch off batch modus, thus you have to do '...setBatchMode(true)' on each
  -    obtained PB instance.
  +    The batch-mode attribute allow to set batch mode modus global
  +    from the used connection. It is also possible to change
  +    batch mode at runtime, using the
  +    PB.serviceConnectionManager.setBatchMode(...) method.
   
       The useAutoCommit attribute allow to set how OJB uses
       the autoCommit state of the used connections. The default mode
  @@ -126,9 +118,8 @@
   	jcd-alias CDATA #REQUIRED
       default-connection (true | false) "false"
       platform (Db2 | Hsqldb | Informix | MsAccess | MsSQLServer |
  -	          MySQL | Oracle | PostgreSQL | Sybase | SybaseASE |
  -              SybaseASA | Sapdb | Firebird | Axion | NonstopSql |
  -              Oracle9i | MaxDB ) "Hsqldb"
  +	          MySQL | Oracle | PostgreSQL | Sybase | SybaseASE|
  +              SybaseASA | Sapdb | Firebird | Axion | NonstopSql ) "Hsqldb"
   	jdbc-level (1.0 | 2.0 | 3.0) "1.0"
   	eager-release (true | false) "false"
       batch-mode (true | false) "false"
  @@ -148,36 +139,6 @@
   
   
   <!--
  -    The object-cache element can be used to specify the ObjectCache
  -    implementation used by OJB. There are three levels of
  -    declaration:
  -        1. in OJB.properties file, to declare the standard (default)
  -        ObjectCache implementation.
  -        2. on jdbc-connection-descriptor level, to declare ObjectCache implementation
  -        on a per connection/user level
  -        3. on class-descriptor level, to declare ObjectCache implementation
  -        on a per class level
  -
  -    The priority of the declared object-cache elements are:
  -    per class > per jdbc descriptor > standard
  -
  -    E.g. if you declare ObjectCache 'cacheDef' as standard, set
  -    ObjectCache 'cacheA' in class-descriptor for class A and class B
  -    does not declare an object-cache element. Then OJB use cacheA as ObjectCache
  -    for class A and cacheDef for class B
  --->
  -<!ELEMENT object-cache (documentation?, attribute*)>
  -
  -<!--
  -    Attribute 'class' specifies the full qualified class name of
  -    the used ObjectCache implementation.
  --->
  -<!ATTLIST object-cache
  -    class                          CDATA #REQUIRED
  ->
  -
  -
  -<!--
   	The connection-pool element specifies the connection pooling
   	parameter.
   -->
  @@ -317,20 +278,12 @@
   
   	A class-descriptor may contain user defined custom attribute elements.
   
  -    The insert-procedure, update-procedure and delete-procedure elements
  -    identify the procedure/function that is defined in the database which
  -    will handle the insertion, update or deletion of an instance of this
  -    class.  These elements are all optional.  If they are absent then basic
  -    sql statements (INSERT INTO xxx..., UPDATE xxx, DELETE FROM xxx) will
  -    be utilized.
  -
     -->
   <!ELEMENT class-descriptor
   	((documentation?, extent-class+, attribute*) |
  -	(documentation?, object-cache?, extent-class*, field-descriptor+,
  +	(documentation?, extent-class*, field-descriptor+,
   	 reference-descriptor*, collection-descriptor*,
  -     index-descriptor*, attribute*,
  -     insert-procedure?, update-procedure?, delete-procedure?))>
  +     index-descriptor*, attribute*))>
   
   
   <!--
  @@ -347,13 +300,6 @@
   	If set to another value this value is interpreted as the full-qualified
   	name of the proxy class to use.
   
  -    If the proxy-prefetching-limit attribute (used with the proxy attribute)
  -    is set to the value > 0, the collections of objects of this class are materialized
  -    by groups of the specified size, say when user tries to access the first
  -    object of the collection, next proxy-prefetching-limit objects are loaded
  -    by one database query.
  -    Set this parameter to 0 if you want to turn this feature off.
  -
   	The schema attribute may contain the database schema owning the table
   	mapped to this class.
   
  @@ -367,25 +313,24 @@
   	propagate to this class.  Currently relevant for the ODMG layer only.
   
   	The optional initialization-method specifies a no-argument instance
  -	method that is invoked after reading an instance from a database row.
  +	method that is invoked after reading an instnace from a database row.
   	It can be used to do initialization and validations.
   
  -	The optional factory-class specifies a factory-class that
  +	The optional factory-method specifies a static no-argument method
  +	(specified by the factory-class attribute)
   	that is to be used instead of a no argument constructor.
  -	If the factory-class is specified the factory-method
  -	also must be defined.
  -	factory-method refers to a static no-argument method
  -	of the factory-class class.
  -
  +	If either factory-class or factory-method is specified, the other
  +	is mandatory.
  +	
   	The refresh attribute can be set to true to force OJB to refresh
   	instances when loaded from cache. It's set to false by default.
  +
     -->
   <!ATTLIST class-descriptor
   	class ID #REQUIRED
   	isolation-level (read-uncommitted | read-committed | repeatable-read |
   	                 serializable | optimistic) "read-uncommitted"
   	proxy CDATA #IMPLIED
  -	proxy-prefetching-limit CDATA #IMPLIED
   	schema CDATA #IMPLIED
   	table CDATA #IMPLIED
   	row-reader CDATA #IMPLIED
  @@ -441,9 +386,7 @@
   	The column attribute specifies the column the persistent classes field
   	is mapped to.
   
  -	The optional jdbc-type attribute specifies the JDBC type of the column.
  -	If not specified OJB tries to identify the JDBC type by inspecting the
  -	Java attribute by reflection.
  +	The jdbc-type attribute specifies the JDBC type of the column.
   
   	The primarykey specifies if the column is a primary key column.
   
  @@ -505,8 +448,7 @@
   	jdbc-type (BIT | TINYINT | SMALLINT | INTEGER | BIGINT | DOUBLE |
   	           FLOAT | REAL | NUMERIC | DECIMAL | CHAR | VARCHAR |
   	           LONGVARCHAR | DATE | TIME | TIMESTAMP | BINARY |
  -	           VARBINARY | LONGVARBINARY | CLOB | BLOB | STRUCT |
  -               ARRAY | REF | BOOLEAN | DATALINK) #IMPLIED
  +	           VARBINARY | LONGVARBINARY | CLOB | BLOB) #REQUIRED
   	primarykey (true | false) "false"
   	nullable (true | false) "true"
   	indexed (true | false) "false"
  @@ -564,12 +506,6 @@
   	The proxy attribute can be set to true to specify that proxy based
   	lazy loading should be used for this attribute.
   
  -    If the proxy-prefetching-limit attribute (used with the proxy attribute)
  -    is set to the value > 0, then loading of the reference for the first
  -    object of some collection causes loading of the references for
  -    the next proxy-prefetching-limit objects.
  -    Set this parameter to 0 if you want to turn this feature off.
  -
   	The refresh attribute can be set to true to force OJB to refresh
   	object references on instance loading.
   
  @@ -598,7 +534,6 @@
   	class-ref IDREF #REQUIRED
   
   	proxy (true | false) "false"
  -	proxy-prefetching-limit CDATA #IMPLIED
   	refresh (true | false) "false"
   
   	auto-retrieve (true | false) "true"
  @@ -676,12 +611,6 @@
   	The proxy attribute can be set to true to specify that proxy based
   	lazy loading should be used for this attribute.
   
  -    If the proxy-prefetching-limit attribute (used with the proxy attribute)
  -    is set to the value > 0, then loading of the collection for the first
  -    object of some other collection causes loading of the collections for
  -    the next proxy-prefetching-limit objects.
  -    Set this parameter to 0 if you want to turn this feature off.
  -
   	The refresh attribute can be set to true to force OJB to refresh
   	object and collection references on instance loading.
   
  @@ -705,7 +634,7 @@
       were set to true, but the auto-update and auto-delete attributes themself
       must be always set to false for use with OTM layer.
   
  -
  +	
     -->
   <!ATTLIST collection-descriptor
   	name CDATA #IMPLIED
  @@ -717,7 +646,6 @@
   	indirection-table CDATA #IMPLIED
   
   	proxy (true | false) "false"
  -	proxy-prefetching-limit CDATA #IMPLIED
   	refresh (true | false) "false"
   
   	auto-retrieve (true | false) "true"
  @@ -801,127 +729,3 @@
   <!ELEMENT index-column (documentation?)>
   <!ATTLIST index-column
       name CDATA #REQUIRED>
  -
  -<!--
  -	Identifies the procedure/function that should be used to handle
  -    insertions for a specific class-descriptor.
  -
  -    The nested 'argument' elements define the argument list for the
  -    procedure/function as well as the source for each argument.
  -
  -    The name attribute identifies the name of the procedure/function to use
  -
  -    The return-field-ref identifies the field-descriptor that will receive
  -    the value that is returned by the procedure/function.  If the procedure/
  -    function does not include a return value, then do not specify a value
  -    for this attribute.
  -
  -    The include-all-fields attribute indicates if all field-descriptors in
  -    the corresponding class-descriptor are to be passed to the procedure/
  -    function.  If include-all-fields is 'true', any nested 'argument'
  -    elements will be ignored.  In this case, values for all field-descriptors
  -    will be passed to the procedure/function.  The order of values that are
  -    passed to the procedure/function will match the order of field-descriptors
  -    on the corresponding class-descriptor.  If include-all-fields is false,
  -    then values will be passed to the procedure/function based on the
  -    information in the nested 'argument' elements.
  -  -->
  -<!ELEMENT insert-procedure
  -	(documentation?, (runtime-argument | constant-argument)*, attribute*)>
  -<!ATTLIST insert-procedure
  -	name CDATA #REQUIRED
  -    return-field-ref CDATA #IMPLIED
  -    include-all-fields (true | false) "false"
  ->
  -
  -<!--
  -	Identifies the procedure/function that should be used to handle
  -    updates for a specific class-descriptor.
  -
  -    The nested 'argument' elements define the argument list for the
  -    procedure/function as well as the source for each argument.
  -
  -    The name attribute identifies the name of the procedure/function to use
  -
  -    The return-field-ref identifies the field-descriptor that will receive
  -    the value that is returned by the procedure/function.  If the procedure/
  -    function does not include a return value, then do not specify a value
  -    for this attribute.
  -
  -    The include-all-fields attribute indicates if all field-descriptors in
  -    the corresponding class-descriptor are to be passed to the procedure/
  -    function.  If include-all-fields is 'true', any nested 'argument'
  -    elements will be ignored.  In this case, values for all field-descriptors
  -    will be passed to the procedure/function.  The order of values that are
  -    passed to the procedure/function will match the order of field-descriptors
  -    on the corresponding class-descriptor.  If include-all-fields is false,
  -    then values will be passed to the procedure/function based on the
  -    information in the nested 'argument' elements.
  -  -->
  -<!ELEMENT update-procedure
  -	(documentation?, (runtime-argument | constant-argument)*, attribute*)>
  -<!ATTLIST update-procedure
  -	name CDATA #REQUIRED
  -    return-field-ref CDATA #IMPLIED
  -    include-all-fields (true | false) "false"
  ->
  -
  -<!--
  -	Identifies the procedure/function that should be used to handle
  -    deletions for a specific class-descriptor.
  -
  -    The nested 'runtime-argument' and 'constant-argument' elements define
  -    the argument list for the procedure/function as well as the source
  -    for each argument.
  -
  -    The name attribute identifies the name of the procedure/function to use
  -
  -    The return-field-ref identifies the field-descriptor that will receive
  -    the value that is returned by the procedure/function.  If the procedure/
  -    function does not include a return value, then do not specify a value
  -    for this attribute.
  -
  -    The include-pk-only attribute indicates if all field-descriptors in
  -    the corresponding class-descriptor that are identified as being part of
  -    the primary key are to be passed to the procedure/function.  If
  -    include-pk-only is 'true', any nested 'argument' elements will be
  -    ignored.  In this case, values for all field-descriptors that are identified
  -    as being part of the primary key will be passed to the procedure/function.
  -    The order of values that are passed to the procedure/function will match
  -    the order of field-descriptors on the corresponding class-descriptor.
  -    If include-pk-only is false, then values will be passed to the procedure/
  -    function based on the information in the nested 'argument' elements.
  -  -->
  -<!ELEMENT delete-procedure
  -	(documentation?, (runtime-argument | constant-argument)*, attribute*)>
  -<!ATTLIST delete-procedure
  -	name CDATA #REQUIRED
  -    return-field-ref CDATA #IMPLIED
  -    include-pk-only (true | false) "false"
  ->
  -<!--
  -    Defines an argument that is passed to a procedure/function.  Each argument
  -    will be set to a value from a field-descriptor or null.
  -
  -    The field-ref attribute identifies the field-descriptor in the corresponding
  -    class-descriptor that provides the value for this argument.  If this attribute
  -    is unspecified, then this argument will be set to null.
  --->
  -<!ELEMENT runtime-argument
  -	(documentation?, attribute*)>
  -<!ATTLIST runtime-argument
  -	field-ref CDATA #IMPLIED
  -    return (true | false) "false"
  ->
  -<!--
  -    Defines a constant value that is passed to a procedure/function.
  -
  -    The value attribute identifies the value that is passed to the procedure/
  -    function.
  --->
  -<!ELEMENT constant-argument
  -	(documentation?, attribute*)>
  -<!ATTLIST constant-argument
  -    value CDATA #REQUIRED
  ->
  -
  
  
  
  1.4       +21 -79    jakarta-jetspeed-2/portal/src/java/OJB.properties
  
  Index: OJB.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/OJB.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OJB.properties	18 Mar 2004 06:12:12 -0000	1.3
  +++ OJB.properties	18 Mar 2004 19:42:05 -0000	1.4
  @@ -2,7 +2,6 @@
   # Version: 1.0
   # (c) 2001, 2002, 2003 Apache Software Foundation
   # Author: Thomas Mahler and many others
  -# @version $Id$
   #
   #----------------------------------------------------------------------------------------
   # repository file settings
  @@ -32,23 +31,15 @@
   # The PersistenceBrokerFactoryClass entry decides which concrete
   # PersistenceBrokerFactory implemention 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
  -# e.g. PBStateListener work properly in managed environments.
  -#PersistenceBrokerFactoryClass=org.apache.ojb.broker.core.PersistenceBrokerFactorySyncImpl
  -#
   #
   # The PersistenceBrokerClass entry decides which concrete PersistenceBroker
   # implementation is to be served by the PersistenceBrokerFactory.
   # This is the singlevm implementation:
   PersistenceBrokerClass=org.apache.ojb.broker.core.PersistenceBrokerImpl
   #
  -# This is an implementation that uses Prevayler (prevayler.sf.net) as the persistent storage.
  -# Using this implementation OJB works as a simple OODBMS
  -#PersistenceBrokerClass=org.apache.ojb.broker.prevayler.PBPrevaylerImpl
   #
   #----------------------------------------------------------------------------------------
  -# PersistenceBroker pool
  +# PersistenceBrokerFactory pool
   #----------------------------------------------------------------------------------------
   # PersistenceBroker pool configuration
   # This pool uses the jakarta-commons-pool api.
  @@ -168,27 +159,13 @@
   #----------------------------------------------------------------------------------------
   # 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.
  -#
  +# The ObjectCacheClass entry tells OJB which concrete instance Cache
  +# implementation is to be used.
   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
  -#
  -#
  -# This property is only relevant if the per class-descriptor object-cache
  -# declaration was used in conjunction with metadata runtime changes.
  -# If set 'flase' the class name of the object is used
  -# to find a per class ObjectCache implementation.
  -# If set 'true' the ObjectCacheDescriptor instance is used as key to
  -# find a per class ObjectCache, this enables to use different ObjectCache
  -# instances for the same class.
  -descriptorBasedCaches=false
  +#ObjectCacheClass=org.apache.ojb.broker.cache.MetaObjectCacheJCSImpl
  +#ObjectCacheClass=org.apache.ojb.broker.cache.MetaObjectCachePerClassImpl
   #
   #
   # Use CacheFilters to do filter operations before caching methods were
  @@ -214,16 +191,12 @@
   # 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
  -# 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).
  +# to use the PersistentLockMapImpl. It guarantees to provide
  +# Lockamanagement across multiple JVMs.
   # 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
   # in a large performance gain.
  -#LockMapClass=org.apache.ojb.odmg.locking.RemoteLockMapImpl
  +# LockMapClass=org.apache.ojb.odmg.locking.PersistentLockMapImpl
   LockMapClass=org.apache.ojb.odmg.locking.InMemoryLockMapImpl
   #
   # The LockTimeout entry defines the maximum time in milliseconds
  @@ -240,13 +213,6 @@
   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
  @@ -285,14 +251,10 @@
   DEFAULT.LogLevel=WARN
   # Logger for PersistenceBrokerImpl class
   org.apache.ojb.broker.core.PersistenceBrokerImpl.LogLevel=WARN
  -# Logger for PersistenceBrokerFactory class PersistenceBrokerFactoryDefaultImpl
  -org.apache.ojb.broker.core.PersistenceBrokerFactoryDefaultImpl.LogLevel=WARN
  +# Logger for PersistenceBrokerFactory class
  +org.apache.ojb.broker.PersistenceBrokerFactory.LogLevel=WARN
   # Logger for RepositoryXmlHandler, useful for debugging parsing of repository.xml!
  -# persistence capable object metadata
   org.apache.ojb.broker.metadata.RepositoryXmlHandler.LogLevel=WARN
  -# Logger for ConnectionDescriptorXmlHandler, useful for debugging parsing of repository.xml!
  -# connection specific metadata
  -org.apache.ojb.broker.metadata.ConnectionDescriptorXmlHandler.LogLevel=WARN
   # Logger for JdbcAccess, useful for debugging JDBC related problems
   org.apache.ojb.broker.accesslayer.JdbcAccessImpl.LogLevel=WARN
   # Logger for RsIterator, useful for debugging problems with Object materialization
  @@ -303,15 +265,15 @@
   org.apache.ojb.broker.accesslayer.sql.SqlGeneratorDefaultImpl.LogLevel=WARN
   # Logger for RepositoryPersistor
   org.apache.ojb.broker.metadata.RepositoryPersistor.LogLevel=WARN
  -# Logger for ConnectionFactory base class
  -org.apache.ojb.broker.accesslayer.ConnectionFactoryAbstractImpl.LogLevel=WARN
  -# Logger for ConnectionManager
  -org.apache.ojb.broker.accesslayer.ConnectionManagerImpl.LogLevel=WARN
  +# Logger for PersistenceBrokerFactoryDefaultImpl
  +org.apache.ojb.broker.core.PersistenceBrokerFactoryDefaultImpl.LogLevel=WARN
  +# Logger for ConnectionFactory
  +org.apache.ojb.broker.accesslayer.ConnectionFactoryAbstractImpl.LogLevel=ERROR
   #
   # Special Logger categories used in test suite and tutorials
   #
   # Logger for the ODMG Implementation
  -ODMG.LogLevel=DEBUG
  +ODMG.LogLevel=WARN
   # Logger for the JDO RI Implementation
   JDO.LogLevel=DEBUG
   # Logger for the performance tests
  @@ -328,13 +290,13 @@
   # 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'.
  +# in a ODMG environment.
   # 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.
   #
  -OqlCollectionClass=org.apache.ojb.odmg.collections.DListImpl_2
  +OqlCollectionClass=org.apache.ojb.odmg.collections.DListImpl
   # OqlCollectionClass=org.apache.ojb.broker.util.collections.ManageableArrayList
   # OqlCollectionClass=org.apache.ojb.broker.util.ManageableVector
   #
  @@ -344,30 +306,6 @@
   #
   #
   #----------------------------------------------------------------------------------------
  -# ODMG settings
  -#----------------------------------------------------------------------------------------
  -# 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
  -#
  -# org.odmg.DArray implementation class
  -DArrayClass=org.apache.ojb.odmg.collections.DListImpl_2
  -#DArrayClass=org.apache.ojb.odmg.collections.DListImpl
  -#
  -# org.odmg.DMap implementation class
  -DMapClass=org.apache.ojb.odmg.collections.DMapImpl
  -#
  -# org.odmg.DBag implementation class
  -DBagClass=org.apache.ojb.odmg.collections.DBagImpl
  -#
  -# org.odmg.DSet implementation class
  -DSetClass=org.apache.ojb.odmg.collections.DSetImpl
  -#
  -#
  -#----------------------------------------------------------------------------------------
   # Meta data / mapping settings
   #----------------------------------------------------------------------------------------
   # The PersistentFieldClass property defines the implementation class
  @@ -397,6 +335,10 @@
   #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldIntrospectorImpl
   #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDynaBeanAccessImpl
   #
  +# outdated deprecated versions:
  +#PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldMaxPerformanceImpl
  +#PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentNestedFieldMaxPerformanceImpl
  +#PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldPropertyImpl
   #
   #----------------------------------------------------------------------------------------
   # Component Intercepting for Profiling and Tracing
  
  
  
  1.3       +927 -731  jakarta-jetspeed-2/portal/src/java/repository.dtd.rc5
  
  
  
  
  1.3       +347 -347  jakarta-jetspeed-2/portal/src/java/repository_internal.xml.rc5
  
  
  
  
  1.3       +436 -416  jakarta-jetspeed-2/portal/src/java/OJB.properties.rc5
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org