Menu
▾
▴
openmed-commits
You can subscribe to this list here.
| 2003 |
Jan
(90) |
Feb
(65) |
Mar
(14) |
Apr
(49) |
May
(271) |
Jun
(25) |
Jul
(44) |
Aug
(121) |
Sep
(53) |
Oct
(61) |
Nov
(10) |
Dec
(22) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(25) |
Feb
|
Mar
|
Apr
(100) |
May
(7) |
Jun
(27) |
Jul
(21) |
Aug
(94) |
Sep
(47) |
Oct
(7) |
Nov
(8) |
Dec
(5) |
| 2005 |
Jan
|
Feb
(17) |
Mar
(4) |
Apr
(12) |
May
(3) |
Jun
(4) |
Jul
(6) |
Aug
(26) |
Sep
(45) |
Oct
(60) |
Nov
(1) |
Dec
(1) |
| 2006 |
Jan
(4) |
Feb
(1) |
Mar
(81) |
Apr
(17) |
May
|
Jun
|
Jul
(1) |
Aug
(10) |
Sep
(68) |
Oct
(5) |
Nov
(10) |
Dec
|
|
From: David F. <dwf...@us...> - 2006-11-04 05:08:27
|
Update of /cvsroot/openmed/OpenEMed/dist/servers In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3207/dist/servers Modified Files: build.xml Log Message: corrected name of ior file created by nameservice Index: build.xml =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/build.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** build.xml 25 Sep 2006 22:53:05 -0000 1.23 --- build.xml 4 Nov 2006 05:08:25 -0000 1.24 *************** *** 113,117 **** <arg value="-ORBiiop.hostname=${iiop.hostname}"/> <arg value="-u"/> ! <arg value="-f ./" /> <arg value="-llog.txt "/> </java> --- 113,117 ---- <arg value="-ORBiiop.hostname=${iiop.hostname}"/> <arg value="-u"/> ! <arg value="-fns.ior" /> <arg value="-llog.txt "/> </java> |
|
From: David F. <dwf...@us...> - 2006-11-04 04:54:32
|
Update of /cvsroot/openmed/OpenEMed/dist/servers/coas/ojb/config In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30311/dist/servers/coas/ojb/config Modified Files: hsqldb_coas.sql mysql_coas.sql Log Message: Updated to ojb1.0.4 for OJB_HL_SEQ table Index: hsqldb_coas.sql =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/coas/ojb/config/hsqldb_coas.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** hsqldb_coas.sql 8 Sep 2003 15:50:27 -0000 1.5 --- hsqldb_coas.sql 4 Nov 2006 04:54:31 -0000 1.6 *************** *** 81,85 **** valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(256), ! aValue NUMERIC ); --- 81,85 ---- valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(256), ! aValue REAL ); *************** *** 109,114 **** valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(256), ! lower FLOAT, ! upper FLOAT ); --- 109,114 ---- valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(256), ! lower REAL, ! upper REAL ); *************** *** 152,160 **** CREATE TABLE OJB_HL_SEQ ( TABLENAME VARCHAR(175) NOT NULL, - FIELDNAME VARCHAR(70) NOT NULL, MAX_KEY INT, GRAB_SIZE INT, VERSION INT, ! PRIMARY KEY (TABLENAME, FIELDNAME) ); DROP TABLE OJB_NRM; --- 152,159 ---- CREATE TABLE OJB_HL_SEQ ( TABLENAME VARCHAR(175) NOT NULL, MAX_KEY INT, GRAB_SIZE INT, VERSION INT, ! PRIMARY KEY (TABLENAME) ); DROP TABLE OJB_NRM; Index: mysql_coas.sql =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/coas/ojb/config/mysql_coas.sql,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mysql_coas.sql 13 Sep 2006 04:22:01 -0000 1.10 --- mysql_coas.sql 4 Nov 2006 04:54:31 -0000 1.11 *************** *** 81,85 **** valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(255), ! aValue FLOAT ); --- 81,85 ---- valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(255), ! aValue REAL ); *************** *** 109,114 **** valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(255), ! lower FLOAT, ! upper FLOAT ); --- 109,114 ---- valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(255), ! lower REAL, ! upper REAL ); |
|
From: David F. <dwf...@us...> - 2006-11-04 04:51:43
|
Update of /cvsroot/openmed/OpenEMed/dist/servers/coas In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29150/dist/servers/coas Modified Files: DsOAS.DTD Log Message: use unicode Index: DsOAS.DTD =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/coas/DsOAS.DTD,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsSNH3dU and /tmp/cvs6i1jCC differ |
|
From: David F. <dwf...@us...> - 2006-11-03 23:53:59
|
Update of /cvsroot/openmed/OpenEMed/dist/servers/pids/ojb/config In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27381 Modified Files: mysql_repository.xml repository_internal.xml Log Message: updated for OJB 1.0.4 and addition of connection-pool attribute Index: mysql_repository.xml =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/pids/ojb/config/mysql_repository.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mysql_repository.xml 5 Jun 2003 22:07:30 -0000 1.1 --- mysql_repository.xml 3 Nov 2006 23:53:57 -0000 1.2 *************** *** 22,26 **** subprotocol="mysql" protocol="jdbc" ! password="openemed"/> &user; --- 22,29 ---- subprotocol="mysql" protocol="jdbc" ! password="openemed" ! /> ! <connection-pool testOnBorrow="true" > ! </connection-pool> &user; Index: repository_internal.xml =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/pids/ojb/config/repository_internal.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** repository_internal.xml 22 Apr 2005 05:30:41 -0000 1.3 --- repository_internal.xml 3 Nov 2006 23:53:57 -0000 1.4 *************** *** 1,11 **** <!-- OJB INTERNAL MAPPINGS START HERE, DO NOT EDIT --> ! <!-- The OJB HIGH/LOW SequenceManagerTable --> <class-descriptor ! class="org.apache.ojb.broker.util.sequence.HighLowSequence" ! table="OJB_HL_SEQ" > <field-descriptor ! name="tableName" column="TABLENAME" jdbc-type="VARCHAR" --- 1,31 ---- <!-- 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" > + + <object-cache class="org.apache.ojb.broker.cache.ObjectCacheEmptyImpl"> + </object-cache> + + <!-- TODO: Rename column TABLENAME to NAME or SEQ_NAME --> <field-descriptor ! name="name" column="TABLENAME" jdbc-type="VARCHAR" *************** *** 13,25 **** /> <field-descriptor - name="fieldName" - column="FIELDNAME" - jdbc-type="VARCHAR" - primarykey="true" - /> - <field-descriptor name="maxKey" column="MAX_KEY" ! jdbc-type="INTEGER" /> <field-descriptor --- 33,39 ---- /> <field-descriptor name="maxKey" column="MAX_KEY" ! jdbc-type="BIGINT" /> <field-descriptor *************** *** 37,75 **** - <!-- The OJB Lock Table --> - <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> - - <!-- THIS IS THE OJB NAMED ROOTS TABLE, DO NOT EDIT--> <class-descriptor --- 51,54 ---- *************** *** 102,113 **** autoincrement="true" /> ! <field-descriptor ! name="size" ! column="SIZE_" ! jdbc-type="INTEGER" ! /> <collection-descriptor name="elements" element-class-ref="org.apache.ojb.odmg.collections.DListEntry" > <inverse-foreignkey field-ref="dlistId"/> --- 81,91 ---- autoincrement="true" /> ! <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"/> *************** *** 157,168 **** autoincrement="true" /> - <field-descriptor - name="size" - column="SIZE_" - jdbc-type="INTEGER" - /> <collection-descriptor name="elements" element-class-ref="org.apache.ojb.odmg.collections.DListEntry" > <inverse-foreignkey field-ref="dlistId"/> --- 135,144 ---- autoincrement="true" /> <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"/> *************** *** 182,193 **** autoincrement="true" /> - <field-descriptor - name="size" - column="SIZE_" - jdbc-type="INTEGER" - /> <collection-descriptor name="elements" element-class-ref="org.apache.ojb.odmg.collections.DSetEntry" > <inverse-foreignkey field-ref="dlistId"/> --- 158,167 ---- autoincrement="true" /> <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"/> *************** *** 237,249 **** 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" > <inverse-foreignkey field-ref="dmapId"/> --- 211,221 ---- autoincrement="true" /> <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"/> *************** *** 269,273 **** /> <field-descriptor ! name="keyOID" column="KEY_OID" jdbc-type="LONGVARBINARY" --- 241,245 ---- /> <field-descriptor ! name="keyOid" column="KEY_OID" jdbc-type="LONGVARBINARY" *************** *** 275,279 **** /> <field-descriptor ! name="valueOID" column="VALUE_OID" jdbc-type="LONGVARBINARY" --- 247,251 ---- /> <field-descriptor ! name="valueOid" column="VALUE_OID" jdbc-type="LONGVARBINARY" *************** *** 283,285 **** --- 255,258 ---- + <!-- END OF OJB INTERNAL MAPPINGS--> |
|
From: David F. <dwf...@us...> - 2006-11-03 23:53:26
|
Update of /cvsroot/openmed/OpenEMed/dist/servers/pids In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27288 Modified Files: OJB.properties Log Message: Updated for OJB 1.0.4 Index: OJB.properties =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/pids/OJB.properties,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** OJB.properties 22 Apr 2005 05:30:08 -0000 1.13 --- OJB.properties 3 Nov 2006 23:53:23 -0000 1.14 *************** *** 27,31 **** # repository. The file is looked up from the classpath. # - #repositoryFile=repository.xml repositoryFile=ojb//config//hsqldb_repository.xml # --- 27,30 ---- *************** *** 65,68 **** --- 64,76 ---- #PersistenceBrokerClass=org.apache.ojb.broker.prevayler.PBPrevaylerImpl # + # + # This setting can be helpful during development if the PersistenceBroker transaction + # demarcation was used (this is true in most cases). If set 'true' on PB#store(...) + # and PB#delete(...) methods calls OJB check for active PB-tx and if no active tx is + # found a error is logged. This can help to avoid store/delete calls without a running + # PB-tx while development. Default setting is 'false'. (Note: When using OJB in a managed + # environment *without* OJB-caching, it's valid to use store/delete calls without a running PB-tx) + TxCheck=false + # #---------------------------------------------------------------------------------------- # PersistenceBroker pool *************** *** 134,139 **** 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.ConnectionFactoryDBCPImpl # # --- 142,149 ---- ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryPooledImpl #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryNotPooledImpl #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl + # Only needed when using OJB 1.0.3 or earlier in managed environments. Since version + # 1.0.4 OJB detects datasources from managed environments automatically. + #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl # # *************** *** 153,162 **** # #---------------------------------------------------------------------------------------- ! # IndirectionHandler #---------------------------------------------------------------------------------------- # The IndirectionHandlerClass entry defines the class to be used by OJB's proxies to # handle method invocations # ! IndirectionHandlerClass=org.apache.ojb.broker.core.proxy.IndirectionHandlerDefaultImpl # #---------------------------------------------------------------------------------------- --- 163,189 ---- # #---------------------------------------------------------------------------------------- ! # ProxyFactory and IndirectionHandler #---------------------------------------------------------------------------------------- + # The ProxyFactoryClass entry defines which ProxyFactory implementation is to be used. + # By default, a 1.0 compatiable, JDK-based version is used. However, a the CGLIB based entry + # is available. + # + # - ProxyFactoryCGLIBImpl: Refernece proxies are generated using bytecode manipulation + # from the CGLIB library. Any class can become a dynamic proxy, and not just ones + # that implement an interface. + # - ProxyFactoryJDKImpl: OJB 1.0 compatiable Proxy implementation. Proxies in this method + # can only be generated from classes that implement an interface, and the generated + # Proxy will implement all methods of that interface. + # + # NOTE: The appropriate cooresponding IndirectionHandler must be choosen as well + # + #ProxyFactoryClass=org.apache.ojb.broker.core.proxy.ProxyFactoryCGLIBImpl + ProxyFactoryClass=org.apache.ojb.broker.core.proxy.ProxyFactoryJDKImpl + # # The IndirectionHandlerClass entry defines the class to be used by OJB's proxies to # handle method invocations # ! #IndirectionHandlerClass=org.apache.ojb.broker.core.proxy.IndirectionHandlerCGLIBImpl ! IndirectionHandlerClass=org.apache.ojb.broker.core.proxy.IndirectionHandlerJDKImpl # #---------------------------------------------------------------------------------------- *************** *** 213,231 **** 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 ! # # # This property is only relevant if the per class-descriptor object-cache --- 240,250 ---- RowReaderDefaultClass=org.apache.ojb.broker.accesslayer.RowReaderDefaultImpl # + # #---------------------------------------------------------------------------------------- # Object cache #---------------------------------------------------------------------------------------- ! # 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 *************** *** 238,266 **** 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 ! # #---------------------------------------------------------------------------------------- # Locking #---------------------------------------------------------------------------------------- ! # The LockManagerClass entry tells OJB which concrete LockManager ! # implementation is to be used. ! LockManagerClass=org.apache.ojb.odmg.locking.LockManagerDefaultImpl # # 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 --- 257,294 ---- descriptorBasedCaches=false # ! # 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' 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 LockMapRemoteImpl. It guarantees to provide # Lockmanagement across multiple JVMs. # This Implemenation relies on a Servlet based Lockserver. To use it you have to *************** *** 269,306 **** # (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 # 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 # # --- 297,305 ---- # (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 LockMapInMemoryImpl. Using it will result # in a large performance gain. ! # 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 # # *************** *** 309,323 **** #---------------------------------------------------------------------------------------- # 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'. # 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.broker.util.collections.ManageableArrayList ! # OqlCollectionClass=org.apache.ojb.broker.util.ManageableVector # # The SqlInLimit entry limits the number of values in IN-sql statement, --- 308,323 ---- #---------------------------------------------------------------------------------------- # The OqlCollectionClass entry defines the collection type returned ! # 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'. # ! 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, *************** *** 327,331 **** # #---------------------------------------------------------------------------------------- ! # ODMG settings #---------------------------------------------------------------------------------------- # Specify the used base class for ODMG API --- 327,331 ---- # #---------------------------------------------------------------------------------------- ! # ODMG-api settings #---------------------------------------------------------------------------------------- # Specify the used base class for ODMG API *************** *** 337,341 **** #ImplementationClass=org.apache.ojb.odmg.ImplementationJTAImpl # - # # Specify the used tx handling. # - LocalTxManager use if you want the transaction to be associated by a thread --- 337,340 ---- *************** *** 347,350 **** --- 346,379 ---- # # + # The ImplicitLocking entry defines if implicit lock acquisition is + # to be used. If set to 'true' OJB implicitly locks objects to ODMG + # transactions after performing OQL queries. + # Also 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. + # This setting can be changed at runtime using OJB's ODMG extensions. + 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 allways results in implicit read-locks + # on all associated objects (if 'implicit locking' is enabled). + # This setting can be changed at runtime using OJB's ODMG extensions. + #LockAssociations=READ + LockAssociations=WRITE + # + # Enable/Disable OJB's persistent object ordering algorithm on commit + # of a transaction. If enabled OJB try to calculate a valid order for + # all new/modified objects (and referenced objects). + # If the used databases support 'deferred checks' it's recommended to use this + # feature and to disable OJB's object ordering. + # This setting can be changed at runtime using OJB's ODMG extensions. + Ordering=true + # + # # Used ODMG collection implementation classes # (e.g. when do a Implementation#newDlist() call) *************** *** 366,369 **** --- 395,407 ---- # # + # @deprecated property for backward compatibility. + # If set 'true' the behavior of method + # ImplementationImpl#setImplicitLocking(...) will be the same as + # in OJB <=1.0.3 (set the implicit locking behavior of the current used transaction) + # and disable the new possibility of global 'implicit locking' + # setting at runtime with ImplementationExt#setImplicitLocking. + # This is only for backward compatibility and will + # be removed at a later date. + ImplicitLockingBackward=false #---------------------------------------------------------------------------------------- # Meta data / mapping settings *************** *** 394,411 **** # (directly, as a bean, as a dyna bean) and then uses that strategy # ! #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectAccessImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldPrivilegedImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldIntrospectorImpl ! #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDynaBeanAccessImpl ! #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. ! # 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 ! #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldIntrospectorImplNew #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldAutoProxyImpl - #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDynaBeanImplNew #(DynaBean implementation does not support nested fields) # --- 432,440 ---- # (directly, as a bean, as a dyna bean) and then uses that strategy # ! PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldPrivilegedImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldIntrospectorImpl ! #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDynaBeanImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldAutoProxyImpl #(DynaBean implementation does not support nested fields) # |
|
From: David F. <dwf...@us...> - 2006-11-03 20:54:53
|
Update of /cvsroot/openmed/OpenEMed/src/clients/gov/lanl/SimpleCoasClient In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31031/src/clients/gov/lanl/SimpleCoasClient Modified Files: CoasDump.java Log Message: added indentation Index: CoasDump.java =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/clients/gov/lanl/SimpleCoasClient/CoasDump.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CoasDump.java 28 Mar 2006 01:31:03 -0000 1.11 --- CoasDump.java 3 Nov 2006 20:54:50 -0000 1.12 *************** *** 173,176 **** --- 173,177 ---- FileOutputStream out = new FileOutputStream(filename); Serializer serial = new Serializer(out); + serial.setIndent(5); serial.write(od2dom.toDom()); // fileout.write(); |
Update of /cvsroot/openmed/OpenEMed/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv402/lib Added Files: commons-beanutils-1.7.0.jar commons-collections-3.1.jar commons-dbcp-1.2.1.jar commons-logging-1.0.4.jar commons-pool-1.2.jar commons-transaction-1.1.jar db-ojb-1.0.4-tools.jar db-ojb-1.0.4.jar Removed Files: commons-beanutils.jar commons-collections-2.1.1.jar commons-dbcp-1.1.jar commons-logging.jar commons-pool-1.1.jar db-ojb-1.0.3-tools.jar db-ojb-1.0.3.jar Log Message: Updated to ojb1.0.4 --- commons-beanutils.jar DELETED --- --- NEW FILE: db-ojb-1.0.4-tools.jar --- (This appears to be a binary file; contents omitted.) --- db-ojb-1.0.3.jar DELETED --- --- commons-collections-2.1.1.jar DELETED --- --- commons-pool-1.1.jar DELETED --- --- NEW FILE: commons-dbcp-1.2.1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-collections-3.1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-logging-1.0.4.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-beanutils-1.7.0.jar --- (This appears to be a binary file; contents omitted.) --- commons-dbcp-1.1.jar DELETED --- --- NEW FILE: commons-transaction-1.1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: db-ojb-1.0.4.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: commons-pool-1.2.jar --- (This appears to be a binary file; contents omitted.) --- db-ojb-1.0.3-tools.jar DELETED --- --- commons-logging.jar DELETED --- |
|
From: David F. <dwf...@us...> - 2006-11-03 18:53:05
|
Update of /cvsroot/openmed/OpenEMed/dist/servers/coas/ojb/config In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30474/dist/servers/coas/ojb/config Modified Files: mysql_repository.xml repository_internal.xml Log Message: updated to ojb1.0.4 and added pool attribute Index: mysql_repository.xml =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/coas/ojb/config/mysql_repository.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mysql_repository.xml 5 Jun 2003 20:55:49 -0000 1.3 --- mysql_repository.xml 3 Nov 2006 18:53:02 -0000 1.4 *************** *** 23,26 **** --- 23,28 ---- password="openemed" /> + <connection-pool testOnBorrow="true"> + </connection-pool> &user; Index: repository_internal.xml =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/coas/ojb/config/repository_internal.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** repository_internal.xml 22 Apr 2005 05:29:43 -0000 1.3 --- repository_internal.xml 3 Nov 2006 18:53:02 -0000 1.4 *************** *** 1,11 **** <!-- OJB INTERNAL MAPPINGS START HERE, DO NOT EDIT --> ! <!-- The OJB HIGH/LOW SequenceManagerTable --> <class-descriptor ! class="org.apache.ojb.broker.util.sequence.HighLowSequence" ! table="OJB_HL_SEQ" > <field-descriptor ! name="tableName" column="TABLENAME" jdbc-type="VARCHAR" --- 1,31 ---- <!-- 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" > + + <object-cache class="org.apache.ojb.broker.cache.ObjectCacheEmptyImpl"> + </object-cache> + + <!-- TODO: Rename column TABLENAME to NAME or SEQ_NAME --> <field-descriptor ! name="name" column="TABLENAME" jdbc-type="VARCHAR" *************** *** 13,25 **** /> <field-descriptor - name="fieldName" - column="FIELDNAME" - jdbc-type="VARCHAR" - primarykey="true" - /> - <field-descriptor name="maxKey" column="MAX_KEY" ! jdbc-type="INTEGER" /> <field-descriptor --- 33,39 ---- /> <field-descriptor name="maxKey" column="MAX_KEY" ! jdbc-type="BIGINT" /> <field-descriptor *************** *** 37,75 **** - <!-- The OJB Lock Table --> - <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> - - <!-- THIS IS THE OJB NAMED ROOTS TABLE, DO NOT EDIT--> <class-descriptor --- 51,54 ---- *************** *** 102,113 **** autoincrement="true" /> ! <field-descriptor ! name="size" ! column="SIZE_" ! jdbc-type="INTEGER" ! /> <collection-descriptor name="elements" element-class-ref="org.apache.ojb.odmg.collections.DListEntry" > <inverse-foreignkey field-ref="dlistId"/> --- 81,91 ---- autoincrement="true" /> ! <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"/> *************** *** 157,168 **** autoincrement="true" /> - <field-descriptor - name="size" - column="SIZE_" - jdbc-type="INTEGER" - /> <collection-descriptor name="elements" element-class-ref="org.apache.ojb.odmg.collections.DListEntry" > <inverse-foreignkey field-ref="dlistId"/> --- 135,144 ---- autoincrement="true" /> <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"/> *************** *** 182,193 **** autoincrement="true" /> - <field-descriptor - name="size" - column="SIZE_" - jdbc-type="INTEGER" - /> <collection-descriptor name="elements" element-class-ref="org.apache.ojb.odmg.collections.DSetEntry" > <inverse-foreignkey field-ref="dlistId"/> --- 158,167 ---- autoincrement="true" /> <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"/> *************** *** 237,249 **** 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" > <inverse-foreignkey field-ref="dmapId"/> --- 211,221 ---- autoincrement="true" /> <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"/> *************** *** 269,273 **** /> <field-descriptor ! name="keyOID" column="KEY_OID" jdbc-type="LONGVARBINARY" --- 241,245 ---- /> <field-descriptor ! name="keyOid" column="KEY_OID" jdbc-type="LONGVARBINARY" *************** *** 275,279 **** /> <field-descriptor ! name="valueOID" column="VALUE_OID" jdbc-type="LONGVARBINARY" --- 247,251 ---- /> <field-descriptor ! name="valueOid" column="VALUE_OID" jdbc-type="LONGVARBINARY" *************** *** 283,285 **** --- 255,258 ---- + <!-- END OF OJB INTERNAL MAPPINGS--> |
|
From: David F. <dwf...@us...> - 2006-11-03 18:52:14
|
Update of /cvsroot/openmed/OpenEMed/dist/servers/coas In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30361/dist/servers/coas Modified Files: OJB.properties Log Message: Updated OJB.properties for ojb1.0.4 Index: OJB.properties =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/coas/OJB.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** OJB.properties 22 Apr 2005 05:29:04 -0000 1.11 --- OJB.properties 3 Nov 2006 18:52:08 -0000 1.12 *************** *** 27,31 **** # repository. The file is looked up from the classpath. # - #repositoryFile=repository.xml repositoryFile=ojb//config//hsqldb_repository.xml # --- 27,30 ---- *************** *** 65,68 **** --- 64,76 ---- #PersistenceBrokerClass=org.apache.ojb.broker.prevayler.PBPrevaylerImpl # + # + # This setting can be helpful during development if the PersistenceBroker transaction + # demarcation was used (this is true in most cases). If set 'true' on PB#store(...) + # and PB#delete(...) methods calls OJB check for active PB-tx and if no active tx is + # found a error is logged. This can help to avoid store/delete calls without a running + # PB-tx while development. Default setting is 'false'. (Note: When using OJB in a managed + # environment *without* OJB-caching, it's valid to use store/delete calls without a running PB-tx) + TxCheck=false + # #---------------------------------------------------------------------------------------- # PersistenceBroker pool *************** *** 134,139 **** 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.ConnectionFactoryDBCPImpl # # --- 142,149 ---- ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryPooledImpl #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryNotPooledImpl #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl + # Only needed when using OJB 1.0.3 or earlier in managed environments. Since version + # 1.0.4 OJB detects datasources from managed environments automatically. + #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl # # *************** *** 153,162 **** # #---------------------------------------------------------------------------------------- ! # IndirectionHandler #---------------------------------------------------------------------------------------- # The IndirectionHandlerClass entry defines the class to be used by OJB's proxies to # handle method invocations # ! IndirectionHandlerClass=org.apache.ojb.broker.core.proxy.IndirectionHandlerDefaultImpl # #---------------------------------------------------------------------------------------- --- 163,189 ---- # #---------------------------------------------------------------------------------------- ! # ProxyFactory and IndirectionHandler #---------------------------------------------------------------------------------------- + # The ProxyFactoryClass entry defines which ProxyFactory implementation is to be used. + # By default, a 1.0 compatiable, JDK-based version is used. However, a the CGLIB based entry + # is available. + # + # - ProxyFactoryCGLIBImpl: Refernece proxies are generated using bytecode manipulation + # from the CGLIB library. Any class can become a dynamic proxy, and not just ones + # that implement an interface. + # - ProxyFactoryJDKImpl: OJB 1.0 compatiable Proxy implementation. Proxies in this method + # can only be generated from classes that implement an interface, and the generated + # Proxy will implement all methods of that interface. + # + # NOTE: The appropriate cooresponding IndirectionHandler must be choosen as well + # + #ProxyFactoryClass=org.apache.ojb.broker.core.proxy.ProxyFactoryCGLIBImpl + ProxyFactoryClass=org.apache.ojb.broker.core.proxy.ProxyFactoryJDKImpl + # # The IndirectionHandlerClass entry defines the class to be used by OJB's proxies to # handle method invocations # ! #IndirectionHandlerClass=org.apache.ojb.broker.core.proxy.IndirectionHandlerCGLIBImpl ! IndirectionHandlerClass=org.apache.ojb.broker.core.proxy.IndirectionHandlerJDKImpl # #---------------------------------------------------------------------------------------- *************** *** 213,231 **** 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 ! # # # This property is only relevant if the per class-descriptor object-cache --- 240,250 ---- RowReaderDefaultClass=org.apache.ojb.broker.accesslayer.RowReaderDefaultImpl # + # #---------------------------------------------------------------------------------------- # Object cache #---------------------------------------------------------------------------------------- ! # 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 *************** *** 238,266 **** 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 ! # #---------------------------------------------------------------------------------------- # Locking #---------------------------------------------------------------------------------------- ! # The LockManagerClass entry tells OJB which concrete LockManager ! # implementation is to be used. ! LockManagerClass=org.apache.ojb.odmg.locking.LockManagerDefaultImpl # # 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 --- 257,294 ---- descriptorBasedCaches=false # ! # 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' 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 LockMapRemoteImpl. It guarantees to provide # Lockmanagement across multiple JVMs. # This Implemenation relies on a Servlet based Lockserver. To use it you have to *************** *** 269,306 **** # (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 # 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 # # --- 297,305 ---- # (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 LockMapInMemoryImpl. Using it will result # in a large performance gain. ! # 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 # # *************** *** 309,323 **** #---------------------------------------------------------------------------------------- # 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'. # 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.broker.util.collections.ManageableArrayList ! # OqlCollectionClass=org.apache.ojb.broker.util.ManageableVector # # The SqlInLimit entry limits the number of values in IN-sql statement, --- 308,323 ---- #---------------------------------------------------------------------------------------- # The OqlCollectionClass entry defines the collection type returned ! # 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'. # ! 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, *************** *** 327,331 **** # #---------------------------------------------------------------------------------------- ! # ODMG settings #---------------------------------------------------------------------------------------- # Specify the used base class for ODMG API --- 327,331 ---- # #---------------------------------------------------------------------------------------- ! # ODMG-api settings #---------------------------------------------------------------------------------------- # Specify the used base class for ODMG API *************** *** 337,341 **** #ImplementationClass=org.apache.ojb.odmg.ImplementationJTAImpl # - # # Specify the used tx handling. # - LocalTxManager use if you want the transaction to be associated by a thread --- 337,340 ---- *************** *** 347,350 **** --- 346,379 ---- # # + # The ImplicitLocking entry defines if implicit lock acquisition is + # to be used. If set to 'true' OJB implicitly locks objects to ODMG + # transactions after performing OQL queries. + # Also 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. + # This setting can be changed at runtime using OJB's ODMG extensions. + 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 allways results in implicit read-locks + # on all associated objects (if 'implicit locking' is enabled). + # This setting can be changed at runtime using OJB's ODMG extensions. + #LockAssociations=READ + LockAssociations=WRITE + # + # Enable/Disable OJB's persistent object ordering algorithm on commit + # of a transaction. If enabled OJB try to calculate a valid order for + # all new/modified objects (and referenced objects). + # If the used databases support 'deferred checks' it's recommended to use this + # feature and to disable OJB's object ordering. + # This setting can be changed at runtime using OJB's ODMG extensions. + Ordering=true + # + # # Used ODMG collection implementation classes # (e.g. when do a Implementation#newDlist() call) *************** *** 366,369 **** --- 395,407 ---- # # + # @deprecated property for backward compatibility. + # If set 'true' the behavior of method + # ImplementationImpl#setImplicitLocking(...) will be the same as + # in OJB <=1.0.3 (set the implicit locking behavior of the current used transaction) + # and disable the new possibility of global 'implicit locking' + # setting at runtime with ImplementationExt#setImplicitLocking. + # This is only for backward compatibility and will + # be removed at a later date. + ImplicitLockingBackward=false #---------------------------------------------------------------------------------------- # Meta data / mapping settings *************** *** 394,411 **** # (directly, as a bean, as a dyna bean) and then uses that strategy # ! #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectAccessImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldPrivilegedImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldIntrospectorImpl ! #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDynaBeanAccessImpl ! #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. ! # 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 ! #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldIntrospectorImplNew #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldAutoProxyImpl - #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDynaBeanImplNew #(DynaBean implementation does not support nested fields) # --- 432,440 ---- # (directly, as a bean, as a dyna bean) and then uses that strategy # ! PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldPrivilegedImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldIntrospectorImpl ! #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDynaBeanImpl #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldAutoProxyImpl #(DynaBean implementation does not support nested fields) # |
|
From: David F. <dwf...@us...> - 2006-11-03 18:51:06
|
Update of /cvsroot/openmed/OpenEMed/src/tools/gov/lanl/Database/OJB In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29643/src/tools/gov/lanl/Database/OJB Modified Files: DatabaseMgr.java Log Message: Added traceback to errors to better document the cause Index: DatabaseMgr.java =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/tools/gov/lanl/Database/OJB/DatabaseMgr.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DatabaseMgr.java 27 Mar 2006 23:28:01 -0000 1.1 --- DatabaseMgr.java 3 Nov 2006 18:51:03 -0000 1.2 *************** *** 195,199 **** } catch (Exception e) { cat.error("retrieveElement: '" + elementName + "' value: '" + value + "', " ! + e); throw new DBException(); --- 195,199 ---- } catch (Exception e) { cat.error("retrieveElement: '" + elementName + "' value: '" + value + "', " ! , e); throw new DBException(); *************** *** 332,336 **** cat.error("accessElements: class='" + obj.getClass().getName() + "', element='" + element + "', subelement=' " + subelement ! + "', " + e); throw new DBException(); --- 332,336 ---- cat.error("accessElements: class='" + obj.getClass().getName() + "', element='" + element + "', subelement=' " + subelement ! + "', " ,e); throw new DBException(); *************** *** 376,380 **** } catch (Exception e) { cat.error("retrieveElements: '" + obj + "' filter: '" + crit.toString() ! + "', error: " + e); throw new DBException(); --- 376,380 ---- } catch (Exception e) { cat.error("retrieveElements: '" + obj + "' filter: '" + crit.toString() ! + "', error: " , e); throw new DBException(); *************** *** 419,423 **** } catch (Exception e) { cat.error("retrieveElements: '" + obj + "' filter: '" + crit.toString() ! + "', error: " + e); throw new DBException(); --- 419,423 ---- } catch (Exception e) { cat.error("retrieveElements: '" + obj + "' filter: '" + crit.toString() ! + "', error: " , e); throw new DBException(); *************** *** 477,481 **** } catch (Exception e) { cat.error("retrieveElements: '" + obj + "' filter: '" + crit.toString() ! + "', error: " + e); throw new DBException(); --- 477,481 ---- } catch (Exception e) { cat.error("retrieveElements: '" + obj + "' filter: '" + crit.toString() ! + "', error: " , e); throw new DBException(); *************** *** 535,539 **** } catch (Exception e) { cat.error("retrieveElements: '" + obj + "' filter: '" + crit.toString() ! + "', error: " + e); throw new DBException(); --- 535,539 ---- } catch (Exception e) { cat.error("retrieveElements: '" + obj + "' filter: '" + crit.toString() ! + "', error: " , e); throw new DBException(); *************** *** 571,575 **** return (Integer.parseInt((String)obj)); } catch (SequenceManagerException e) { ! cat.error(e); //To change body of catch statement use Options | File Templates. return 0; } --- 571,575 ---- return (Integer.parseInt((String)obj)); } catch (SequenceManagerException e) { ! cat.error("getNextSeq: ",e); return 0; } |
|
From: David F. <dwf...@us...> - 2006-10-02 17:48:32
|
Update of /cvsroot/openmed/OpenEMed/dist/clients In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13988 Modified Files: build.xml Log Message: Moved LoadCoas to translate directory Index: build.xml =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/clients/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.xml 16 Dec 2003 23:16:39 -0000 1.8 --- build.xml 2 Oct 2006 17:48:30 -0000 1.9 *************** *** 82,86 **** <property name="dir" value="${src.dir}/Coas"/> <parallel> ! <java fork="yes" classname="gov.lanl.Web.LoadCoas" dir="${dir}" classpath="${dir}:${libs.classpath}:${comp.classpath}"> <jvmarg line="${jvmarg} -Dorg.omg.CORBA.ORBClass=${ORBClass} -Dorg.omg.CORBA.ORBSingletonClass=${ORBSingletonClass}"/> --- 82,86 ---- <property name="dir" value="${src.dir}/Coas"/> <parallel> ! <java fork="yes" classname="gov.lanl.translate.LoadCoas" dir="${dir}" classpath="${dir}:${libs.classpath}:${comp.classpath}"> <jvmarg line="${jvmarg} -Dorg.omg.CORBA.ORBClass=${ORBClass} -Dorg.omg.CORBA.ORBSingletonClass=${ORBSingletonClass}"/> |
|
From: David F. <dwf...@us...> - 2006-10-02 17:47:48
|
Update of /cvsroot/openmed/OpenEMed/dist/clients/Coas In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13567 Modified Files: loadcoas.bat Log Message: Moved LoadCoas to translate package Index: loadcoas.bat =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/clients/Coas/loadcoas.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** loadcoas.bat 4 Aug 2004 15:41:11 -0000 1.4 --- loadcoas.bat 2 Oct 2006 17:47:42 -0000 1.5 *************** *** 3,6 **** rem set CLASSPATH=%XMLPATH%;%TMPATH%;%TM_HOME%\dist\lib\corbamed.jar;%TM_HOME%\dist\lib\OpenEMed.jar;%TM_HOME%\dist\lib\tools.jar;%TM_HOME%\lib\xerces.jar;%TM_HOME%\lib\xalan.jar;%TM_HOME%\dist\lib\clients.jar;%ORBPATH%;. ! %JAVA%\java -mx128m -ms128m %ORBCLASS% -Djava.ext.dirs=%TM_HOME%/lib;%ORBDIR%;%TM_HOME%/dist/lib gov.lanl.Web.LoadCoas -file load.properties -ORBInitRef NameService=corbaloc::%IIOP_HOSTNAME%:%IIOP_NAME%/NameService -ORBInitRef TradingService=corbaloc::%IIOP_HOSTNAME%:%IIOP_TRADER%/TradingService --- 3,6 ---- rem set CLASSPATH=%XMLPATH%;%TMPATH%;%TM_HOME%\dist\lib\corbamed.jar;%TM_HOME%\dist\lib\OpenEMed.jar;%TM_HOME%\dist\lib\tools.jar;%TM_HOME%\lib\xerces.jar;%TM_HOME%\lib\xalan.jar;%TM_HOME%\dist\lib\clients.jar;%ORBPATH%;. ! %JAVA%\java -mx128m -ms128m %ORBCLASS% -Djava.ext.dirs=%TM_HOME%/lib;%ORBDIR%;%TM_HOME%/dist/lib gov.lanl.translate.LoadCoas -file load.properties -ORBInitRef NameService=corbaloc::%IIOP_HOSTNAME%:%IIOP_NAME%/NameService -ORBInitRef TradingService=corbaloc::%IIOP_HOSTNAME%:%IIOP_TRADER%/TradingService |
|
From: David F. <dwf...@us...> - 2006-10-02 17:47:04
|
Update of /cvsroot/openmed/OpenEMed/dist/clients/Coas In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13171 Modified Files: loadcoas.sh Log Message: moved LoadCoas to translate package Index: loadcoas.sh =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/clients/Coas/loadcoas.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** loadcoas.sh 4 Aug 2004 15:41:11 -0000 1.2 --- loadcoas.sh 2 Oct 2006 17:46:55 -0000 1.3 *************** *** 5,8 **** export JAVA ! ${JAVA} ${ORBCLASS} -Djava.ext.dirs=${TM_HOME}/lib:${ORBDIR}:${TM_HOME}/dist/lib gov.lanl.Web.LoadCoas -file load.properties -ORBInitRef NameService=corbaloc::%IIOP_HOSTNAME%:%IIOP_NAME%/NameService -ORBInitRef TradingService=corbaloc::%IIOP_HOSTNAME%:%IIOP_TRADER%/TradingService $* --- 5,8 ---- export JAVA ! ${JAVA} ${ORBCLASS} -Djava.ext.dirs=${TM_HOME}/lib:${ORBDIR}:${TM_HOME}/dist/lib gov.lanl.translate.LoadCoas -file load.properties -ORBInitRef NameService=corbaloc::${IIOP_HOSTNAME}:${IIOP_NAME}/NameService -ORBInitRef TradingService=corbaloc::${IIOP_HOSTNAME}:${IIOP_TRADER}/TradingService $* |
|
From: David F. <dwf...@us...> - 2006-10-02 16:51:07
|
Update of /cvsroot/openmed/OpenEMed/src/clients/gov/lanl/translate In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22240/src/clients/gov/lanl/translate Modified Files: LoadCoas.java Log Message: Added debug statement Index: LoadCoas.java =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/clients/gov/lanl/translate/LoadCoas.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LoadCoas.java 28 Mar 2006 01:31:03 -0000 1.3 --- LoadCoas.java 2 Oct 2006 16:48:19 -0000 1.4 *************** *** 21,25 **** //import org.xml.sax.InputSource; import nu.xom.*; ! import org.apache.xml.serialize.OutputFormat; //import org.apache.xml.serialize.XMLSerializer; import gov.lanl.Web.COAS; --- 21,25 ---- //import org.xml.sax.InputSource; import nu.xom.*; ! //import org.apache.xml.serialize.OutputFormat; //import org.apache.xml.serialize.XMLSerializer; import gov.lanl.Web.COAS; *************** *** 76,79 **** --- 76,80 ---- void init() { File[] fileList = new File[0]; + cat.debug("directory = "+directory.getAbsolutePath()); if (directory != null && directory.isDirectory()) { fileList = directory.listFiles(); *************** *** 165,169 **** public void write(String file) { try { ! OutputFormat format = new OutputFormat("xml", "UTF-8", true); FileOutputStream fileOut = new FileOutputStream(file); --- 166,170 ---- public void write(String file) { try { ! // OutputFormat format = new OutputFormat("xml", "UTF-8", true); FileOutputStream fileOut = new FileOutputStream(file); |
|
From: David F. <dwf...@us...> - 2006-10-02 16:44:25
|
Update of /cvsroot/openmed/OpenEMed/src/tools/gov/lanl/Database In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20636/src/tools/gov/lanl/Database Modified Files: CodeMapper.java Log Message: Modified CodeMapper to cache the data from the database so that it could be updated by a different server without duplicating the data. Index: CodeMapper.java =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/tools/gov/lanl/Database/CodeMapper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CodeMapper.java 27 Mar 2006 23:28:01 -0000 1.4 --- CodeMapper.java 2 Oct 2006 16:44:13 -0000 1.5 *************** *** 42,48 **** // the mapping hashtables ! HashMap idMap; ! HashMap codeMap; ! Vector topLevelCodes; // the singleton instance --- 42,48 ---- // the mapping hashtables ! HashMap<String, String> idMap; ! HashMap<String, String> codeMap; ! ArrayList<String> topLevelCodes; // the singleton instance *************** *** 96,101 **** emptyStringMap_ = createStringMap("", "", false); ! readMapping(); } --- 96,104 ---- emptyStringMap_ = createStringMap("", "", false); + idMap = new HashMap<String, String>(); + codeMap = new HashMap<String, String>(); + topLevelCodes = new ArrayList<String>(); ! // readMapping(); } *************** *** 154,162 **** // lookup id ! String id = (String) idMap.get(code); // id not found? if (id == null) { ! // add flag set? if (addCode) { --- 157,175 ---- // lookup id ! String id = idMap.get(code); // id not found? if (id == null) { ! // First read from database ! StringMap_ stringMap = readStringMap(code); ! if (stringMap != null) { ! id = stringMap.getId(); ! idMap.put(code, id); ! codeMap.put(id, code); ! if (isTopLevelCode != stringMap.isTopLevelCode()) ! cat.warn("getId: isTopLevelCode is " + isTopLevelCode + " doesn't match"); ! topLevelCodes.add(code); ! return id; ! } // add flag set? if (addCode) { *************** *** 188,197 **** // lookup code ! String code = (String) codeMap.get(id); if (code == null) { ! cat.info(".getCode: Can't lookup id '" + id + "'"); ! ! return String.valueOf(code); } --- 201,212 ---- // lookup code ! String code = codeMap.get(id); if (code == null) { ! code = readCode(id); ! if (code == null) { ! cat.info(".getCode: Can't lookup id '" + id + "'"); ! return String.valueOf(code); ! } } *************** *** 200,203 **** --- 215,328 ---- /** + * Find the StringMap in the database for the requested code + * + * @param code + * @return StringMap_ + */ + gov.lanl.Database.StringMap_ readStringMap(String code) { + Vector results = null; + StringMap_ stringMap = null; + try { + dbMgr.txn_begin(); + SearchFilter searchFilter = DBMgrFactory.createFilter(); + searchFilter.compareFilter("entry", code, SearchFilter.EQUAL); + Object obj = stringMap_Class.newInstance(); + results = dbMgr.retrieveElements(obj, searchFilter, DatabaseMgr.SHALLOW); + int size = results.size(); + if (size > 1) { + cat.error("duplicate values (" + size + ") for code=" + code + " found, returning first one!"); + } + if (size > 0) stringMap = (gov.lanl.Database.StringMap_) results.get(0); + cat.debug("readStringMap: " + stringMap); + dbMgr.txn_commit(); + } catch (Exception e) { + cat.error("failure in readStringMap of code " + code + " " + e); + dbMgr.txn_abort(); + + } + return stringMap; + + + } + + /** + * Obtain the code corresponding to the id from the database. + * @param id + * @return String + */ + String readCode(String id) { + Vector results = null; + try { + dbMgr.txn_begin(); + SearchFilter searchFilter = DBMgrFactory.createFilter(); + searchFilter.compareFilter("id", id, SearchFilter.EQUAL); + Object obj = stringMap_Class.newInstance(); + results = dbMgr.retrieveElements(obj, searchFilter, DatabaseMgr.SHALLOW); + int size = results.size(); + + if (size > 1) { + cat.error("duplicate values (" + size + ") for id=" + id + " found, returning first one!"); + } + cat.debug("readStringMap: " + results.get(0)); + StringMap_ stringMap = null; + if (size > 0) stringMap = (gov.lanl.Database.StringMap_) results.get(0); + dbMgr.txn_commit(); + if (size == 0) return null; + String entry = stringMap.getEntry(); + boolean isTopLevel = stringMap.isTopLevelCode(); + codeMap.put(id, entry); + idMap.put(entry, id); + if (isTopLevel) topLevelCodes.add(entry); + return entry; + + } catch (Exception e) { + cat.error("failure in readCode of id " + id + " " + e); + dbMgr.txn_abort(); + return null; + } + } + + /** + * read in top level codes + */ + public void readTopLevel() { + Vector results = null; + try { + dbMgr.txn_begin(); + SearchFilter searchFilter = DBMgrFactory.createFilter(); + searchFilter.matchValue("isTopLevelCode", 1, SearchFilter.EQUAL); + Object obj = stringMap_Class.newInstance(); + results = dbMgr.retrieveElements(obj, searchFilter, DatabaseMgr.SHALLOW); + + for (Iterator it = results.iterator(); it.hasNext();) { + Object result = (Object) it.next(); + StringMap_ stringMap = (StringMap_) result; + String id = stringMap.getId(); + String entry = stringMap.getEntry(); + + if (debug) { + cat.info(".readMapping: " + id + "/" + entry); + } + + // insert mapping into hashmaps + idMap.put(entry, id); + codeMap.put(id, entry); + + if (stringMap.isTopLevelCode()) { + topLevelCodes.add(entry); + } + } + dbMgr.txn_commit(); + + + } catch (Exception e) { + cat.error("failure in readTopLevel " + e); + dbMgr.txn_abort(); + + } + + } + + /** * This method can be used to add additional key/value pairs to the mapping tables * *************** *** 253,268 **** // iterate over result set and put elements into hashtables - int size = results.size(); if (size > 0) { ! idMap = new HashMap(2 * size); ! codeMap = new HashMap(2 * size); ! topLevelCodes = new Vector(size); } else { ! idMap = new HashMap(); ! codeMap = new HashMap(); ! topLevelCodes = new Vector(); } ! for (Iterator it = results.iterator(); it.hasNext();) { Object result = (Object) it.next(); --- 378,394 ---- // iterate over result set and put elements into hashtables + /* + int size = results.size(); if (size > 0) { ! idMap = new HashMap<String, String>(2 * size); ! codeMap = new HashMap<String, String>(2 * size); ! topLevelCodes = new ArrayList<String>(size); } else { ! idMap = new HashMap<String, String>(); ! codeMap = new HashMap<String, String>(); ! topLevelCodes = new ArrayList<String>(); } ! */ for (Iterator it = results.iterator(); it.hasNext();) { Object result = (Object) it.next(); *************** *** 288,301 **** } catch (DBException e) { cat.error("Can't retrieve code mapping! " + e); ! ! idMap = new HashMap(); ! codeMap = new HashMap(); ! topLevelCodes = new Vector(); ! dbMgr.txn_abort(); return; } ! cat.info("loaded: "+codeMap.size() + " codes, "+topLevelCodes.size()+" topLevelCodes found"); } --- 414,427 ---- } catch (DBException e) { cat.error("Can't retrieve code mapping! " + e); ! /* ! idMap = new HashMap<String, String>(); ! codeMap = new HashMap<String, String>(); ! topLevelCodes = new ArrayList<String>(); ! */ dbMgr.txn_abort(); return; } ! cat.info("loaded: " + codeMap.size() + " codes, " + topLevelCodes.size() + " topLevelCodes found"); } *************** *** 319,327 **** ArrayList array = new ArrayList(); Iterator it = null; ! if (!returnAll) it = topLevelCodes.iterator(); ! else it = ((Collection) codeMap.values()).iterator(); ! while (it.hasNext()) { String s = (String) it.next(); --- 445,456 ---- ArrayList array = new ArrayList(); Iterator it = null; ! ! if (!returnAll) { ! if (topLevelCodes.size() == 0) readTopLevel(); it = topLevelCodes.iterator(); ! } else { ! if (codeMap.size() == 0) readMapping(); it = ((Collection) codeMap.values()).iterator(); ! } while (it.hasNext()) { String s = (String) it.next(); *************** *** 366,369 **** --- 495,499 ---- if (returnAll) { + if (codeMap.size() == 0) readMapping(); Collection codesColl = codeMap.values(); *************** *** 371,379 **** codes = (String[]) codesColl.toArray(codes); } else { ! // copy vector into array codes = new String[topLevelCodes.size()]; ! topLevelCodes.copyInto(codes); } --- 501,509 ---- codes = (String[]) codesColl.toArray(codes); } else { ! if (topLevelCodes.size() == 0) readTopLevel(); // copy vector into array codes = new String[topLevelCodes.size()]; ! codes = topLevelCodes.toArray(codes); } *************** *** 433,437 **** // Class[] params = new Class[]{ String.class , String.class, Boolean.class}; Class[] params = new Class[]{ ! String.class, String.class, int.class }; Constructor constructor = stringMap_Class.getConstructor(params); --- 563,567 ---- // Class[] params = new Class[]{ String.class , String.class, Boolean.class}; Class[] params = new Class[]{ ! String.class, String.class, int.class }; Constructor constructor = stringMap_Class.getConstructor(params); *************** *** 445,449 **** Object[] args = new Object[]{ ! id, code, topLevel }; --- 575,579 ---- Object[] args = new Object[]{ ! id, code, topLevel }; |
|
From: David F. <dwf...@us...> - 2006-09-29 21:08:02
|
Update of /cvsroot/openmed/OpenEMed/src/servers/persistent/gov/lanl/COAS In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27987/src/servers/persistent/gov/lanl/COAS Modified Files: QueryAccessImpl.java Log Message: Added wildcard support for SubjectId Index: QueryAccessImpl.java =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/servers/persistent/gov/lanl/COAS/QueryAccessImpl.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** QueryAccessImpl.java 28 Mar 2006 00:47:13 -0000 1.36 --- QueryAccessImpl.java 29 Sep 2006 21:07:58 -0000 1.37 *************** *** 149,154 **** } - - // // Methods --- 149,152 ---- *************** *** 164,176 **** * @param policy * @return int ! * @exception InvalidIds ! * @exception DuplicateIds ! * @exception InvalidCodes ! * @exception DuplicateCodes ! * @exception InvalidTimeSpan ! * @exception InvalidQualifiers ! * @exception DuplicateQualifiers ! * @exception InvalidPolicies ! * @exception DuplicatePolicies */ public int count_observations(QualifiedPersonId[] who, String[] what, TimeSpan when, --- 162,174 ---- * @param policy * @return int ! * @throws InvalidIds ! * @throws DuplicateIds ! * @throws InvalidCodes ! * @throws DuplicateCodes ! * @throws InvalidTimeSpan ! * @throws InvalidQualifiers ! * @throws DuplicateQualifiers ! * @throws InvalidPolicies ! * @throws DuplicatePolicies */ public int count_observations(QualifiedPersonId[] who, String[] what, TimeSpan when, *************** *** 198,202 **** * @param observation_id * @return Any ! * @exception org.omg.DsObservationAccess.InvalidOids */ public Any get_observation(org.omg.DsObservationAccess.ObservationId observation_id) --- 196,201 ---- * @param observation_id * @return Any ! * @throws org.omg.DsObservationAccess.InvalidOids ! * */ public Any get_observation(org.omg.DsObservationAccess.ObservationId observation_id) *************** *** 269,274 **** * @param observation_ids * @return Any ! * @exception org.omg.DsObservationAccess.InvalidOids ! * @exception org.omg.DsObservationAccess.DuplicateOids */ public Any[] get_observations(org.omg.DsObservationAccess.ObservationId[] observation_ids) --- 268,275 ---- * @param observation_ids * @return Any ! * @throws org.omg.DsObservationAccess.InvalidOids ! * ! * @throws org.omg.DsObservationAccess.DuplicateOids ! * */ public Any[] get_observations(org.omg.DsObservationAccess.ObservationId[] observation_ids) *************** *** 291,295 **** * engine, in accordance with default policies. * In essence, the 'who', 'what', and 'when' filter the database of observations. ! * * Time spans with end times greater than the server's current time are interpreted to * mean 'through now, so indicate the concept 'from a given time through now with a --- 292,296 ---- * engine, in accordance with default policies. * In essence, the 'who', 'what', and 'when' filter the database of observations. ! * <p/> * Time spans with end times greater than the server's current time are interpreted to * mean 'through now, so indicate the concept 'from a given time through now with a *************** *** 318,327 **** * A typical client will choose a large number for max_sequence if the size of the data * items is small. ! * ! * * Non-standard extensions: * ======================== * The query mechanism has been extended to allow wildcard searches on the who, what and when parameters. ! * * The who-parameter allows wildcards in its String instance memebers. * 1.case: --- 319,328 ---- * A typical client will choose a large number for max_sequence if the size of the data * items is small. ! * <p/> ! * <p/> * Non-standard extensions: * ======================== * The query mechanism has been extended to allow wildcard searches on the who, what and when parameters. ! * <p/> * The who-parameter allows wildcards in its String instance memebers. * 1.case: *************** *** 331,344 **** * QualifiedPersonId == "" AND QualifiedPersonId.domain.naming_entity == "" * retrieves all subjectIds in all domains, the RegistrationAuthority (DNS, ISO, IDL, DCE, OTHER) is ignored ! * * For the what-parameter an empty string array (new String[0]) is defined as a wildcard. Also * if the what parameter ends in "/", it adds a wildcard to the end. It is also influenced * by the policy that provides only top level codes versus all codes. ! * * The when parameter allows wildcards in its String instance memebers. * An empty string in the the when.start and/or when.stop variables are interpreted as open * lower and/or upper boundaries in the time interval. * - * * @param who * @param what --- 332,344 ---- * QualifiedPersonId == "" AND QualifiedPersonId.domain.naming_entity == "" * retrieves all subjectIds in all domains, the RegistrationAuthority (DNS, ISO, IDL, DCE, OTHER) is ignored ! * <p/> * For the what-parameter an empty string array (new String[0]) is defined as a wildcard. Also * if the what parameter ends in "/", it adds a wildcard to the end. It is also influenced * by the policy that provides only top level codes versus all codes. ! * <p/> * The when parameter allows wildcards in its String instance memebers. * An empty string in the the when.start and/or when.stop variables are interpreted as open * lower and/or upper boundaries in the time interval. * * @param who * @param what *************** *** 347,354 **** * @param the_rest * @return Any ! * @exception org.omg.DsObservationAccess.InvalidIds ! * @exception org.omg.DsObservationAccess.InvalidCodes ! * @exception org.omg.DsObservationAccess.DuplicateCodes ! * @exception org.omg.DsObservationAccess.InvalidTimeSpan */ public synchronized Any[] get_observations_by_time(QualifiedPersonId who, --- 347,358 ---- * @param the_rest * @return Any ! * @throws org.omg.DsObservationAccess.InvalidIds ! * ! * @throws org.omg.DsObservationAccess.InvalidCodes ! * ! * @throws org.omg.DsObservationAccess.DuplicateCodes ! * ! * @throws org.omg.DsObservationAccess.InvalidTimeSpan ! * */ public synchronized Any[] get_observations_by_time(QualifiedPersonId who, *************** *** 361,365 **** org.omg.PersonIdService.QualifiedPersonId[] whoSeq = new org.omg.PersonIdService.QualifiedPersonId[]{ ! who }; --- 365,369 ---- org.omg.PersonIdService.QualifiedPersonId[] whoSeq = new org.omg.PersonIdService.QualifiedPersonId[]{ ! who }; *************** *** 381,391 **** * @param the_rest * @return Any ! * @exception org.omg.DsObservationAccess.InvalidIds ! * @exception org.omg.DsObservationAccess.DuplicateIds ! * @exception org.omg.DsObservationAccess.InvalidCodes ! * @exception org.omg.DsObservationAccess.DuplicateCodes ! * @exception org.omg.DsObservationAccess.InvalidTimeSpan ! * @exception org.omg.DsObservationAccess.InvalidQualifiers ! * @exception org.omg.DsObservationAccess.DuplicateQualifiers */ public Any[] get_observations_by_qualifier(QualifiedPersonId[] who, String[] what, --- 385,402 ---- * @param the_rest * @return Any ! * @throws org.omg.DsObservationAccess.InvalidIds ! * ! * @throws org.omg.DsObservationAccess.DuplicateIds ! * ! * @throws org.omg.DsObservationAccess.InvalidCodes ! * ! * @throws org.omg.DsObservationAccess.DuplicateCodes ! * ! * @throws org.omg.DsObservationAccess.InvalidTimeSpan ! * ! * @throws org.omg.DsObservationAccess.InvalidQualifiers ! * ! * @throws org.omg.DsObservationAccess.DuplicateQualifiers ! * */ public Any[] get_observations_by_qualifier(QualifiedPersonId[] who, String[] what, *************** *** 416,428 **** * @param the_rest * @return Any ! * @exception org.omg.DsObservationAccess.InvalidIds ! * @exception org.omg.DsObservationAccess.DuplicateIds ! * @exception org.omg.DsObservationAccess.InvalidCodes ! * @exception org.omg.DsObservationAccess.DuplicateCodes ! * @exception org.omg.DsObservationAccess.InvalidTimeSpan ! * @exception org.omg.DsObservationAccess.InvalidQualifiers ! * @exception org.omg.DsObservationAccess.DuplicateQualifiers ! * @exception org.omg.DsObservationAccess.InvalidPolicies ! * @exception org.omg.DsObservationAccess.DuplicatePolicies */ public Any[] get_observations_with_policy(QualifiedPersonId[] who, String[] what, --- 427,448 ---- * @param the_rest * @return Any ! * @throws org.omg.DsObservationAccess.InvalidIds ! * ! * @throws org.omg.DsObservationAccess.DuplicateIds ! * ! * @throws org.omg.DsObservationAccess.InvalidCodes ! * ! * @throws org.omg.DsObservationAccess.DuplicateCodes ! * ! * @throws org.omg.DsObservationAccess.InvalidTimeSpan ! * ! * @throws org.omg.DsObservationAccess.InvalidQualifiers ! * ! * @throws org.omg.DsObservationAccess.DuplicateQualifiers ! * ! * @throws org.omg.DsObservationAccess.InvalidPolicies ! * ! * @throws org.omg.DsObservationAccess.DuplicatePolicies ! * */ public Any[] get_observations_with_policy(QualifiedPersonId[] who, String[] what, *************** *** 464,469 **** checkSecurity("+READ+"); ! String[] codes = get_supported_codes(0); ! // codeMapper.getCodeList(policyMgr.getPolicy(supportedCodesReturnAll)); String[] retCodes = codes; int elementCount = codes.length; --- 484,489 ---- checkSecurity("+READ+"); ! String[] codes = get_supported_codes(0); ! // codeMapper.getCodeList(policyMgr.getPolicy(supportedCodesReturnAll)); String[] retCodes = codes; int elementCount = codes.length; *************** *** 492,513 **** return retCodes; } ! /** ! * Non corba call to get_supported_codes ! * @param max_sequence ! */ public String[] get_supported_codes(int max_sequence) { String[] codes = codeMapper.getCodeList(policyMgr.getPolicy(supportedCodesReturnAll)); String[] retCodes = codes; int elementCount = codes.length; ! if (max_sequence == 0) return retCodes; ! if (elementCount > max_sequence) { ! retCodes = new String[max_sequence]; System.arraycopy(codes, 0, retCodes, 0, max_sequence); ! } ! return retCodes; ! } /** * Supplies the ObservationType (CORBA::TCKind and CORBA::RepositoryId) of the --- 512,536 ---- return retCodes; } ! ! /** ! * Non corba call to get_supported_codes ! * ! * @param max_sequence ! */ public String[] get_supported_codes(int max_sequence) { String[] codes = codeMapper.getCodeList(policyMgr.getPolicy(supportedCodesReturnAll)); String[] retCodes = codes; int elementCount = codes.length; ! if (max_sequence == 0) return retCodes; ! if (elementCount > max_sequence) { ! retCodes = new String[max_sequence]; System.arraycopy(codes, 0, retCodes, 0, max_sequence); ! } ! return retCodes; ! } + /** * Supplies the ObservationType (CORBA::TCKind and CORBA::RepositoryId) of the *************** *** 525,530 **** * @param observation_type * @return org.omg.CORBA.TypeCode ! * @exception org.omg.DsObservationAccess.InvalidCodes ! * @exception org.omg.DsObservationAccess.NotImplemented */ public org.omg.CORBA.TypeCode get_type_code_for_observation_type(String observation_type) --- 548,555 ---- * @param observation_type * @return org.omg.CORBA.TypeCode ! * @throws org.omg.DsObservationAccess.InvalidCodes ! * ! * @throws org.omg.DsObservationAccess.NotImplemented ! * */ public org.omg.CORBA.TypeCode get_type_code_for_observation_type(String observation_type) *************** *** 557,569 **** * @param qualifier * @return String[] ! * @exception org.omg.DsObservationAccess.InvalidCodes ! * @exception org.omg.DsObservationAccess.NotImplemented */ public String[] get_supported_qualifiers(String qualifier) throws InvalidCodes, org.omg.DsObservationAccess.NotImplemented { ! cat.debug("get_supported_qualifiers called with "+qualifier); java.util.regex.Pattern p = java.util.regex.Pattern.compile(qualifier); - // Security check checkSecurity("+READ+"); --- 582,595 ---- * @param qualifier * @return String[] ! * @throws org.omg.DsObservationAccess.InvalidCodes ! * ! * @throws org.omg.DsObservationAccess.NotImplemented ! * */ public String[] get_supported_qualifiers(String qualifier) throws InvalidCodes, org.omg.DsObservationAccess.NotImplemented { ! cat.debug("get_supported_qualifiers called with " + qualifier); java.util.regex.Pattern p = java.util.regex.Pattern.compile(qualifier); // Security check checkSecurity("+READ+"); *************** *** 577,587 **** for (int i = 0; i < codes.length; i++) { ! if (codes[i] != null) { if (qualifier != null && !qualifier.equals("")) { m = p.matcher(codes[i]); if (m.find()) retCodes.add(codes[i]); ! } else ! if (!(codes[i] == null)) retCodes.add(codes[i]); } } --- 603,612 ---- for (int i = 0; i < codes.length; i++) { ! if (codes[i] != null) { if (qualifier != null && !qualifier.equals("")) { m = p.matcher(codes[i]); if (m.find()) retCodes.add(codes[i]); ! } else if (!(codes[i] == null)) retCodes.add(codes[i]); } } *************** *** 603,606 **** --- 628,632 ---- * A complete list of policies which this server can employ when filtering on desired * observations. The returned list is of codes only. + * * @return String[] */ *************** *** 615,618 **** --- 641,645 ---- * The returned list is a list of name-value pairs, both the name of the policy and its * default value. + * * @return NameValuePair[] */ *************** *** 624,627 **** --- 651,655 ---- * Version of COAS specification supported by this DsObservationAccess server, starting * with '1.0' for the first approved specification. + * * @return String */ *************** *** 711,717 **** * check the security * - * * @param type - * * @see */ --- 739,743 ---- *************** *** 737,741 **** * get observations based on the specified policy * - * * @param who * @param what --- 763,766 ---- *************** *** 746,752 **** * @param the_rest * @param count - * * @return Any[] - * * @see */ --- 771,775 ---- *************** *** 790,795 **** currentPolicies = policyMgr.getDefaultPolicies(); - - // update the policies for (int i = 0; i < policy.length; i++) { --- 813,816 ---- *************** *** 834,838 **** if (removeDuplicates) obsDataVector = removeDuplicates(obsDataVector); ! if (qualifiers != null && qualifiers.length > 0) obsDataVector = filterOnQualifiers(obsQualifiers, obsDataVector); if (count) { --- 855,860 ---- if (removeDuplicates) obsDataVector = removeDuplicates(obsDataVector); ! if (qualifiers != null && qualifiers.length > 0) ! obsDataVector = filterOnQualifiers(obsQualifiers, obsDataVector); if (count) { *************** *** 864,873 **** * * @param who is the QualifiedPersonId to be matched ! * @param what an array of codes to be matched ! * @param when TimeSpan to be matched ! * @return SearchFilter * @throws InvalidTimeSpan * @throws gov.lanl.Database.DBException - * * @see */ --- 886,894 ---- * * @param who is the QualifiedPersonId to be matched ! * @param what an array of codes to be matched ! * @param when TimeSpan to be matched ! * @return SearchFilter * @throws InvalidTimeSpan * @throws gov.lanl.Database.DBException * @see */ *************** *** 889,894 **** // get stringified version of the qualified person id String subjectIdStr = gov.lanl.Utility.TransLib.qualified_person_to_str(who); ! ! whoFilter.compareFilter("subjectId", subjectIdStr, SearchFilter.EQUAL); } else if (who.domain.naming_entity.length() > 0) { whoFilter = DBMgrFactory.createFilter(); --- 910,918 ---- // get stringified version of the qualified person id String subjectIdStr = gov.lanl.Utility.TransLib.qualified_person_to_str(who); ! if (subjectIdStr.contains("?")) { ! String subjIdStr = subjectIdStr.replace("?", wildcard); ! whoFilter.compareFilter("subjectId", subjIdStr, SearchFilter.LIKE); ! } else ! whoFilter.compareFilter("subjectId", subjectIdStr, SearchFilter.EQUAL); } else if (who.domain.naming_entity.length() > 0) { whoFilter = DBMgrFactory.createFilter(); *************** *** 897,901 **** try { String domain = transLib.authority_to_str(who.domain); ! domain += wildcard; --- 921,927 ---- try { String domain = transLib.authority_to_str(who.domain); ! if (domain.contains("?")) { ! domain = domain.replace("?",wildcard); ! } domain += wildcard; *************** *** 1041,1045 **** * Actually retrieve the requested observations from the database * - * * @param who * @param what --- 1067,1070 ---- *************** *** 1048,1059 **** * @param currentPolicies * @param deep - * * @return Vector - * * @throws DuplicateCodes * @throws InvalidCodes * @throws InvalidIds * @throws InvalidTimeSpan - * * @see */ --- 1073,1081 ---- *************** *** 1113,1123 **** * Prepare the Output Vector and convert to Any[] * - * * @param inList * @param the_rest * @param max_sequence - * * @return Any[] - * * @see */ --- 1135,1142 ---- *************** *** 1200,1203 **** --- 1219,1223 ---- * filter based on the qualifiers * Oly include elements that contain all the qualifiers + * * @param qualifiers * @param observations *************** *** 1227,1230 **** --- 1247,1251 ---- * the data set, keeping only the most recent (as determined by * DATE_RECORDED) + * * @param observations * @return ArrayList *************** *** 1271,1275 **** } - /*--- formatting done in "OpenEMed Convention" style on 10-18-2001 ---*/ --- 1292,1295 ---- |
|
From: David F. <dwf...@us...> - 2006-09-25 22:53:07
|
Update of /cvsroot/openmed/OpenEMed/dist/servers In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16976/dist/servers Modified Files: build.xml Log Message: Minor typographic edit Index: build.xml =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/build.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** build.xml 4 Aug 2004 02:24:48 -0000 1.22 --- build.xml 25 Sep 2006 22:53:05 -0000 1.23 *************** *** 113,117 **** <arg value="-ORBiiop.hostname=${iiop.hostname}"/> <arg value="-u"/> ! <arg value="-f./" /> <arg value="-llog.txt "/> </java> --- 113,117 ---- <arg value="-ORBiiop.hostname=${iiop.hostname}"/> <arg value="-u"/> ! <arg value="-f ./" /> <arg value="-llog.txt "/> </java> |
|
From: David F. <dwf...@us...> - 2006-09-25 03:53:08
|
Update of /cvsroot/openmed/OpenEMed/src/servers/persistent/gov/lanl/COAS In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22810 Modified Files: ObservationMgrImpl.java Added Files: ObservationMgrImplLoader.java Log Message: Moved observation loading to a separate thread Index: ObservationMgrImpl.java =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/servers/persistent/gov/lanl/COAS/ObservationMgrImpl.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ObservationMgrImpl.java 13 Sep 2006 03:47:42 -0000 1.24 --- ObservationMgrImpl.java 25 Sep 2006 03:53:03 -0000 1.25 *************** *** 1,1117 **** ! /*--- formatted by Jindent 2.1, (www.c-lab.de/~jindent) ---*/ ! ! // ObservationMgrImpl.java ! ! /** ! * *********************************** ! * Copyright Notice ! * Copyright (c) 1999, Regents of the University of California. All rights reserved. ! * ! * DISCLAIMER [...2141 lines suppressed...] ! ! persChild.update(origPersChild); ! persChild.clearComposite(); ! persObj.addComposite(persChild); ! } ! ! // inspect the subtree of origPersObj ! restoreSignedNodesRecursive(origPersChild, persChild, ht); ! } ! } ! } // end for ! } ! ! } ! ! } ! ! ! /*--- formatting done in "OpenEMed Convention" style on 10-18-2001 ---*/ ! --- NEW FILE: ObservationMgrImplLoader.java --- /*--- formatted by Jindent 2.1, (www.c-lab.de/~jindent) ---*/ // ObservationMgrImplLoader.java /** * *********************************** * Copyright Notice * Copyright (c) 2006, Richard Schilling. All rights reserved. * * DISCLAIMER * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT * SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * ************************************ */ package gov.lanl.COAS; import gov.lanl.Utility.ConfigProperties; import gov.lanl.Utility.DomDoc2ObsData; import gov.lanl.Utility.ObsData2Dom; import gov.lanl.Utility.Xml2DomDoc; import org.apache.log4j.Logger; import org.omg.DsObservationAccess.ObservationDataStruct; import org.omg.DsObservationAccess.ObservationDataStructHelper; import java.io.FileInputStream; /** * This class is used by ObservationMgrImpl to load data into the COAS server. * * @author Richard Schilling * @version 1.0 * @since 09/20/2006 */ public class ObservationMgrImplLoader implements Runnable { // Version & Date static final String version = "$Revision: 1.1 $"; // static final String shortVersion = "1.00"; // static String name = "gov.lanl.ObservationManager.ObservationMgr"; // static final String shortVersion = "1.00"; static final String date = "$Date: 2006/09/25 03:53:03 $"; // the name of the class // private final String cn = this.getClass().getName(); private static Logger cat = Logger.getLogger(ObservationMgrImplLoader.class.getName()); // miscellaneous ConfigProperties props; // holder for an empty persistent object // the parent object ObservationComponentImpl parent; private String loadFile = ""; /** * Constructor declaration * * @param parent * @see */ public ObservationMgrImplLoader(ObservationComponentImpl parent) { this.parent = parent; // theOrb = parent.theOrb; props = parent.props; // dbMgr = DBMgrFactory.current(); // dbMgr.setDebug( debug); // persObjFact = dbMgr.getObjectFactory(); // theOrb.connect(this); loadFile = props.getProperty("CreateDB", ""); cat.debug("ObservationMgrImplLoader instantiated."); } public void run() { if (!loadFile.equals("")) { cat.info("Loading observation data from file '" + loadFile + "'"); try { // create a DomTree out of the xml file Xml2DomDoc x2dd = new Xml2DomDoc(new FileInputStream(loadFile)); // create observation data from the DomTree DomDoc2ObsData dd2od = new DomDoc2ObsData(x2dd.getDomDoc().getRootElement()); ObservationDataStruct[] obsDataSeq = dd2od.getObsDataSeq(); // embed external URI links as a multimedia.blob into the database? String embedMultimedia = props.getProperty("embedMultimedia", "no"); Thread.sleep(250); if (embedMultimedia.equalsIgnoreCase("YES")) { cat.info("Embedding URIs into Multimedia objects..."); URI2Blob uri2blob = new URI2Blob(obsDataSeq, parent.theOrb); obsDataSeq = uri2blob.getObservationDataSeq(); cat.info("Embedding URIs into Multimedia objects done!"); } // the createXML property can be used to create a new xml file // (usefull for creating a xml file after embedding the URIs as Blobs) String createXML = props.getProperty("createXML", ""); if (!createXML.equals("")) { cat.info("Creating XML file " + createXML + "..."); ObsData2Dom od2doc = new ObsData2Dom(obsDataSeq); // Writer out = new FileWriter(createXML); od2doc.write(createXML); // out.write(od2x.getXml()); // out.flush(); // out.close(); cat.info("Creating XML file " + createXML + " done!"); } cat.info("Adding observations to the database..."); Thread.sleep(250); for (int i = 0; i < obsDataSeq.length; i++) { // sleep to let other threads work. if ((i % 500) == 0) Thread.sleep(250); // output some status if ((i % 1000) == 0) cat.debug("Loading record number " + i); org.omg.CORBA.Any any = parent.theOrb.create_any(); try { ObservationDataStructHelper.insert(any, obsDataSeq[i]); parent.get_observation_mgr().add_observation(any); // add_observation(any); } catch (Exception e) { cat.error("failed to add object: ", e); if (obsDataSeq[i] != null) cat.error("obsDataSeq: " + i + ":" + obsDataSeq[i].code); } } cat.info("Added " + obsDataSeq.length + " observations to the database"); } catch (Exception e) { cat.error(e); } } } } |
|
From: David F. <dwf...@us...> - 2006-09-22 20:10:01
|
Update of /cvsroot/openmed/OpenEMed/dist/servers In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12300 Modified Files: openorb-naming.sh openorb-naming.bat Added Files: openorb-manager.sh Log Message: Added IIOP_NAME and IIOP_HOSTNAME for consistency and added ManagementBoard script Index: openorb-naming.bat =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/openorb-naming.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** openorb-naming.bat 14 Sep 2005 17:09:37 -0000 1.6 --- openorb-naming.bat 22 Sep 2006 20:09:58 -0000 1.7 *************** *** 7,10 **** rem set CLASSPATH=%XMLPATH%;%ORBPATH% ! %JAVA% %ORBCLASS% -Djava.ext.dirs=%TM_HOME%\lib;%TM_HOME%\lib\orb org.openorb.tns.Server -ORBiiop.port=10123 -ORBiiop.hostname=localhost -u -f ./ --- 7,10 ---- rem set CLASSPATH=%XMLPATH%;%ORBPATH% ! %JAVA% %ORBCLASS% -Djava.ext.dirs=%TM_HOME%\lib;%TM_HOME%\lib\orb org.openorb.tns.Server -ORBiiop.port=%IIOP_NAME% -ORBiiop.hostname=%IIOP_HOSTNAME% -u -f ./ --- NEW FILE: openorb-manager.sh --- #! /bin/sh . ../../config/sethome.sh ${JAVA_HOME}/bin/java ${ORBCLASS} -Djava.ext.dirs=${TM_HOME}/lib:${TM_HOME}/lib/orb org.openorb.board.Board Index: openorb-naming.sh =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/openorb-naming.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** openorb-naming.sh 3 Apr 2004 03:42:17 -0000 1.3 --- openorb-naming.sh 22 Sep 2006 20:09:58 -0000 1.4 *************** *** 1,4 **** #! /bin/sh . ../../config/sethome.sh ! ${JAVA_HOME}/bin/java ${ORBCLASS} -Djava.ext.dirs=${TM_HOME}/lib:${TM_HOME}/lib/orb org.openorb.tns.Server -ORBiiop.port=5002 -ORBiiop.hostname=localhost -u -f ./ --- 1,4 ---- #! /bin/sh . ../../config/sethome.sh ! ${JAVA_HOME}/bin/java ${ORBCLASS} -Djava.ext.dirs=${TM_HOME}/lib:${TM_HOME}/lib/orb org.openorb.tns.Server -ORBiiop.port=${IIOP_NAME} -ORBiiop.hostname=${IIOP_HOSTNAME} -u -f ./ |
|
From: David F. <dwf...@us...> - 2006-09-15 05:36:07
|
Update of /cvsroot/openmed/OpenEMed/src/clients/webapps In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30165 Modified Files: COAS.xml Log Message: Added timeout parameter Index: COAS.xml =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/clients/webapps/COAS.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** COAS.xml 31 Oct 2003 23:47:57 -0000 1.1 --- COAS.xml 15 Sep 2006 05:36:02 -0000 1.2 *************** *** 5,8 **** --- 5,11 ---- "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"> <web-app> + <session-config> + <session-timeout>1000</session-timeout> + </session-config> <servlet> <servlet-name> |
|
From: David F. <dwf...@us...> - 2006-09-13 04:22:04
|
Update of /cvsroot/openmed/OpenEMed/dist/servers/coas/ojb/config In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10048/dist/servers/coas/ojb/config Modified Files: mysql_coas.sql Log Message: Corrected Value type for OjbNumeric_ table Index: mysql_coas.sql =================================================================== RCS file: /cvsroot/openmed/OpenEMed/dist/servers/coas/ojb/config/mysql_coas.sql,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mysql_coas.sql 8 Sep 2003 15:50:27 -0000 1.9 --- mysql_coas.sql 13 Sep 2006 04:22:01 -0000 1.10 *************** *** 81,85 **** valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(255), ! aValue NUMERIC ); --- 81,85 ---- valueId NUMERIC NOT NULL PRIMARY KEY, units VARCHAR(255), ! aValue FLOAT ); |
|
From: David F. <dwf...@us...> - 2006-09-13 03:47:44
|
Update of /cvsroot/openmed/OpenEMed/src/servers/persistent/gov/lanl/COAS In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29063/src/servers/persistent/gov/lanl/COAS Modified Files: ObservationMgrImpl.java Log Message: Corrected syntax of constructor for Xml2DomDoc Index: ObservationMgrImpl.java =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/servers/persistent/gov/lanl/COAS/ObservationMgrImpl.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ObservationMgrImpl.java 19 Oct 2005 16:44:00 -0000 1.23 --- ObservationMgrImpl.java 13 Sep 2006 03:47:42 -0000 1.24 *************** *** 45,48 **** --- 45,49 ---- import java.util.Hashtable; import java.util.Iterator; + import java.io.FileInputStream; /** *************** *** 156,160 **** // create a DomTree out of the xml file ! Xml2DomDoc x2dd = new Xml2DomDoc(loadFile); // create observation data from the DomTree --- 157,162 ---- // create a DomTree out of the xml file ! ! Xml2DomDoc x2dd = new Xml2DomDoc(new FileInputStream(loadFile)); // create observation data from the DomTree |
|
From: David F. <dwf...@us...> - 2006-09-12 04:00:18
|
Update of /cvsroot/openmed/OpenEMed/src/clients/gov/lanl/Web/jfreechart In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4753/src/clients/gov/lanl/Web/jfreechart Modified Files: GenericChart.java Log Message: Updated to jfreechart 1.0.2 Index: GenericChart.java =================================================================== RCS file: /cvsroot/openmed/OpenEMed/src/clients/gov/lanl/Web/jfreechart/GenericChart.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GenericChart.java 28 Mar 2006 01:21:07 -0000 1.1 --- GenericChart.java 12 Sep 2006 04:00:16 -0000 1.2 *************** *** 28,33 **** import org.jfree.chart.axis.TickUnitSource; import org.jfree.chart.JFreeChart; - import org.jfree.chart.Legend; import org.jfree.chart.ChartUtilities; import org.jfree.chart.renderer.xy.XYItemRenderer; import org.jfree.chart.renderer.xy.StandardXYItemRenderer; --- 28,33 ---- import org.jfree.chart.axis.TickUnitSource; import org.jfree.chart.JFreeChart; import org.jfree.chart.ChartUtilities; + import org.jfree.chart.title.LegendTitle; import org.jfree.chart.renderer.xy.XYItemRenderer; import org.jfree.chart.renderer.xy.StandardXYItemRenderer; *************** *** 361,366 **** chart, title == null || title.length() == 0); ! Legend legend = Legend.createInstance(finalChart); ! finalChart.setLegend(legend); ByteArrayOutputStream baos = new ByteArrayOutputStream(); --- 361,366 ---- chart, title == null || title.length() == 0); ! LegendTitle legend = finalChart.getLegend(); ! finalChart.addLegend(legend); ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
|
From: David F. <dwf...@us...> - 2006-09-12 03:59:25
|
Update of /cvsroot/openmed/OpenEMed/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4337/lib Removed Files: jcommon-0.9.7.jar jfreechart-0.9.21.jar Log Message: updated jfreechart to 1.0.2 --- jfreechart-0.9.21.jar DELETED --- --- jcommon-0.9.7.jar DELETED --- |
|
From: David F. <dwf...@us...> - 2006-09-12 03:42:33
|
Update of /cvsroot/openmed/OpenEMed/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30199/lib Added Files: jcommon-1.0.5.jar jfreechart-1.0.2.jar Log Message: upgraded to jfreechart 1.0.2 --- NEW FILE: jfreechart-1.0.2.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jcommon-1.0.5.jar --- (This appears to be a binary file; contents omitted.) |
