LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG: Updated Arquillian dependencies, SQL schema migration for Theme files in database 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5327 8810af33-2d31-482b-a856-94f89814c4df
jensp 2018-03-07 10:14:30 +00:00
parent d21d6f77e4
commit 67fa8657cb
9 changed files with 2786 additions and 1418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1995
ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql
View File

File diff suppressed because it is too large Load Diff

1994
ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql
View File

File diff suppressed because it is too large Load Diff

4
ccm-core/pom.xml
View File

@ -199,10 +199,10 @@
<version>0.9.11</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
</dependency>
</dependency>-->
<dependency>
<groupId>org.freemarker</groupId>

52
ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_19__add_theme_files.sql 100644
View File

@ -0,0 +1,52 @@
create table CCM_CORE.THEME_DATA_FILES (
CREATION_DATE timestamp,
FILE_DATA blob,
LAST_MODIFIED timestamp,
FILE_SIZE bigint,
TYPE varchar(255),
FILE_ID bigint not null,
primary key (FILE_ID)
);
create table CCM_CORE.theme_directories (
FILE_ID bigint not null,
primary key (FILE_ID)
);
create table CCM_CORE.THEME_FILES (
FILE_ID bigint not null,
NAME varchar(255) not null,
FILE_PATH varchar(8192) not null,
UUID varchar(255) not null,
PARENT_DIRECTORY_ID bigint,
primary key (FILE_ID)
);
create table CCM_CORE.THEMES (
THEME_ID bigint not null,
NAME varchar(255),
UUID varchar(255),
VERSION varchar(255),
ROOT_DIRECTORY_ID bigint,
primary key (THEME_ID)
);
alter table CCM_CORE.THEME_DATA_FILES
add constraint FK630m2y2p7pp487ofowbefrm89
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.theme_directories
add constraint FKrmgyslvw22j87n4cxau5jvsou
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.THEME_FILES
add constraint FKfsycb4bt8d0wye7r3n06ekfeu
foreign key (PARENT_DIRECTORY_ID)
references CCM_CORE.theme_directories;
alter table CCM_CORE.THEMES
add constraint FKlat55c5l3fxbykkibrmv7qi4x
foreign key (ROOT_DIRECTORY_ID)
references CCM_CORE.theme_directories;

39
ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_19__add_theme_files.sql 100644
View File

@ -0,0 +1,39 @@
alter table CCM_CORE.THEME_DATA_FILES
add constraint FK630m2y2p7pp487ofowbefrm89
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.theme_directories
add constraint FKrmgyslvw22j87n4cxau5jvsou
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.THEME_FILES
add constraint FKfsycb4bt8d0wye7r3n06ekfeu
foreign key (PARENT_DIRECTORY_ID)
references CCM_CORE.theme_directories;
alter table CCM_CORE.THEMES
add constraint FKlat55c5l3fxbykkibrmv7qi4x
foreign key (ROOT_DIRECTORY_ID)
references CCM_CORE.theme_directories;
alter table CCM_CORE.THEME_DATA_FILES
add constraint FK630m2y2p7pp487ofowbefrm89
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.theme_directories
add constraint FKrmgyslvw22j87n4cxau5jvsou
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.THEME_FILES
add constraint FKfsycb4bt8d0wye7r3n06ekfeu
foreign key (PARENT_DIRECTORY_ID)
references CCM_CORE.theme_directories;
alter table CCM_CORE.THEMES
add constraint FKlat55c5l3fxbykkibrmv7qi4x
foreign key (ROOT_DIRECTORY_ID)
references CCM_CORE.theme_directories;

3
ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
View File

@ -128,7 +128,8 @@ public class CcmObjectRepositoryTest {
.getPackage())
.addPackage(org.libreccm.web.CcmApplication.class.getPackage())
.addPackage(org.libreccm.workflow.Workflow.class.getPackage())
.addClass(org.libreccm.portation.Portable.class)
// .addClass(org.libreccm.portation.Portable.class)
.addPackage(org.libreccm.portation.Portable.class.getPackage())
.addPackage(com.arsdigita.kernel.security.SecurityConfig.class
.getPackage())
.addAsLibraries(getModuleDependencies())

55
ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql
View File

@ -531,10 +531,10 @@ drop sequence if exists HIBERNATE_SEQUENCE;
CONFIGURATION_CLASS varchar(512) not null,
NAME varchar(512) not null,
SETTING_VALUE_STRING varchar(1024),
SETTING_VALUE_BIG_DECIMAL decimal(19,2),
SETTING_VALUE_DOUBLE double,
SETTING_VALUE_LONG bigint,
SETTING_VALUE_BOOLEAN boolean,
SETTING_VALUE_BIG_DECIMAL decimal(19,2),
primary key (SETTING_ID)
);
@ -569,6 +569,39 @@ drop sequence if exists HIBERNATE_SEQUENCE;
primary key (OBJECT_ID)
);
create table CCM_CORE.THEME_DATA_FILES (
CREATION_DATE timestamp,
FILE_DATA blob,
LAST_MODIFIED timestamp,
FILE_SIZE bigint,
TYPE varchar(255),
FILE_ID bigint not null,
primary key (FILE_ID)
);
create table CCM_CORE.theme_directories (
FILE_ID bigint not null,
primary key (FILE_ID)
);
create table CCM_CORE.THEME_FILES (
FILE_ID bigint not null,
NAME varchar(255) not null,
FILE_PATH varchar(8192) not null,
UUID varchar(255) not null,
PARENT_DIRECTORY_ID bigint,
primary key (FILE_ID)
);
create table CCM_CORE.THEMES (
THEME_ID bigint not null,
NAME varchar(255),
UUID varchar(255),
VERSION varchar(255),
ROOT_DIRECTORY_ID bigint,
primary key (THEME_ID)
);
create table CCM_CORE.THREADS (
OBJECT_ID bigint not null,
ROOT_ID bigint,
@ -1140,6 +1173,26 @@ drop sequence if exists HIBERNATE_SEQUENCE;
foreign key (OBJECT_ID)
references CCM_CORE.CCM_OBJECTS;
alter table CCM_CORE.THEME_DATA_FILES
add constraint FK630m2y2p7pp487ofowbefrm89
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.theme_directories
add constraint FKrmgyslvw22j87n4cxau5jvsou
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.THEME_FILES
add constraint FKfsycb4bt8d0wye7r3n06ekfeu
foreign key (PARENT_DIRECTORY_ID)
references CCM_CORE.theme_directories;
alter table CCM_CORE.THEMES
add constraint FKlat55c5l3fxbykkibrmv7qi4x
foreign key (ROOT_DIRECTORY_ID)
references CCM_CORE.theme_directories;
alter table CCM_CORE.THREADS
add constraint FKsx08mpwvwnw97uwdgjs76q39g
foreign key (ROOT_ID)

56
ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql
View File

@ -3,7 +3,6 @@ drop schema if exists CCM_CORE cascade;
drop sequence if exists HIBERNATE_SEQUENCE;
create schema CCM_CORE;
create table CCM_CORE.APPLICATIONS (
@ -532,10 +531,10 @@ drop sequence if exists HIBERNATE_SEQUENCE;
CONFIGURATION_CLASS varchar(512) not null,
NAME varchar(512) not null,
SETTING_VALUE_STRING varchar(1024),
SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
SETTING_VALUE_DOUBLE float8,
SETTING_VALUE_LONG int8,
SETTING_VALUE_BOOLEAN boolean,
SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
primary key (SETTING_ID)
);
@ -570,6 +569,39 @@ drop sequence if exists HIBERNATE_SEQUENCE;
primary key (OBJECT_ID)
);
create table CCM_CORE.THEME_DATA_FILES (
CREATION_DATE timestamp,
FILE_DATA oid,
LAST_MODIFIED timestamp,
FILE_SIZE int8,
TYPE varchar(255),
FILE_ID int8 not null,
primary key (FILE_ID)
);
create table CCM_CORE.theme_directories (
FILE_ID int8 not null,
primary key (FILE_ID)
);
create table CCM_CORE.THEME_FILES (
FILE_ID int8 not null,
NAME varchar(255) not null,
FILE_PATH varchar(8192) not null,
UUID varchar(255) not null,
PARENT_DIRECTORY_ID int8,
primary key (FILE_ID)
);
create table CCM_CORE.THEMES (
THEME_ID int8 not null,
NAME varchar(255),
UUID varchar(255),
VERSION varchar(255),
ROOT_DIRECTORY_ID int8,
primary key (THEME_ID)
);
create table CCM_CORE.THREADS (
OBJECT_ID int8 not null,
ROOT_ID int8,
@ -1141,6 +1173,26 @@ drop sequence if exists HIBERNATE_SEQUENCE;
foreign key (OBJECT_ID)
references CCM_CORE.CCM_OBJECTS;
alter table CCM_CORE.THEME_DATA_FILES
add constraint FK630m2y2p7pp487ofowbefrm89
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.theme_directories
add constraint FKrmgyslvw22j87n4cxau5jvsou
foreign key (FILE_ID)
references CCM_CORE.THEME_FILES;
alter table CCM_CORE.THEME_FILES
add constraint FKfsycb4bt8d0wye7r3n06ekfeu
foreign key (PARENT_DIRECTORY_ID)
references CCM_CORE.theme_directories;
alter table CCM_CORE.THEMES
add constraint FKlat55c5l3fxbykkibrmv7qi4x
foreign key (ROOT_DIRECTORY_ID)
references CCM_CORE.theme_directories;
alter table CCM_CORE.THREADS
add constraint FKsx08mpwvwnw97uwdgjs76q39g
foreign key (ROOT_ID)

6
pom.xml
View File

@ -574,11 +574,11 @@
</dependency>
<!-- Apache Commons libraries end -->
<dependency>
<!--<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.1.2</version>
</dependency>
</dependency>-->
<dependency>
<groupId>org.freemarker</groupId>
@ -699,7 +699,7 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-bom</artifactId>
<version>1.0.5</version>
<version>1.0.3.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>