June 2010 - exo-jcr-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-06-08 04:43:06 -0400 (Tue, 08 Jun 2010) New Revision: 2496 Added: kernel/branches/2.2.x/ Log: EXOJCR-751 branch for Foundation Kernel of JCR 1.12 maintenance Copied: kernel/branches/2.2.x (from rev 2495, kernel/trunk)

13 years, 12 months

1
0
0 / 0

exo-jcr SVN: r2495 - jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-06-08 02:39:06 -0400 (Tue, 08 Jun 2010) New Revision: 2495 Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql Log: EXOJCR-606: revert ID column removal from SQL scripts of JDBC data container Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -19,11 +19,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_MVALUE( + ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(2G) NOT LOGGED COMPACT, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROP FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -19,11 +19,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_P ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_MVALUE( + ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(2G) NOT LOGGED COMPACT, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROP FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_P ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -19,11 +19,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_MVALUE( + ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(56M), ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -1,30 +1,29 @@ CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) + VERSION VARCHAR(96) NOT NULL, + CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) ); CREATE TABLE JCR_MITEM( - ID VARCHAR(96) NOT NULL, - PARENT_ID VARCHAR(96) NOT NULL, - NAME VARCHAR(512) NOT NULL, - VERSION INTEGER NOT NULL, - I_CLASS INTEGER NOT NULL, - I_INDEX INTEGER NOT NULL, - N_ORDER_NUM INTEGER, - P_TYPE INTEGER, - P_MULTIVALUED BOOLEAN, - CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID), - CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID) + ID VARCHAR(96) NOT NULL, + PARENT_ID VARCHAR(96) NOT NULL, + NAME VARCHAR(512) NOT NULL, + VERSION INTEGER NOT NULL, + I_CLASS INTEGER NOT NULL, + I_INDEX INTEGER NOT NULL, + N_ORDER_NUM INTEGER, + P_TYPE INTEGER, + P_MULTIVALUED BOOLEAN, + CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID), + CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_MVALUE( - DATA VARBINARY(65535), - ORDER_NUM INTEGER NOT NULL, - PROPERTY_ID VARCHAR(96) NOT NULL, - STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), - CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) + DATA VARBINARY(65535), + ORDER_NUM INTEGER NOT NULL, + PROPERTY_ID VARCHAR(96) NOT NULL, + STORAGE_DESC VARCHAR(512), + CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); CREATE TABLE JCR_MREF( Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -18,12 +18,14 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); +CREATE SEQUENCE JCR_MVALUE_SEQ; CREATE TABLE JCR_MVALUE( + ID BIGINT NOT NULL WITH DEFAULT NEXT VALUE FOR JCR_MVALUE_SEQ, DATA LONG BYTE, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -19,11 +19,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_MVALUE( + ID BIGINT IDENTITY(1,1) NOT NULL, DATA VARBINARY(MAX), ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -20,11 +20,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_MITEM_PARENT_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM, ID); CREATE TABLE JCR_MVALUE( + ID SERIAL NOT NULL, DATA LONGBLOB, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(56) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -20,11 +20,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_MITEM_PARENT_N_ORDER_NUM ON JCR_MITEM(I_CLASS, PARENT_ID, N_ORDER_NUM, ID); CREATE TABLE JCR_MVALUE( + ID SERIAL NOT NULL, DATA LONGBLOB, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -27,14 +27,26 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC) / CREATE TABLE JCR_MVALUE( + ID INTEGER NOT NULL, DATA BLOB, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ) / +CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM) +/ +CREATE sequence JCR_MVALUE_SEQ +/ +CREATE OR REPLACE trigger BI_JCR_MVALUE + before insert on JCR_MVALUE + for each row +begin + SELECT JCR_MVALUE_SEQ.nextval INTO :NEW.ID FROM dual; +end; +/ CREATE TABLE JCR_MREF( NODE_ID VARCHAR(96) NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -27,14 +27,26 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC) / CREATE TABLE JCR_MVALUE( + ID INTEGER NOT NULL, DATA BLOB, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ) / +CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM) +/ +CREATE sequence JCR_MVALUE_SEQ +/ +CREATE OR REPLACE trigger BI_JCR_MVALUE + before insert on JCR_MVALUE + for each row +begin + SELECT JCR_MVALUE_SEQ.nextval INTO :NEW.ID FROM dual; +end; +/ CREATE TABLE JCR_MREF( NODE_ID VARCHAR(96) NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -19,11 +19,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION); CREATE TABLE JCR_MVALUE( + ID BIGSERIAL NOT NULL, DATA BYTEA, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -19,11 +19,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_MVALUE( + ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA VARBINARY(65535), ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -19,11 +19,12 @@ CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_MVALUE( + ID BIGINT IDENTITY NOT NULL, DATA IMAGE NULL, ORDER_NUM INT NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512) NULL, - CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -21,11 +21,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID); CREATE TABLE JCR_SVALUE( + ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(2G) NOT LOGGED COMPACT, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROP FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -21,11 +21,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PFK ON JCR_SITEM(PARENT_ID); CREATE TABLE JCR_SVALUE( + ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(2G) NOT LOGGED COMPACT, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROP FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_P ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -20,11 +20,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_SVALUE( + ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA BLOB(56M), ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -1,31 +1,30 @@ CREATE TABLE JCR_SCONTAINER( VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) + CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) ); CREATE TABLE JCR_SITEM( - ID VARCHAR(96) NOT NULL, - PARENT_ID VARCHAR(96) NOT NULL, - NAME VARCHAR(512) NOT NULL, - VERSION INTEGER NOT NULL, - CONTAINER_NAME VARCHAR(96) NOT NULL, - I_CLASS INTEGER NOT NULL, - I_INDEX INTEGER NOT NULL, - N_ORDER_NUM INTEGER, - P_TYPE INTEGER, - P_MULTIVALUED INTEGER, - CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID), - CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID) + ID VARCHAR(96) NOT NULL, + PARENT_ID VARCHAR(96) NOT NULL, + NAME VARCHAR(512) NOT NULL, + VERSION INTEGER NOT NULL, + CONTAINER_NAME VARCHAR(96) NOT NULL, + I_CLASS INTEGER NOT NULL, + I_INDEX INTEGER NOT NULL, + N_ORDER_NUM INTEGER, + P_TYPE INTEGER, + P_MULTIVALUED INTEGER, + CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID), + CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_SVALUE( - DATA VARBINARY(65535), - ORDER_NUM INTEGER NOT NULL, - PROPERTY_ID VARCHAR(96) NOT NULL, - STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), - CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) + DATA VARBINARY(65535), + ORDER_NUM INTEGER NOT NULL, + PROPERTY_ID VARCHAR(96) NOT NULL, + STORAGE_DESC VARCHAR(512), + CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); CREATE TABLE JCR_SREF( Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -20,12 +20,14 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION); CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID); +CREATE SEQUENCE JCR_SVALUE_SEQ; CREATE TABLE JCR_SVALUE( + ID BIGINT NOT NULL WITH DEFAULT NEXT VALUE FOR JCR_SVALUE_SEQ, DATA LONG BYTE, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -20,11 +20,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_SVALUE( + ID BIGINT IDENTITY(1,1) NOT NULL, DATA VARBINARY(MAX), ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -21,11 +21,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PARENT_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM, ID); CREATE TABLE JCR_SVALUE( + ID SERIAL NOT NULL, DATA LONGBLOB, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(56) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -21,11 +21,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE INDEX JCR_IDX_SITEM_PARENT_N_ORDER_NUM ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, N_ORDER_NUM, ID); CREATE TABLE JCR_SVALUE( + ID SERIAL NOT NULL, DATA LONGBLOB, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -28,14 +28,26 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC) / CREATE TABLE JCR_SVALUE( + ID INTEGER NOT NULL, DATA BLOB, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ) / +CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM) +/ +CREATE sequence JCR_SVALUE_SEQ +/ +CREATE OR REPLACE trigger BI_JCR_SVALUE + before insert on JCR_SVALUE + for each row +begin + SELECT JCR_SVALUE_SEQ.nextval INTO :NEW.ID FROM dual; +end; +/ CREATE TABLE JCR_SREF( NODE_ID VARCHAR(96) NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -28,14 +28,26 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC) / CREATE TABLE JCR_SVALUE( + ID INTEGER NOT NULL, DATA BLOB, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ) / +CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM) +/ +CREATE sequence JCR_SVALUE_SEQ +/ +CREATE OR REPLACE trigger BI_JCR_SVALUE + before insert on JCR_SVALUE + for each row +begin + SELECT JCR_SVALUE_SEQ.nextval INTO :NEW.ID FROM dual; +end; +/ CREATE TABLE JCR_SREF( NODE_ID VARCHAR(96) NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -21,11 +21,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION); CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID); CREATE TABLE JCR_SVALUE( + ID BIGSERIAL NOT NULL, DATA BYTEA, ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -20,11 +20,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_SVALUE( + ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL, DATA VARBINARY(65535), ORDER_NUM INTEGER NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512), - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM); Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql 2010-06-04 14:51:34 UTC (rev 2494) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql 2010-06-08 06:39:06 UTC (rev 2495) @@ -20,11 +20,12 @@ CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC); CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC); CREATE TABLE JCR_SVALUE( + ID BIGINT IDENTITY NOT NULL, DATA IMAGE NULL, ORDER_NUM INT NOT NULL, PROPERTY_ID VARCHAR(96) NOT NULL, STORAGE_DESC VARCHAR(512) NULL, - CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(PROPERTY_ID, ORDER_NUM), + CONSTRAINT JCR_PK_SVALUE PRIMARY KEY(ID), CONSTRAINT JCR_FK_SVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_SITEM(ID) ); CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);

13 years, 12 months

1
0
0 / 0

exo-jcr SVN: r2494 - core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security.

by do-not-reply＠jboss.org

Author: aparfonov Date: 2010-06-04 10:51:34 -0400 (Fri, 04 Jun 2010) New Revision: 2494 Modified: core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationState.java core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/Identity.java Log: EXOJCR-770 : need 'modifyIdentity' permission to be able modify memeberships or roles Modified: core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationState.java =================================================================== --- core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationState.java 2010-06-04 13:47:36 UTC (rev 2493) +++ core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationState.java 2010-06-04 14:51:34 UTC (rev 2494) @@ -23,7 +23,7 @@ /** * Created by The eXo Platform SAS . - * + * * @author Gennady Azarenkov * @version $Id: $ */ @@ -31,6 +31,8 @@ public class ConversationState { + private static final RuntimePermission SET_CURRENT_STATE_PERMISSION = new RuntimePermission("setCurrentState"); + /** * "subject". */ @@ -67,11 +69,17 @@ /** * Preset current ConversationState. - * + * * @param state ConversationState */ public static void setCurrent(ConversationState state) { + SecurityManager security = System.getSecurityManager(); + if (security != null) + { + security.checkPermission(SET_CURRENT_STATE_PERMISSION); + } + current.set(state); } @@ -85,12 +93,13 @@ /** * sets attribute. - * + * * @param key * @param value */ public void setAttribute(String name, Object value) { + // TODO : need check is it allowed to set any attributes this.attributes.put(name, value); } @@ -113,7 +122,7 @@ /** * removes attribute. - * + * * @param key */ public void removeAttribute(String name) Modified: core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/Identity.java =================================================================== --- core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/Identity.java 2010-06-04 13:47:36 UTC (rev 2493) +++ core/branches/2.3-SEC/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/Identity.java 2010-06-04 14:51:34 UTC (rev 2494) @@ -20,15 +20,17 @@ import java.util.Collection; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import javax.security.auth.Subject; /** - * Created by The eXo Platform SAS . User Session encapsulates user's - * principals such as name, groups along with JAAS subject (useful in J2EE - * environment) as well as other optional attributes - * + * Created by The eXo Platform SAS . + * User Session encapsulates user's principals such as name, groups along with + * JAAS subject (useful in J2EE environment) as well as other optional + * attributes + * * @author Gennady Azarenkov * @version $Id: $ */ @@ -36,6 +38,10 @@ public class Identity { + private static final RuntimePermission SET_SUBJECT_PERMISSION = new RuntimePermission("setSubject"); + + private static final RuntimePermission MODIFY_IDENTITY_PERMISSION = new RuntimePermission("modifyIdentity"); + /** * User's identifier. */ @@ -84,8 +90,8 @@ public Identity(String userId, Collection<MembershipEntry> memberships, Collection<String> roles) { this.userId = userId; - this.memberships = new HashSet<MembershipEntry>(memberships); - this.roles = roles; + this.memberships = new SecureSet<MembershipEntry>(memberships); + this.roles = new SecureSet<String>(roles); } /** @@ -118,7 +124,7 @@ /** * Check is user member of group. - * + * * @param group the group. * @return true if user has any membershipType for given group, false * otherwise. @@ -133,6 +139,7 @@ */ public Set<String> getGroups() { + // TODO : Need to protect group's set ?? Set<String> groups = new HashSet<String>(); for (MembershipEntry m : memberships) { @@ -146,7 +153,7 @@ */ public void setMemberships(Collection<MembershipEntry> memberships) { - this.memberships = new HashSet<MembershipEntry>(memberships); + this.memberships = new SecureSet<MembershipEntry>(memberships); } /** @@ -159,12 +166,12 @@ /** * Sets the roles for J2EE environment using. - * + * * @param roles the roles. */ public void setRoles(Collection<String> roles) { - this.roles = roles; + this.roles = new SecureSet<String>(roles); } /** @@ -188,12 +195,17 @@ */ public void setSubject(Subject subject) { + SecurityManager security = System.getSecurityManager(); + if (security != null) + { + security.checkPermission(SET_SUBJECT_PERMISSION); + } this.subject = subject; } /** * Check is given {@link MembershipEntry} presents in user's memberships. - * + * * @param checkMe the MembershipEntry. * @return true if presents false otherwise. */ @@ -202,4 +214,146 @@ return memberships.contains(checkMe); } + private static class SecureSet<T> implements Set<T> + { + + final Set<T> set; + + SecureSet() + { + this.set = new HashSet<T>(); + } + + SecureSet(Collection<T> set) + { + this.set = new HashSet<T>(set); + } + + public boolean add(T e) + { + checkPermission(); + return set.add(e); + } + + public boolean addAll(Collection<? extends T> elements) + { + if (elements == null) + { + throw new NullPointerException(); + } + checkPermission(); + return elements.size() > 0; + } + + public void clear() + { + checkPermission(); + set.clear(); + } + + public boolean contains(Object o) + { + return set.contains(o); + } + + public boolean containsAll(Collection<?> coll) + { + return set.containsAll(coll); + } + + public boolean equals(Object o) + { + return o == this || set.equals(o); + } + + public int hashCode() + { + return set.hashCode(); + } + + public boolean isEmpty() + { + return set.isEmpty(); + } + + public Iterator<T> iterator() + { + return new Iterator<T>() + { + Iterator<? extends T> i = set.iterator(); + + public boolean hasNext() + { + return i.hasNext(); + } + + public T next() + { + return i.next(); + } + + public void remove() + { + checkPermission(); + i.remove(); + } + }; + } + + public boolean remove(Object o) + { + checkPermission(); + return set.remove(o); + } + + public boolean removeAll(Collection<?> pds) + { + if (pds == null) + { + throw new NullPointerException(); + } + checkPermission(); + return set.removeAll(pds); + } + + public boolean retainAll(Collection<?> pds) + { + if (pds == null) + { + throw new NullPointerException(); + } + checkPermission(); + return set.retainAll(pds); + } + + public int size() + { + return set.size(); + } + + public Object[] toArray() + { + return set.toArray(); + } + + public <T> T[] toArray(T[] a) + { + return set.toArray(a); + } + + public String toString() + { + return set.toString(); + } + + protected void checkPermission() + { + SecurityManager security = System.getSecurityManager(); + if (security != null) + { + security.checkPermission(MODIFY_IDENTITY_PERMISSION); + } + } + } + }

14 years

1
0
0 / 0

exo-jcr SVN: r2493 - in jcr/branches/1.12-SEC/exo.jcr.component.core: src/main/java/org/exoplatform/services/jcr/impl/core and 3 other directories.

by do-not-reply＠jboss.org

Author: aparfonov Date: 2010-06-04 09:47:36 -0400 (Fri, 04 Jun 2010) New Revision: 2493 Added: jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/ jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/BaseSecurityTest.java jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestGetSystemSession.java jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/resources/test.policy Modified: jcr/branches/1.12-SEC/exo.jcr.component.core/pom.xml jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java Log: EXOJCR-764 : check permissions for getting system session Modified: jcr/branches/1.12-SEC/exo.jcr.component.core/pom.xml =================================================================== --- jcr/branches/1.12-SEC/exo.jcr.component.core/pom.xml 2010-06-04 12:50:45 UTC (rev 2492) +++ jcr/branches/1.12-SEC/exo.jcr.component.core/pom.xml 2010-06-04 13:47:36 UTC (rev 2493) @@ -1,744 +1,723 @@ <?xml version="1.0" encoding="UTF-8"?> - + Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at + your option) any later version. This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF + site: http://www.fsf.org. + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>jcr-parent</artifactId> - <version>1.12-SEC-SNAPSHOT</version> - </parent> - <artifactId>exo.jcr.component.core</artifactId> - <name>eXo JCR :: Component :: Core Service</name> - <description>eXo JCR Service core component</description> - <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration.xml</jcr.test.configuration.file> - </properties> - <dependencies> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.commons</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.cluster.testclient</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-spellchecker</artifactId> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-memory</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> - </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </dependency> - <dependency> - <groupId>org.jibx</groupId> - <artifactId>jibx-run</artifactId> - </dependency> - <dependency> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </dependency> - <dependency> - <groupId>jboss.jbossts</groupId> - <artifactId>jbossjts</artifactId> - </dependency> - <dependency> - <groupId>jboss.jbossts</groupId> - <artifactId>jbossts-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.ws.commons</groupId> - <artifactId>ws-commons-util</artifactId> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> -  - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-tests</artifactId> - <classifier>sources</classifier> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.8</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-603.jdbc3</version> - <scope>test</scope> - </dependency> -  -  -  -  -  -  + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-tests</artifactId> + <classifier>sources</classifier> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.8</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-603.jdbc3</version> + <scope>test</scope> + </dependency> +  +  +  +  +  +  -  -  +  -  -  -  +  -  -  +  -  -  +  -  -  +  - </dependencies> -  - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.sql</include> - <include>**/*.dtd</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>login.conf</include> - <include>**/*.xml</include> - <include>**/*.drl</include> - <include>**/*.vm</include> - <include>**/*.doc</include> - <include>**/*.xls</include> - <include>**/*.ppt</include> - <include>**/*.txt</include> - <include>**/*.tiff</include> - <include>**/*.pdf</include> - <include>**/*.dtd</include> - </includes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>generate-test-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-tests</artifactId> - <classifier>sources</classifier> - <type>jar</type> - <overWrite>false</overWrite> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.testSourceDirectory}</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${env.MAVEN_OPTS}</argLine> - <systemProperties> - <property> - <name>jcr.test.configuration.file</name> - <value>${jcr.test.configuration.file}</value> - </property> - <property> - <name>emma.coverage.out.file</name> - <value>target/emma/coverage.ec</value> - </property> -  -  + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*.xml</include> + <include>**/*.sql</include> + <include>**/*.dtd</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>login.conf</include> + <include>**/*.xml</include> + <include>**/*.drl</include> + <include>**/*.vm</include> + <include>**/*.doc</include> + <include>**/*.xls</include> + <include>**/*.ppt</include> + <include>**/*.txt</include> + <include>**/*.tiff</include> + <include>**/*.pdf</include> + <include>**/*.dtd</include> + <include>**/*.policy</include> + </includes> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>generate-test-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-tests</artifactId> + <classifier>sources</classifier> + <type>jar</type> + <overWrite>false</overWrite> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.testSourceDirectory}</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + + <argLine>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <systemProperties> + <property> + <name>jcr.test.configuration.file</name> + <value>${jcr.test.configuration.file}</value> + </property> + <property> + <name>emma.coverage.out.file</name> + <value>target/emma/coverage.ec</value> + </property> +  +  - </systemProperties> - <includes> - <include>org/exoplatform/services/jcr/api/**/Test*.java</include> - <include>org/exoplatform/services/jcr/usecases/**/Test*.java</include> - <include>org/exoplatform/services/jcr/usecases/**/*Test.java</include> - <include>org/exoplatform/services/jcr/impl/**/Test*.java</include> - </includes> - <excludes> - <exclude>org/exoplatform/services/jcr/**/TestQueryUsecases.java</exclude> - <exclude>org/exoplatform/services/jcr/**/TestImport.java</exclude> - <exclude>org/exoplatform/services/jcr/**/TestRollbackBigFiles.java</exclude> - <exclude>org/exoplatform/services/jcr/**/TestErrorMultithreading.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/TestAll.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/**/TestSameNameItems.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/**/TestVersionRestore.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/**/TestSameNameItems.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/**/TestVersionRestore.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestWorkspaceManagement.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestRepositoryManagement.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestSaveConfiguration.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/ValueStoragePluginTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestWorkspaceRestore.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestSessionCleaner.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/Base*.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationStream.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationVersionRestore.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/**/RemoveSameNameSiblingTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/**/TestQueryWithNumberAndSpace.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/BaseUsecasesTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/**/ExportWorkspaceSystemViewTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestSessionDataManager.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestLinkedWorkspaceStorageCacheMetrics.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestCleanableFileStreamValueData.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.jibx</groupId> - <artifactId>maven-jibx-plugin</artifactId> - <configuration> - <directory>src/main/resources</directory> - <includes> - <includes>binding*.xml</includes> - </includes> - </configuration> - <executions> - <execution> - <goals> - <goal>bind</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>delete-sources</id> - <phase>process-sources</phase> - <configuration> - <tasks> - <echo>Remove files that have been customized</echo> - <delete> - <fileset dir="${project.build.directory}/generated-sources/javacc/org/exoplatform/services/jcr/impl/core/query"> - <include name="sql/ASTLiteral.java" /> - <include name="sql/ASTContainsExpression.java" /> - <include name="sql/ASTPredicate.java" /> - <include name="sql/ASTIdentifier.java" /> - <include name="xpath/SimpleNode.java" /> - </fileset> - </delete> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - <version>1.5.3-1</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <executions> - <execution> - <id>fulltext</id> - <configuration> - <sourceDirectory>${basedir}/src/main/javacc/fulltext</sourceDirectory> - </configuration> - <goals> - <goal>jjtree-javacc</goal> - </goals> - </execution> - <execution> - <id>sql</id> - <configuration> - <sourceDirectory>${basedir}/src/main/javacc/sql</sourceDirectory> - </configuration> - <goals> - <goal>jjtree-javacc</goal> - </goals> - </execution> - <execution> - <id>xpath</id> - <configuration> - <sourceDirectory>${basedir}/src/main/javacc/xpath</sourceDirectory> - </configuration> - <goals> - <goal>jjtree-javacc</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>net.java.dev.javacc</groupId> - <artifactId>javacc</artifactId> - <version>3.2</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - <profiles> -  -  -  -  - <profile> - <id>run-tck</id> - <build> - <testResources> - <testResource> - <directory>src/TCK/java</directory> - <includes> - <include>**/org/apache/jackrabbit/test/api/nodetype/spec/*.txt</include> - </includes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <argLine>${env.MAVEN_OPTS}</argLine> - <systemProperties> - <property> - <name>jcr.test.configuration.file</name> - <value>${jcr.test.configuration.file}</value> - </property> - <property> - <name>emma.coverage.out.file</name> - <value>target/emma/coverage.ec</value> - </property> - <property> - <name>known.issues</name> - <value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty - org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty - org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreName - org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder - org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2 - org.apache.jackrabbit.test.api.nodetype.PropertyDefTest#testIsRequiredType - org.apache.jackrabbit.test.api.SetPropertyConstraintViolationExceptionTest#testBooleanProperty - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testShareable - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testSimpleVersionable - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testActivity - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testConfiguration - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion - org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value> - </property> -  -  +  +  +  + <profile> + <id>run-tck</id> + <build> + <testResources> + <testResource> + <directory>src/TCK/java</directory> + <includes> + <include>**/org/apache/jackrabbit/test/api/nodetype/spec/*.txt</include> + </includes> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> +  + <argLine>${env.MAVEN_OPTS}</argLine> + <systemProperties> + <property> + <name>jcr.test.configuration.file</name> + <value>${jcr.test.configuration.file}</value> + </property> + <property> + <name>emma.coverage.out.file</name> + <value>target/emma/coverage.ec</value> + </property> + <property> + <name>known.issues</name> + <value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty + org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty + org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreName + org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder + org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2 + org.apache.jackrabbit.test.api.nodetype.PropertyDefTest#testIsRequiredType + org.apache.jackrabbit.test.api.SetPropertyConstraintViolationExceptionTest#testBooleanProperty + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testShareable + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testSimpleVersionable + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testActivity + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testConfiguration + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion + org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value> + </property> +  +  - </systemProperties> - <includes> - <include>org/apache/jackrabbit/test/api/*Test.java</include> - <include>org/apache/jackrabbit/test/api/observation/*Test.java</include> - <include>org/apache/jackrabbit/test/api/lock/*Test.java</include> - <include>org/apache/jackrabbit/test/api/nodetype/*Test.java</include> - <include>org/apache/jackrabbit/test/api/query/*Test.java</include> - <include>org/apache/jackrabbit/test/api/version/*Test.java</include> - </includes> - <excludes> - <exclude>org/apache/jackrabbit/test/api/TestAll.java</exclude> - <exclude>org/apache/jackrabbit/test/api/**/Abstract*.java</exclude> - <exclude>org/apache/jackrabbit/test/api/**/FrozenNodeTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> -  -  -  -  - <profile> - <id>run-all</id> - <build> - <testResources> - <testResource> - <directory>src/TCK/java</directory> - <includes> - <include>**/org/apache/jackrabbit/test/api/nodetype/spec/*.txt</include> - </includes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <argLine>${env.MAVEN_OPTS}</argLine> - <systemProperties> - <property> - <name>jcr.test.configuration.file</name> - <value>${jcr.test.configuration.file}</value> - </property> - <property> - <name>emma.coverage.out.file</name> - <value>target/emma/coverage.ec</value> - </property> - <property> - <name>known.issues</name> - <value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty - org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty - org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreName - org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder - org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2 - org.apache.jackrabbit.test.api.nodetype.PropertyDefTest#testIsRequiredType - org.apache.jackrabbit.test.api.SetPropertyConstraintViolationExceptionTest#testBooleanProperty - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testShareable - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testSimpleVersionable - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testActivity - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testConfiguration - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable - org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion - org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value> - </property> -  -  +  +  +  + <profile> + <id>run-all</id> + <build> + <testResources> + <testResource> + <directory>src/TCK/java</directory> + <includes> + <include>**/org/apache/jackrabbit/test/api/nodetype/spec/*.txt</include> + </includes> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> +  + <argLine>${env.MAVEN_OPTS}</argLine> + <systemProperties> + <property> + <name>jcr.test.configuration.file</name> + <value>${jcr.test.configuration.file}</value> + </property> + <property> + <name>emma.coverage.out.file</name> + <value>target/emma/coverage.ec</value> + </property> + <property> + <name>known.issues</name> + <value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty + org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty + org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreName + org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder + org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2 + org.apache.jackrabbit.test.api.nodetype.PropertyDefTest#testIsRequiredType + org.apache.jackrabbit.test.api.SetPropertyConstraintViolationExceptionTest#testBooleanProperty + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testShareable + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testSimpleVersionable + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testActivity + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testConfiguration + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion + org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value> + </property> +  +  - </systemProperties> - <includes> -  - <include>org/exoplatform/services/jcr/api/**/Test*.java</include> - <include>org/exoplatform/services/jcr/usecases/**/Test*.java</include> - <include>org/exoplatform/services/jcr/usecases/**/*Test.java</include> - <include>org/exoplatform/services/jcr/impl/**/Test*.java</include> -  - <include>org/apache/jackrabbit/test/api/*Test.java</include> - <include>org/apache/jackrabbit/test/api/observation/*Test.java</include> - <include>org/apache/jackrabbit/test/api/lock/*Test.java</include> - <include>org/apache/jackrabbit/test/api/nodetype/*Test.java</include> - <include>org/apache/jackrabbit/test/api/query/*Test.java</include> - <include>org/apache/jackrabbit/test/api/version/*Test.java</include> - </includes> - <excludes> -  - <exclude>org/exoplatform/services/jcr/**/TestQueryUsecases.java</exclude> - <exclude>org/exoplatform/services/jcr/**/TestImport.java</exclude> - <exclude>org/exoplatform/services/jcr/**/TestRollbackBigFiles.java</exclude> - <exclude>org/exoplatform/services/jcr/**/TestErrorMultithreading.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/TestAll.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/**/TestSameNameItems.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/**/TestVersionRestore.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/**/TestSameNameItems.java</exclude> - <exclude>org/exoplatform/services/jcr/**/api/**/TestVersionRestore.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestWorkspaceManagement.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestRepositoryManagement.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestSaveConfiguration.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/ValueStoragePluginTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestWorkspaceRestore.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestSessionCleaner.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/Base*.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationStream.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationVersionRestore.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/**/RemoveSameNameSiblingTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/**/TestQueryWithNumberAndSpace.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/BaseUsecasesTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/usecases/**/ExportWorkspaceSystemViewTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestSessionDataManager.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestLinkedWorkspaceStorageCacheMetrics.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestCleanableFileStreamValueData.java</exclude> - <exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude> -  - <exclude>org/apache/jackrabbit/test/api/TestAll.java</exclude> - <exclude>org/apache/jackrabbit/test/api/**/Abstract*.java</exclude> - <exclude>org/apache/jackrabbit/test/api/**/FrozenNodeTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>run-devtests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <phase>test</phase> -  - <goals> - <goal>test</goal> - </goals> - <systemProperties> - <property> - <name>jcr.test.configuration.file</name> - <value>${jcr.test.configuration.file}</value> - </property> -  -  + <include>org/exoplatform/services/jcr/api/**/Test*.java</include> + <include>org/exoplatform/services/jcr/usecases/**/Test*.java</include> + <include>org/exoplatform/services/jcr/usecases/**/*Test.java</include> + <include>org/exoplatform/services/jcr/impl/**/Test*.java</include> +  + <include>org/apache/jackrabbit/test/api/*Test.java</include> + <include>org/apache/jackrabbit/test/api/observation/*Test.java</include> + <include>org/apache/jackrabbit/test/api/lock/*Test.java</include> + <include>org/apache/jackrabbit/test/api/nodetype/*Test.java</include> + <include>org/apache/jackrabbit/test/api/query/*Test.java</include> + <include>org/apache/jackrabbit/test/api/version/*Test.java</include> + </includes> + <excludes> +  + <exclude>org/exoplatform/services/jcr/**/TestQueryUsecases.java</exclude> + <exclude>org/exoplatform/services/jcr/**/TestImport.java</exclude> + <exclude>org/exoplatform/services/jcr/**/TestRollbackBigFiles.java</exclude> + <exclude>org/exoplatform/services/jcr/**/TestErrorMultithreading.java</exclude> + <exclude>org/exoplatform/services/jcr/**/api/TestAll.java</exclude> + <exclude>org/exoplatform/services/jcr/**/api/**/TestSameNameItems.java</exclude> + <exclude>org/exoplatform/services/jcr/**/api/**/TestVersionRestore.java</exclude> + <exclude>org/exoplatform/services/jcr/**/api/**/TestSameNameItems.java</exclude> + <exclude>org/exoplatform/services/jcr/**/api/**/TestVersionRestore.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestWorkspaceManagement.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestRepositoryManagement.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestSaveConfiguration.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/ValueStoragePluginTest.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestWorkspaceRestore.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestSessionCleaner.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/Base*.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationStream.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestJCRSerializationVersionRestore.java</exclude> + <exclude>org/exoplatform/services/jcr/**/usecases/**/RemoveSameNameSiblingTest.java</exclude> + <exclude>org/exoplatform/services/jcr/**/usecases/**/TestQueryWithNumberAndSpace.java</exclude> + <exclude>org/exoplatform/services/jcr/**/usecases/BaseUsecasesTest.java</exclude> + <exclude>org/exoplatform/services/jcr/**/usecases/**/ExportWorkspaceSystemViewTest.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestSessionDataManager.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestLinkedWorkspaceStorageCacheMetrics.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/SQLBenchmarkTest.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestCleanableFileStreamValueData.java</exclude> + <exclude>org/exoplatform/services/jcr/**/impl/**/TestLockPerstistentDataManager.java</exclude> +  + <exclude>org/apache/jackrabbit/test/api/TestAll.java</exclude> + <exclude>org/apache/jackrabbit/test/api/**/Abstract*.java</exclude> + <exclude>org/apache/jackrabbit/test/api/**/FrozenNodeTest.java</exclude> +  + <exclude>org/exoplatform/services/jcr/impl/core/security/Test*.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>run-devtests</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <phase>test</phase> +  + <goals> + <goal>test</goal> + </goals> + <systemProperties> + <property> + <name>jcr.test.configuration.file</name> + <value>${jcr.test.configuration.file}</value> + </property> +  +  - </systemProperties> - <includes> - <include>**/**/reading_/Test*.java</include> - <include>**/**/writing_/Test*.java</include> - <include>**/**/TestJBossCacheWorkspaceStorageCache_.java</include> - <exclude>**/**/TestCleanableFileStreamValueData.java</exclude> - <include>**/**/TestSVNodeDataOptimization_.java</include> - <include>**/**/TestNodeReference.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </systemProperties> + <includes> + <include>**/**/reading_/Test*.java</include> + <include>**/**/writing_/Test*.java</include> + <include>**/**/TestJBossCacheWorkspaceStorageCache_.java</include> + <exclude>**/**/TestCleanableFileStreamValueData.java</exclude> + <include>**/**/TestSVNodeDataOptimization_.java</include> + <include>**/**/TestNodeReference.java</include> + </includes> + <excludes> + <exclude>org/exoplatform/services/jcr/impl/core/security/Test*.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java =================================================================== --- jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2010-06-04 12:50:45 UTC (rev 2492) +++ jcr/branches/1.12-SEC/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2010-06-04 13:47:36 UTC (rev 2493) @@ -60,13 +60,15 @@ /** * Created by The eXo Platform SAS. * Implementation of javax.jcr.Repository - * + * * @author <a href="mailto:geaz@users.sourceforge.net">Gennady Azarenkov </a> * @version $Id: RepositoryImpl.java 14487 2008-05-20 07:08:40Z gazarenkov $ */ public class RepositoryImpl implements ManageableRepository { + private static final RuntimePermission GET_SYSTEM_SESSION_PERMISSION = new RuntimePermission("getJCRSystemSession"); + /** * Repository descriptors. */ @@ -134,7 +136,7 @@ /** * RepositoryImpl constructor. - * + * * @param container Repository container * @throws RepositoryException error of initialization * @throws RepositoryConfigurationException error of configuration @@ -215,13 +217,13 @@ /** * Creation contains three steps. First * <code>configWorkspace(WorkspaceEntry wsConfig)</code> - registration a new - * configuration in RepositoryContainer and create WorkspaceContainer. Second, - * the main step, is + * configuration in RepositoryContainer and create WorkspaceContainer. + * Second, the main step, is * <code>initWorkspace(String workspaceName, String rootNodeType)</code> - * initializing workspace by name and root nodetype. Third, final step, * starting all components of workspace. Before creation workspace must be * configured - * + * * @see org.exoplatform.services.jcr.core.RepositoryImpl#configWorkspace(org.exoplatform.services.jcr.config.WorkspaceEntry * ) * @see org.exoplatform.services.jcr.core.RepositoryImpl#initWorkspace(java.lang.String,java.lang.String) @@ -327,6 +329,13 @@ */ public SessionImpl getSystemSession(String workspaceName) throws RepositoryException { + // Need privileges to get system session. + SecurityManager security = System.getSecurityManager(); + if (security != null) + { + security.checkPermission(GET_SYSTEM_SESSION_PERMISSION); + } + if (getState() == OFFLINE) LOG.warn("Repository " + getName() + " is OFFLINE."); @@ -410,7 +419,7 @@ /** * Internal Remove Workspace. - * + * * @param workspaceName workspace name * @throws RepositoryException error of remove */ @@ -498,7 +507,7 @@ /** * Internal login. - * + * * @param state ConversationState * @param workspaceName workspace name * @return SessionImpl @@ -580,7 +589,7 @@ /** * Set all repository workspaces ReadOnly status. - * + * * @param wsStatus ReadOnly workspace status */ private void setAllWorkspacesReadOnly(boolean wsStatus) Added: jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/BaseSecurityTest.java =================================================================== --- jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/BaseSecurityTest.java (rev 0) +++ jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/BaseSecurityTest.java 2010-06-04 13:47:36 UTC (rev 2493) @@ -0,0 +1,173 @@ +/** + * Copyright (C) 2010 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.services.jcr.impl.core.security; + +import org.exoplatform.services.jcr.BaseStandaloneTest; + +import java.net.URL; +import java.security.AccessControlContext; +import java.security.AccessController; +import java.security.AllPermission; +import java.security.CodeSource; +import java.security.Permission; +import java.security.PermissionCollection; +import java.security.Permissions; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.security.ProtectionDomain; +import java.util.Enumeration; + +/** + * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> + * @version $Id$ + */ +public abstract class BaseSecurityTest extends BaseStandaloneTest +{ + + public void setUp() throws Exception + { + super.setUp(); + SecurityManager security = System.getSecurityManager(); + assertNotNull("SecurityManager must be ON.", security); + } + + public String getRepositoryName() + { + return "db1"; + } + + /** + * Run privileged action with specified privileges. + */ + protected <T> T doPrivilegedAction(PrivilegedExceptionAction<T> action, ProtectionDomain[] protectionDomains) + throws Throwable + { + try + { + return AccessController.doPrivileged(action, new AccessControlContext(protectionDomains)); + } + catch (PrivilegedActionException pae) + { + throw pae.getCause(); + } + } + + /** + * Run privileged action without any privileges. + */ + protected <T> T doPrivilegedAction(PrivilegedExceptionAction<T> action) throws Throwable + { + ProtectionDomain[] protectionDomains = + new ProtectionDomain[]{new ProtectionDomain(new CodeSource(getCodeSource(), + (java.security.cert.Certificate[])null), new Permissions())}; + try + { + return AccessController.doPrivileged(action, new AccessControlContext(protectionDomains)); + } + catch (PrivilegedActionException pae) + { + throw pae.getCause(); + } + } + + /** + * Run privileged action with static permissions only. + */ + protected <T> T doPrivilegedActionStaticPermissions(PrivilegedExceptionAction<T> action) throws Throwable + { + try + { + return AccessController.doPrivileged(action); + } + catch (PrivilegedActionException pae) + { + throw pae.getCause(); + } + } + + /** + * Run privileged action with specified privileges. + */ + protected <T> T doPrivilegedAction(PrivilegedAction<T> action, ProtectionDomain[] protectionDomains) + { + return AccessController.doPrivileged(action, new AccessControlContext(protectionDomains)); + } + + /** + * Run privileged action without any privileges. + */ + protected <T> T doPrivilegedAction(PrivilegedAction<T> action) + { + ProtectionDomain[] protectionDomains = + new ProtectionDomain[]{new ProtectionDomain(new CodeSource(getCodeSource(), + (java.security.cert.Certificate[])null), new Permissions())}; + return AccessController.doPrivileged(action, new AccessControlContext(protectionDomains)); + } + + /** + * Run privileged action with static permissions only. + */ + protected <T> T doPrivilegedActionStaticPermissions(PrivilegedAction<T> action) + { + return AccessController.doPrivileged(action); + } + + /** + * Get code-source of class. + */ + protected URL getCodeSource() + { + return getClass().getProtectionDomain().getCodeSource().getLocation(); + } + + protected static final PermissionCollection ALL = new PermissionCollection() + { + + public boolean implies(Permission permission) + { + return true; + } + + public Enumeration<Permission> elements() + { + return new Enumeration<Permission>() + { + private boolean hasMore = true; + + public boolean hasMoreElements() + { + return hasMore; + } + + public Permission nextElement() + { + hasMore = false; + return new AllPermission(); + } + }; + } + + public void add(Permission permission) + { + } + }; + +} Property changes on: jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/BaseSecurityTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestGetSystemSession.java =================================================================== --- jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestGetSystemSession.java (rev 0) +++ jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestGetSystemSession.java 2010-06-04 13:47:36 UTC (rev 2493) @@ -0,0 +1,83 @@ +/** + * Copyright (C) 2010 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.services.jcr.impl.core.security; + +import java.security.AccessControlException; +import java.security.PrivilegedExceptionAction; + +/** + * @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a> + * @version $Id$ + */ +public class TestGetSystemSession extends BaseSecurityTest +{ + public void testGetSystemSessionSuccess() + { + PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>() + { + public Object run() throws Exception + { + repository.getSystemSession(); + return null; + } + + }; + try + { + doPrivilegedActionStaticPermissions(action); + } + catch (AccessControlException ace) + { + fail("Must be able get system session. We are under static permissions"); + } + catch (Throwable t) + { + t.printStackTrace(); + fail(); + } + } + + public void testGetSystemSessionFail() + { + PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>() + { + public Object run() throws Exception + { + repository.getSystemSession(); + return null; + } + + }; + try + { + doPrivilegedAction(action); + fail("Must not be able get system session."); + } + catch (AccessControlException ace) + { + // OK + } + catch (Throwable t) + { + t.printStackTrace(); + fail(); + } + } +} Property changes on: jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestGetSystemSession.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Name: svn:eol-style + native Added: jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/resources/test.policy =================================================================== --- jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/resources/test.policy (rev 0) +++ jcr/branches/1.12-SEC/exo.jcr.component.core/src/test/resources/test.policy 2010-06-04 13:47:36 UTC (rev 2493) @@ -0,0 +1,5 @@ +// configure static permissions here +grant { + permission java.security.AllPermission; +}; + \ No newline at end of file

14 years

1
0
0 / 0

exo-jcr SVN: r2492 - jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

by do-not-reply＠jboss.org

Author: natasha.vakulenko Date: 2010-06-04 08:50:45 -0400 (Fri, 04 Jun 2010) New Revision: 2492 Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java Log: EXOJCR-542: Changed the message on RepositoryException in method getQueryManager(). Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java 2010-06-04 11:34:49 UTC (rev 2491) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java 2010-06-04 12:50:45 UTC (rev 2492) @@ -293,7 +293,9 @@ public QueryManager getQueryManager() throws RepositoryException { if (queryManager == null) - throw new RepositoryException("Query Manager Factory not found. Check configuration."); + throw new RepositoryException( + "Query Manager Factory not found. Check configuration of the query-handler for workspace " + getName() + + "."); return queryManager; }

14 years

1
0
0 / 0

exo-jcr SVN: r2491 - jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util.

by do-not-reply＠jboss.org

Author: natasha.vakulenko Date: 2010-06-04 07:34:49 -0400 (Fri, 04 Jun 2010) New Revision: 2491 Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java Log: JCR-1390: Added Logging Information for indicating that a Node with its versionHistory import was successfully done or not. Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java =================================================================== --- jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java 2010-06-04 09:25:31 UTC (rev 2490) +++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java 2010-06-04 11:34:49 UTC (rev 2491) @@ -98,6 +98,16 @@ private final String versionHistory; /** + * Versionable node uuid. + */ + private String uuid; + + /** + * Versionable node path. + */ + private String path; + + /** * VersionHistoryImporter constructor. * * @param versionableNode - versionable node. @@ -130,53 +140,72 @@ */ public void doImport() throws RepositoryException, IOException { - String path = versionableNode.getVersionHistory().getParent().getPath(); + try + { + uuid = versionableNode.getUUID(); + path = versionableNode.getVersionHistory().getParent().getPath(); + LOG.info("Started: Import version history for node wiht path=" + path + " and UUID=" + uuid); - NodeData versionable = (NodeData)versionableNode.getData(); - // ----- VERSIONABLE properties ----- - // jcr:versionHistory - TransientPropertyData vh = - TransientPropertyData.createPropertyData(versionable, Constants.JCR_VERSIONHISTORY, PropertyType.REFERENCE, - false, new TransientValueData(new Identifier(versionHistory))); + NodeData versionable = (NodeData)versionableNode.getData(); + // ----- VERSIONABLE properties ----- + // jcr:versionHistory + TransientPropertyData vh = + TransientPropertyData.createPropertyData(versionable, Constants.JCR_VERSIONHISTORY, PropertyType.REFERENCE, + false, new TransientValueData(new Identifier(versionHistory))); - // jcr:baseVersion - TransientPropertyData bv = - TransientPropertyData.createPropertyData(versionable, Constants.JCR_BASEVERSION, PropertyType.REFERENCE, - false, new TransientValueData(new Identifier(baseVersionUuid))); + // jcr:baseVersion + TransientPropertyData bv = + TransientPropertyData.createPropertyData(versionable, Constants.JCR_BASEVERSION, PropertyType.REFERENCE, + false, new TransientValueData(new Identifier(baseVersionUuid))); - // jcr:predecessors - List<ValueData> values = new ArrayList<ValueData>(); - for (int i = 0; i < predecessors.length; i++) + // jcr:predecessors + List<ValueData> values = new ArrayList<ValueData>(); + for (int i = 0; i < predecessors.length; i++) + { + values.add(new TransientValueData(new Identifier(predecessors[i]))); + } + TransientPropertyData pd = + TransientPropertyData.createPropertyData(versionable, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, + true, values); + + PlainChangesLog changesLog = new PlainChangesLogImpl(); + RemoveVisitor rv = new RemoveVisitor(); + rv.visit((NodeData)((NodeImpl)versionableNode.getVersionHistory()).getData()); + changesLog.addAll(rv.getRemovedStates()); + changesLog.add(ItemState.createAddedState(vh)); + changesLog.add(ItemState.createAddedState(bv)); + changesLog.add(ItemState.createAddedState(pd)); + // remove version properties to avoid referential integrety check + PlainChangesLog changesLogDeltete = new PlainChangesLogImpl(); + + changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode + .getProperty("jcr:versionHistory")).getData())); + changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode + .getProperty("jcr:baseVersion")).getData())); + changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode + .getProperty("jcr:predecessors")).getData())); + dataKeeper.save(changesLogDeltete); + // remove version history + dataKeeper.save(changesLog); + userSession.save(); + // import new version history + userSession.getWorkspace().importXML(path, versionHistoryStream, 0); + userSession.save(); + + LOG.info("Completed: Import version history for node wiht path=" + path + " and UUID=" + uuid); + } + catch (RepositoryException exception) { - values.add(new TransientValueData(new Identifier(predecessors[i]))); + LOG.error("Failed: Import version history for node wiht path=" + path + " and UUID=" + uuid, exception); + throw new RepositoryException(exception); } - TransientPropertyData pd = - TransientPropertyData.createPropertyData(versionable, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, - true, values); - - PlainChangesLog changesLog = new PlainChangesLogImpl(); - RemoveVisitor rv = new RemoveVisitor(); - rv.visit((NodeData)((NodeImpl)versionableNode.getVersionHistory()).getData()); - changesLog.addAll(rv.getRemovedStates()); - changesLog.add(ItemState.createAddedState(vh)); - changesLog.add(ItemState.createAddedState(bv)); - changesLog.add(ItemState.createAddedState(pd)); - // remove version properties to avoid referential integrety check - PlainChangesLog changesLogDeltete = new PlainChangesLogImpl(); - - changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode - .getProperty("jcr:versionHistory")).getData())); - changesLogDeltete.add(ItemState.createDeletedState(((PropertyImpl)versionableNode.getProperty("jcr:baseVersion")) - .getData())); - changesLogDeltete.add(ItemState - .createDeletedState(((PropertyImpl)versionableNode.getProperty("jcr:predecessors")).getData())); - dataKeeper.save(changesLogDeltete); - // remove version history - dataKeeper.save(changesLog); - userSession.save(); - // import new version history - userSession.getWorkspace().importXML(path, versionHistoryStream, 0); - userSession.save(); + catch (IOException exception) + { + LOG.error("Failed: Import version history for node wiht path=" + path + " and UUID=" + uuid, exception); + IOException newException = new IOException(); + newException.initCause(exception); + throw newException; + } } /** @@ -206,4 +235,4 @@ // no REFERENCE validation here } }; -} +} \ No newline at end of file

14 years

1
0
0 / 0

exo-jcr SVN: r2490 - core/branches/2.4.x.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-06-04 05:25:31 -0400 (Fri, 04 Jun 2010) New Revision: 2490 Modified: core/branches/2.4.x/pom.xml Log: kernel version updated Modified: core/branches/2.4.x/pom.xml =================================================================== --- core/branches/2.4.x/pom.xml 2010-06-04 09:19:03 UTC (rev 2489) +++ core/branches/2.4.x/pom.xml 2010-06-04 09:25:31 UTC (rev 2490) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform</groupId> <artifactId>foundation-parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7</version> </parent> <groupId>org.exoplatform.core</groupId> @@ -39,7 +39,7 @@ <exo.product.specification>2.4</exo.product.specification> <org.exoplatform.framework.junit.version>1.2.2-GA-SNAPSHOT</org.exoplatform.framework.junit.version> - <org.exoplatform.kernel.version>2.2.1-GA-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.2.2-GA-SNAPSHOT</org.exoplatform.kernel.version> </properties> <scm>

14 years

1
0
0 / 0

exo-jcr SVN: r2489 - ws/branches/2.2.x.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-06-04 05:19:03 -0400 (Fri, 04 Jun 2010) New Revision: 2489 Modified: ws/branches/2.2.x/pom.xml Log: EXOJCR-764 branch version updated Modified: ws/branches/2.2.x/pom.xml =================================================================== --- ws/branches/2.2.x/pom.xml 2010-06-04 08:59:29 UTC (rev 2488) +++ ws/branches/2.2.x/pom.xml 2010-06-04 09:19:03 UTC (rev 2489) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform</groupId> <artifactId>foundation-parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7</version> </parent> <groupId>org.exoplatform.ws</groupId> @@ -44,7 +44,7 @@ <exo.product.name>exo-ws</exo.product.name> <exo.product.specification>2.2</exo.product.specification> - <org.exoplatform.kernel.version>2.2.1-GA-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.2.2-GA-SNAPSHOT</org.exoplatform.kernel.version> <org.exoplatform.core.version>2.4.0-Beta01-SNAPSHOT</org.exoplatform.core.version> </properties>

14 years

1
0
0 / 0

exo-jcr SVN: r2488 - jcr/trunk.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-06-04 04:59:29 -0400 (Fri, 04 Jun 2010) New Revision: 2488 Modified: jcr/trunk/pom.xml Log: EXOJCR-753 deps on kernel 2.2.3-GA-SNAPSHOT, core 2.3.3-GA-SNAPSHOT, ws-2.1.3-GA-SNAPSHOT Modified: jcr/trunk/pom.xml =================================================================== --- jcr/trunk/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) +++ jcr/trunk/pom.xml 2010-06-04 08:59:29 UTC (rev 2488) @@ -42,9 +42,9 @@ <properties> <exo.product.name>exo-jcr</exo.product.name> <exo.product.specification>1.12</exo.product.specification> - <org.exoplatform.kernel.version>2.2.2-GA</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.2-GA</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.2-GA</org.exoplatform.ws.version> + <org.exoplatform.kernel.version>2.2.3-GA-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.3-GA-SNAPSHOT</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.3-GA-SNAPSHOT</org.exoplatform.ws.version> <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version> </properties>

14 years

1
0
0 / 0

exo-jcr SVN: r2487 - in jcr/trunk: applications and 25 other directories.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-06-04 04:40:15 -0400 (Fri, 04 Jun 2010) New Revision: 2487 Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml jcr/trunk/applications/exo.jcr.applications.browser/pom.xml jcr/trunk/applications/exo.jcr.applications.config/pom.xml jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml jcr/trunk/applications/exo.jcr.applications.rest/pom.xml jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml jcr/trunk/applications/exo.jcr.ear/pom.xml jcr/trunk/applications/pom.xml jcr/trunk/docs/pom.xml jcr/trunk/docs/reference/en/pom.xml jcr/trunk/docs/reference/pom.xml jcr/trunk/docs/userguide/en/pom.xml jcr/trunk/docs/userguide/pom.xml jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.ext/pom.xml jcr/trunk/exo.jcr.component.ftp/pom.xml jcr/trunk/exo.jcr.component.statistics/pom.xml jcr/trunk/exo.jcr.component.webdav/pom.xml jcr/trunk/exo.jcr.connectors.localadapter/pom.xml jcr/trunk/exo.jcr.framework.command/pom.xml jcr/trunk/exo.jcr.framework.ftpclient/pom.xml jcr/trunk/exo.jcr.framework.web/pom.xml jcr/trunk/packaging/module/pom.xml jcr/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.backupconsole</artifactId> <name>eXo JCR :: Applications :: Backup Console</name> Modified: jcr/trunk/applications/exo.jcr.applications.browser/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.browser/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.applications.browser/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.browser</artifactId> <packaging>war</packaging> Modified: jcr/trunk/applications/exo.jcr.applications.config/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.applications.config/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.config</artifactId> <packaging>pom</packaging> Modified: jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.applications.fckeditor/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.fckeditor</artifactId> <packaging>war</packaging> Modified: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -40,7 +40,7 @@ <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.ear</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> <type>ear</type> <scope>runtime</scope> </dependency> Modified: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -40,7 +40,7 @@ <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.ear</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> <type>ear</type> <scope>runtime</scope> </dependency> Modified: jcr/trunk/applications/exo.jcr.applications.rest/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.rest/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.applications.rest/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.applications.rest</artifactId> <packaging>war</packaging> Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.config</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> <relativePath>exo.jcr.applications.config</relativePath> </parent> Modified: jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.cluster.testclient/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.cluster.testclient</artifactId> <name>eXo JCR :: Cluster :: Test Client</name> Modified: jcr/trunk/applications/exo.jcr.ear/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.ear/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/exo.jcr.ear/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-applications-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.ear</artifactId> <packaging>ear</packaging> Modified: jcr/trunk/applications/pom.xml =================================================================== --- jcr/trunk/applications/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/applications/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,12 +22,12 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jcr-applications-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> <name>eXo JCR :: Applications :: Reactor</name> <packaging>pom</packaging> Modified: jcr/trunk/docs/pom.xml =================================================================== --- jcr/trunk/docs/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/docs/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/trunk/docs/reference/en/pom.xml =================================================================== --- jcr/trunk/docs/reference/en/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/docs/reference/en/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>reference-docs</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/trunk/docs/reference/pom.xml =================================================================== --- jcr/trunk/docs/reference/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/docs/reference/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>docs</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/trunk/docs/userguide/en/pom.xml =================================================================== --- jcr/trunk/docs/userguide/en/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/docs/userguide/en/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>userguide-docs</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/trunk/docs/userguide/pom.xml =================================================================== --- jcr/trunk/docs/userguide/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/docs/userguide/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>docs</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.core</artifactId> <name>eXo JCR :: Component :: Core Service</name> Modified: jcr/trunk/exo.jcr.component.ext/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.component.ext/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.ext</artifactId> <name>eXo JCR :: Component :: Extension Service</name> Modified: jcr/trunk/exo.jcr.component.ftp/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.ftp/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.component.ftp/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.ftp</artifactId> <name>eXo JCR :: Component :: FTP Service</name> Modified: jcr/trunk/exo.jcr.component.statistics/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.statistics/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.component.statistics/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.statistics</artifactId> <name>eXo JCR :: Component :: Statistics Provider</name> Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.component.webdav</artifactId> <name>eXo JCR :: Component :: Webdav Service</name> Modified: jcr/trunk/exo.jcr.connectors.localadapter/pom.xml =================================================================== --- jcr/trunk/exo.jcr.connectors.localadapter/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.connectors.localadapter/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.connectors.localadapter</artifactId> <packaging>rar</packaging> Modified: jcr/trunk/exo.jcr.framework.command/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.command/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.framework.command/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -12,7 +12,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.framework.command</artifactId> <name>eXo JCR :: Framework :: Command</name> Modified: jcr/trunk/exo.jcr.framework.ftpclient/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.framework.ftpclient</artifactId> <name>eXo JCR :: Framework :: FTP Client</name> Modified: jcr/trunk/exo.jcr.framework.web/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.web/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/exo.jcr.framework.web/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>exo.jcr.framework.web</artifactId> <name>eXo JCR :: Framework :: Web</name> Modified: jcr/trunk/packaging/module/pom.xml =================================================================== --- jcr/trunk/packaging/module/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/packaging/module/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> </parent> <artifactId>jcr.packaging.module</artifactId> <packaging>pom</packaging> Modified: jcr/trunk/pom.xml =================================================================== --- jcr/trunk/pom.xml 2010-06-04 08:39:27 UTC (rev 2486) +++ jcr/trunk/pom.xml 2010-06-04 08:40:15 UTC (rev 2487) @@ -29,14 +29,14 @@ <groupId>org.exoplatform.jcr</groupId> <artifactId>jcr-parent</artifactId> - <version>1.12.2-GA</version> + <version>1.12.3-GA-SNAPSHOT</version> <packaging>pom</packaging> <name>eXo JCR</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.12.2-GA</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.2-GA</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.12.2-GA</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/trunk</url> </scm> <properties>

14 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits June 2010