[dcm4che-commits] SF.net SVN: dcm4che:[15643] dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src

[<gun...@us...>]

Revision: 15643
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15643&view=rev
Author:   gunterze
Date:     2011-07-01 13:56:03 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
[#DCMEE-1716] Audit created time of PrivateInstance entities in priv_instance.created_time

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/db2/sql/create.db2sql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/firebird/sql/create.fsql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/hsql/data/hypersonic/pacsdb.script
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/hsql/sql/create.hsql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mssql/sql/create.mssql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/create-index.mysql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/create.mysql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/drop-index.mysql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/oracle/sql/create.ora
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/psql/sql/create.psql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PrivateInstanceBean.java

Added Paths:
-----------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/db2/sql/update-2.17.db2sql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/firebird/sql/update-2.17.fsql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mssql/sql/update-2.17.mssql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/update-2.17.mysql
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/oracle/sql/update-2.17.ora
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/psql/sql/update-2.17.psql

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/db2/sql/create.db2sql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/db2/sql/create.db2sql	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/db2/sql/create.db2sql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -829,12 +829,14 @@
     series_fk       BIGINT,
     priv_type       INTEGER NOT NULL,
     sop_iuid        VARCHAR(254) NOT NULL,
+    created_time    TIMESTAMP,
     inst_attrs      BLOB(262144),
 FOREIGN KEY (series_fk) REFERENCES priv_series(pk)
 );
 CREATE INDEX priv_series_fk ON priv_instance(series_fk);
 CREATE INDEX priv_inst_type ON priv_instance(priv_type);
 CREATE INDEX priv_sop_iuid ON priv_instance(sop_iuid);
+CREATE INDEX priv_inst_created ON priv_instance(created_time);
 
 CREATE TABLE priv_file (
     pk              BIGINT GENERATED BY DEFAULT AS IDENTITY CONSTRAINT priv_file_pk PRIMARY KEY,

Added: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/db2/sql/update-2.17.db2sql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/db2/sql/update-2.17.db2sql	                        (rev 0)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/db2/sql/update-2.17.db2sql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -0,0 +1,5 @@
+-- Update DB from dcm4chee-2.16.x to dcm4chee-2.17.x
+
+ALTER TABLE priv_instance ADD created_time TIMESTAMP;
+UPDATE priv_instance SET created_time = CURRENT_TIMESTAMP;
+CREATE INDEX priv_inst_created ON priv_instance(created_time);

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/firebird/sql/create.fsql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/firebird/sql/create.fsql	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/firebird/sql/create.fsql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -858,12 +858,14 @@
     series_fk       NUMERIC(18,0),
     priv_type       INTEGER NOT NULL,
     sop_iuid        VARCHAR(255) NOT NULL,
+    created_time    TIMESTAMP,
     inst_attrs      BLOB,
 FOREIGN KEY (series_fk) REFERENCES priv_series(pk)
 );
 CREATE INDEX priv_series_fk ON priv_instance(series_fk);
 CREATE INDEX priv_inst_type ON priv_instance(priv_type);
 CREATE INDEX priv_sop_iuid ON priv_instance(sop_iuid);
+CREATE INDEX priv_inst_created ON priv_instance(created_time);
 
 CREATE SEQUENCE priv_file_pk_seq;
 CREATE TABLE priv_file (

Added: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/firebird/sql/update-2.17.fsql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/firebird/sql/update-2.17.fsql	                        (rev 0)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/firebird/sql/update-2.17.fsql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -0,0 +1,5 @@
+-- Update DB from dcm4chee-2.16.x to dcm4chee-2.17.x
+
+ALTER TABLE priv_instance ADD created_time TIMESTAMP;
+UPDATE priv_instance SET created_time = CURRENT_TIMESTAMP;
+CREATE INDEX priv_inst_created ON priv_instance(created_time);

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/hsql/data/hypersonic/pacsdb.script
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/hsql/data/hypersonic/pacsdb.script	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/hsql/data/hypersonic/pacsdb.script	2011-07-01 13:56:03 UTC (rev 15643)
@@ -294,10 +294,11 @@
 CREATE INDEX PRIV_SERIES_TYPE ON PRIV_SERIES(PRIV_TYPE)
 CREATE INDEX PRIV_SERIES_IUID ON PRIV_SERIES(SERIES_IUID)
 CREATE INDEX PRIV_SER_SRC_AET ON PRIV_SERIES(SRC_AET)
-CREATE MEMORY TABLE PRIV_INSTANCE(PK BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,SERIES_FK BIGINT,PRIV_TYPE INTEGER NOT NULL,SOP_IUID VARCHAR(256) NOT NULL,INST_ATTRS VARBINARY,CONSTRAINT SYS_FK_331 FOREIGN KEY(SERIES_FK) REFERENCES PRIV_SERIES(PK))
+CREATE MEMORY TABLE PRIV_INSTANCE(PK BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,SERIES_FK BIGINT,PRIV_TYPE INTEGER NOT NULL,SOP_IUID VARCHAR(256) NOT NULL,CREATED_TIME TIMESTAMP,INST_ATTRS VARBINARY,CONSTRAINT SYS_FK_331 FOREIGN KEY(SERIES_FK) REFERENCES PRIV_SERIES(PK))
 CREATE INDEX PRIV_SERIES_FK ON PRIV_INSTANCE(SERIES_FK)
 CREATE INDEX PRIV_INST_TYPE ON PRIV_INSTANCE(PRIV_TYPE)
 CREATE INDEX PRIV_SOP_IUID ON PRIV_INSTANCE(SOP_IUID)
+CREATE INDEX PRIV_INST_CREATED ON PRIV_INSTANCE(CREATED_TIME)
 CREATE MEMORY TABLE PRIV_FILE(PK BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,INSTANCE_FK BIGINT,FILESYSTEM_FK BIGINT,FILEPATH VARCHAR(256) NOT NULL,FILE_TSUID VARCHAR(256) NOT NULL,FILE_MD5 VARCHAR(256),FILE_SIZE BIGINT,FILE_STATUS INTEGER,CONSTRAINT SYS_FK_336 FOREIGN KEY(INSTANCE_FK) REFERENCES PRIV_INSTANCE(PK),CONSTRAINT SYS_FK_337 FOREIGN KEY(FILESYSTEM_FK) REFERENCES FILESYSTEM(PK))
 CREATE INDEX PRIV_INSTANCE_FK ON PRIV_FILE(INSTANCE_FK)
 CREATE INDEX PRIV_FS_FK ON PRIV_FILE(FILESYSTEM_FK)

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/hsql/sql/create.hsql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/hsql/sql/create.hsql	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/hsql/sql/create.hsql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -823,12 +823,14 @@
     series_fk       BIGINT,
     priv_type       INTEGER NOT NULL,
     sop_iuid        VARCHAR(256) NOT NULL,
+    created_time    TIMESTAMP,
     inst_attrs      VARBINARY,
 FOREIGN KEY (series_fk) REFERENCES priv_series(pk)
 );
 CREATE INDEX priv_series_fk ON priv_instance(series_fk);
 CREATE INDEX priv_inst_type ON priv_instance(priv_type);
 CREATE INDEX priv_sop_iuid ON priv_instance(sop_iuid);
+CREATE INDEX priv_inst_created ON priv_instance(created_time);
 
 CREATE TABLE priv_file (
     pk              BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mssql/sql/create.mssql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mssql/sql/create.mssql	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mssql/sql/create.mssql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -827,12 +827,14 @@
     series_fk       NUMERIC(19,0) NULL,
     priv_type       INTEGER NOT NULL,
     sop_iuid        VARCHAR(255) NOT NULL,
+    created_time    DATETIME NULL,
     inst_attrs      IMAGE NULL,
 FOREIGN KEY (series_fk) REFERENCES priv_series(pk)
 );
 CREATE INDEX priv_series_fk ON priv_instance(series_fk);
 CREATE INDEX priv_inst_type ON priv_instance(priv_type);
 CREATE INDEX priv_sop_iuid ON priv_instance(sop_iuid);
+CREATE INDEX priv_inst_created ON priv_instance(created_time);
 
 CREATE TABLE priv_file (
     pk              NUMERIC(19,0) IDENTITY(1,1) NOT NULL CONSTRAINT priv_file_pk PRIMARY KEY,

Added: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mssql/sql/update-2.17.mssql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mssql/sql/update-2.17.mssql	                        (rev 0)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mssql/sql/update-2.17.mssql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -0,0 +1,5 @@
+-- Update DB from dcm4chee-2.16.x to dcm4chee-2.17.x
+
+ALTER TABLE priv_instance ADD created_time DATETIME NULL;
+UPDATE priv_instance SET created_time = CURRENT_TIMESTAMP;
+CREATE INDEX priv_inst_created ON priv_instance(created_time);

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/create-index.mysql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/create-index.mysql	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/create-index.mysql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -388,6 +388,7 @@
     ADD CONSTRAINT priv_series_fk FOREIGN KEY (series_fk) REFERENCES priv_series(pk);
 CREATE INDEX priv_inst_type ON priv_instance(priv_type);
 CREATE INDEX priv_sop_iuid ON priv_instance(sop_iuid(64));
+CREATE INDEX priv_inst_created ON priv_instance(created_time);
 ALTER TABLE priv_file
     ADD INDEX priv_instance_fk (instance_fk),
     ADD CONSTRAINT priv_instance_fk FOREIGN KEY (instance_fk) REFERENCES priv_instance(pk);

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/create.mysql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/create.mysql	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/create.mysql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -893,6 +893,7 @@
     series_fk         BIGINT,
     priv_type         INTEGER NOT NULL,
     sop_iuid          VARCHAR(250) BINARY NOT NULL,
+    created_time      DATETIME,
     inst_attrs        LONGBLOB
 ) ENGINE=INNODB;
 ALTER TABLE priv_instance
@@ -900,6 +901,7 @@
     ADD CONSTRAINT priv_series_fk FOREIGN KEY (series_fk) REFERENCES priv_series(pk);
 CREATE INDEX priv_inst_type ON priv_instance(priv_type);
 CREATE INDEX priv_sop_iuid ON priv_instance(sop_iuid(64));
+CREATE INDEX priv_inst_created ON priv_instance(created_time);
 
 CREATE TABLE priv_file (
     pk                BIGINT AUTO_INCREMENT NOT NULL PRIMARY KEY,

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/drop-index.mysql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/drop-index.mysql	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/drop-index.mysql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -386,6 +386,7 @@
    DROP INDEX priv_series_fk;
 ALTER TABLE priv_instance DROP INDEX priv_inst_type;
 ALTER TABLE priv_instance DROP INDEX priv_sop_iuid;
+ALTER TABLE priv_instance DROP INDEX priv_inst_created;
 ALTER TABLE priv_file
    DROP FOREIGN KEY priv_instance_fk,
    DROP INDEX priv_instance_fk;

Added: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/update-2.17.mysql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/update-2.17.mysql	                        (rev 0)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/mysql/sql/update-2.17.mysql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -0,0 +1,5 @@
+-- Update DB from dcm4chee-2.16.x to dcm4chee-2.17.x
+
+ALTER TABLE priv_instance ADD created_time DATETIME;
+UPDATE priv_instance SET created_time = CURRENT_TIMESTAMP;
+CREATE INDEX priv_inst_created ON priv_instance(created_time);

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/oracle/sql/create.ora
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/oracle/sql/create.ora	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/oracle/sql/create.ora	2011-07-01 13:56:03 UTC (rev 15643)
@@ -858,12 +858,14 @@
     series_fk         NUMBER(38,0),
     priv_type         NUMBER(38,0) NOT NULL,
     sop_iuid          VARCHAR2(255) NOT NULL,
+    created_time      TIMESTAMP,
     inst_attrs        BLOB,
 FOREIGN KEY (series_fk) REFERENCES priv_series(pk)
 );
 CREATE INDEX priv_series_fk ON priv_instance(series_fk);
 CREATE INDEX priv_inst_type ON priv_instance(priv_type);
 CREATE INDEX priv_sop_iuid ON priv_instance(sop_iuid);
+CREATE INDEX priv_inst_created ON priv_instance(created_time);
 
 CREATE SEQUENCE priv_file_pk_seq;
 CREATE TABLE priv_file (

Added: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/oracle/sql/update-2.17.ora
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/oracle/sql/update-2.17.ora	                        (rev 0)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/oracle/sql/update-2.17.ora	2011-07-01 13:56:03 UTC (rev 15643)
@@ -0,0 +1,5 @@
+-- Update DB from dcm4chee-2.16.x to dcm4chee-2.17.x
+
+ALTER TABLE priv_instance ADD created_time TIMESTAMP;
+UPDATE priv_instance SET created_time = CURRENT_TIMESTAMP;
+CREATE INDEX priv_inst_created ON priv_instance(created_time);

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/psql/sql/create.psql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/psql/sql/create.psql	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/psql/sql/create.psql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -821,12 +821,14 @@
     series_fk         INT8,
     priv_type         INTEGER NOT NULL,
     sop_iuid          TEXT NOT NULL,
+    created_time      TIMESTAMP,
     inst_attrs        BYTEA,
 FOREIGN KEY (series_fk) REFERENCES priv_series(pk)
 );
 CREATE INDEX priv_series_fk ON priv_instance(series_fk);
 CREATE INDEX priv_inst_type ON priv_instance(priv_type);
 CREATE INDEX priv_sop_iuid ON priv_instance(sop_iuid);
+CREATE INDEX priv_inst_created ON priv_instance(created_time);
 
 CREATE TABLE priv_file (
     pk                SERIAL8 NOT NULL CONSTRAINT priv_file_pk PRIMARY KEY,

Added: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/psql/sql/update-2.17.psql
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/psql/sql/update-2.17.psql	                        (rev 0)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/etc/psql/sql/update-2.17.psql	2011-07-01 13:56:03 UTC (rev 15643)
@@ -0,0 +1,5 @@
+-- Update DB from dcm4chee-2.16.x to dcm4chee-2.17.x
+
+ALTER TABLE priv_instance ADD created_time TIMESTAMP;
+UPDATE priv_instance SET created_time = CURRENT_TIMESTAMP;
+CREATE INDEX priv_inst_created ON priv_instance(created_time);

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PrivateInstanceBean.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PrivateInstanceBean.java	2011-07-01 06:46:14 UTC (rev 15642)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PrivateInstanceBean.java	2011-07-01 13:56:03 UTC (rev 15643)
@@ -61,6 +61,7 @@
  * @ejb.transaction type="Required"
  * @ejb.persistence table-name="priv_instance"
  * @jboss.entity-command name="hsqldb-fetch-key"
+ * @jboss.audit-created-time field-name="createdTime"
  * 
  * @ejb.finder signature="java.util.Collection findByPrivateType(int privateType)"
  *             query="SELECT OBJECT(a) FROM PrivateInstance AS a WHERE a.privateType = ?1"
@@ -101,6 +102,13 @@
 
     /**
      * @ejb.interface-method
+     * @ejb.persistence column-name="created_time"
+     */
+    public abstract java.sql.Timestamp getCreatedTime();
+    public abstract void setCreatedTime(java.sql.Timestamp time);
+
+    /**
+     * @ejb.interface-method
      * @ejb.persistence column-name="priv_type"
      */
     public abstract int getPrivateType();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.