portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb repository_database.xml repository_internal.xml OJB.properties
Date Wed, 04 Feb 2004 21:51:09 GMT
weaver      2004/02/04 13:51:09

  Modified:    portal/src/webapp/WEB-INF/conf/ojb repository_database.xml
                        repository_internal.xml OJB.properties
  Log:
  - changes to accomodate ojb rc5
  - only one connection descriptor since we are now using JNDI datasources
  
  Revision  Changes    Path
  1.2       +2 -64     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository_database.xml
  
  Index: repository_database.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository_database.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- repository_database.xml	28 Jul 2003 23:47:57 -0000	1.1
  +++ repository_database.xml	4 Feb 2004 21:51:09 -0000	1.2
  @@ -14,20 +14,14 @@
   -->
   
   
  -    <!-- this connection was used as the default one within OJB -->
       <jdbc-connection-descriptor
           jcd-alias="jetspeed"
           platform="Hsqldb"
           default-connection="true"
           jdbc-level="2.0"
  -        driver="org.hsqldb.jdbcDriver"
  -        protocol="jdbc"
  -        subprotocol="hsqldb"
  -        dbalias="WEB-INF/db/hsql/Registry"
  -        username="sa"
  -        password=""
  +         jndi-datasource-name="java:comp/env/jdbc/jetspeed"
           batch-mode="false"
  -     >
  +     >     
   
           <connection-pool
               maxActive="21"
  @@ -40,59 +34,3 @@
               <attribute attribute-name="globalSequenceStart" attribute-value="10000"/>
           </sequence-manager>
      </jdbc-connection-descriptor>
  -   
  -   <jdbc-connection-descriptor
  -        jcd-alias="jetspeed-test"
  -        platform="Hsqldb"
  -        jdbc-level="2.0"
  -        driver="org.hsqldb.jdbcDriver"
  -        protocol="jdbc"
  -        subprotocol="hsqldb"
  -        dbalias="test/db/hsql/Registry"
  -        username="sa"
  -        password=""
  -        batch-mode="false"
  -     >
  -
  -        <connection-pool
  -            maxActive="21"
  -            validationQuery="" />
  -
  -        <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
  -            <attribute attribute-name="grabSize" attribute-value="20"/>
  -            <attribute attribute-name="autoNaming" attribute-value="true"/>
  -            <attribute attribute-name="globalSequenceId" attribute-value="false"/>
  -            <attribute attribute-name="globalSequenceStart" attribute-value="10000"/>
  -        </sequence-manager>
  -   </jdbc-connection-descriptor>
  -
  -    <!-- 
  -    	- This connection should be used is deploying from the project directory.
  -        - This is needed since using HSql in single user can get hairy due pathing
  -        - realtive to where the deployment is being run.	 
  -      -->
  -    <jdbc-connection-descriptor
  -        jcd-alias="jetspeed-deploy"
  -        platform="Hsqldb"
  -        jdbc-level="2.0"
  -        driver="org.hsqldb.jdbcDriver"
  -        protocol="jdbc"
  -        subprotocol="hsqldb"
  -        dbalias="src/webapp/WEB-INF/db/hsql/Registry"
  -        username="sa"
  -        password=""
  -        batch-mode="false"
  -     >
  -
  -        <connection-pool
  -            maxActive="21"
  -            validationQuery="" />
  -
  -        <sequence-manager className="org.apache.ojb.broker.util.sequence.SequenceManagerHighLowImpl">
  -            <attribute attribute-name="grabSize" attribute-value="20"/>
  -            <attribute attribute-name="autoNaming" attribute-value="true"/>
  -            <attribute attribute-name="globalSequenceId" attribute-value="false"/>
  -            <attribute attribute-name="globalSequenceStart" attribute-value="10000"/>
  -        </sequence-manager>
  -   </jdbc-connection-descriptor>
  - 
  
  
  
  1.2       +63 -1     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository_internal.xml
  
  Index: repository_internal.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository_internal.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- repository_internal.xml	28 Jul 2003 23:47:57 -0000	1.1
  +++ repository_internal.xml	4 Feb 2004 21:51:09 -0000	1.2
  @@ -5,7 +5,11 @@
      	  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"
  @@ -144,6 +148,63 @@
         />
      </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"
  @@ -280,6 +341,7 @@
            conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"
         />
      </class-descriptor>
  +
   
   
      <!-- END OF OJB INTERNAL MAPPINGS-->
  
  
  
  1.3       +55 -17    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/OJB.properties
  
  Index: OJB.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/OJB.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OJB.properties	30 Jul 2003 19:47:19 -0000	1.2
  +++ OJB.properties	4 Feb 2004 21:51:09 -0000	1.3
  @@ -37,9 +37,13 @@
   # 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
  +#
   #
   #----------------------------------------------------------------------------------------
  -# PersistenceBrokerFactory pool
  +# PersistenceBroker pool
   #----------------------------------------------------------------------------------------
   # PersistenceBroker pool configuration
   # This pool uses the jakarta-commons-pool api.
  @@ -159,13 +163,27 @@
   #----------------------------------------------------------------------------------------
   # Object cache
   #----------------------------------------------------------------------------------------
  -# The ObjectCacheClass entry tells OJB which concrete instance Cache
  -# implementation is to be used.
  +# 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.MetaObjectCacheJCSImpl
  -#ObjectCacheClass=org.apache.ojb.broker.cache.MetaObjectCachePerClassImpl
  +#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
   #
   #
   # Use CacheFilters to do filter operations before caching methods were
  @@ -251,8 +269,8 @@
   DEFAULT.LogLevel=WARN
   # Logger for PersistenceBrokerImpl class
   org.apache.ojb.broker.core.PersistenceBrokerImpl.LogLevel=WARN
  -# Logger for PersistenceBrokerFactory class
  -org.apache.ojb.broker.PersistenceBrokerFactory.LogLevel=WARN
  +# Logger for PersistenceBrokerFactory class PersistenceBrokerFactoryDefaultImpl
  +org.apache.ojb.broker.core.PersistenceBrokerFactoryDefaultImpl.LogLevel=WARN
   # Logger for RepositoryXmlHandler, useful for debugging parsing of repository.xml!
   org.apache.ojb.broker.metadata.RepositoryXmlHandler.LogLevel=WARN
   # Logger for JdbcAccess, useful for debugging JDBC related problems
  @@ -265,10 +283,10 @@
   org.apache.ojb.broker.accesslayer.sql.SqlGeneratorDefaultImpl.LogLevel=WARN
   # Logger for RepositoryPersistor
   org.apache.ojb.broker.metadata.RepositoryPersistor.LogLevel=WARN
  -# Logger for PersistenceBrokerFactoryDefaultImpl
  -org.apache.ojb.broker.core.PersistenceBrokerFactoryDefaultImpl.LogLevel=WARN
  -# Logger for ConnectionFactory
  -org.apache.ojb.broker.accesslayer.ConnectionFactoryAbstractImpl.LogLevel=ERROR
  +# Logger for ConnectionFactory base class
  +org.apache.ojb.broker.accesslayer.ConnectionFactoryAbstractImpl.LogLevel=WARN
  +# Logger for ConnectionManager
  +org.apache.ojb.broker.accesslayer.ConnectionManagerImpl.LogLevel=WARN
   #
   # Special Logger categories used in test suite and tutorials
   #
  @@ -290,13 +308,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.
  +# in a ODMG environment. See also section 'ODMG settings'.
   # 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
  +OqlCollectionClass=org.apache.ojb.odmg.collections.DListImpl_2
   # OqlCollectionClass=org.apache.ojb.broker.util.collections.ManageableArrayList
   # OqlCollectionClass=org.apache.ojb.broker.util.ManageableVector
   #
  @@ -306,6 +324,30 @@
   #
   #
   #----------------------------------------------------------------------------------------
  +# 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
  @@ -335,10 +377,6 @@
   #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
  
  
  

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


Mime
View raw message