From c674a34d4003bcc829dcfa6b3fe2217a5e650311 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 3 Jun 2016 06:35:25 +0000 Subject: [PATCH] CCM NG: - Cleanup in ccm-core/src/main/java/com/arsdigita/ui/admin - Fixed typo/wrong SQL syntax (for h2) in database migrations scripts - Removed duplicate create sequence statement from database migrations scripts - Configuration for wildfly-maven-plugin in ccm-bundle-devel (not finished yet) git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4134 8810af33-2d31-482b-a856-94f89814c4df --- ccm-bundle-devel-wildfly/pom.xml | 37 +++++++++++------- .../ui/admin/ApplicationsAdminTab.java | 38 ------------------- .../ccm_core/h2/V7_0_0_0__create_tables.sql | 2 +- .../ccm_core/h2/V7_0_0_2__modify_settings.sql | 2 +- .../pgsql/V7_0_0_0__create_tables.sql | 2 +- 5 files changed, 27 insertions(+), 54 deletions(-) delete mode 100644 ccm-core/src/main/java/com/arsdigita/ui/admin/ApplicationsAdminTab.java diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml index bd82563bb..bc86928ff 100644 --- a/ccm-bundle-devel-wildfly/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -62,25 +62,36 @@ org.wildfly.plugins wildfly-maven-plugin + + 10.0.0.Final + false + + + + + admin + admin1234 + + + -
subsystem=datasources,data-source=java:/comp/env/jdbc/libreccm/db
- - - - java:/comp/env/jdbc/libreccm/db - true - jdbc:h2:${project.build.directory}/libreccm-db - org.h2.Driver - sa - sa - - - + + + data-source add --jndi-name=java:/comp/env/jdbc/libreccm/db --name=ccm-devel --connection-url=jdbc:h2:${project.build.directory}/libreccm-db;DB_CLOSE_ON_EXIT=FALSE --driver-name=h2 --driver-class=org.h2.Driver --user-name=sa --password=sa + + + + diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/ApplicationsAdminTab.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/ApplicationsAdminTab.java deleted file mode 100644 index da1841b59..000000000 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/ApplicationsAdminTab.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2016 LibreCCM Foundation. - * - * This library 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 library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package com.arsdigita.ui.admin; - -import com.arsdigita.bebop.Label; -import com.arsdigita.toolbox.ui.LayoutPanel; - -/** - * - * @author Jens Pelzetter - */ -public class ApplicationsAdminTab extends LayoutPanel { - - public ApplicationsAdminTab() { - super(); - - setLeft(new Label("Applications Admin Tab Left")); - - setBody(new Label("Applications Admin Tab Body")); - } - -} diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_0__create_tables.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_0__create_tables.sql index 067962547..51ad7e47b 100644 --- a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_0__create_tables.sql +++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_0__create_tables.sql @@ -1125,4 +1125,4 @@ foreign key (WORKFLOW_ID) references CCM_CORE.WORKFLOWS; - create sequence hibernate_sequence start with 1 increment by 1; \ No newline at end of file + -- create sequence hibernate_sequence start with 1 increment by 1; \ No newline at end of file diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_2__modify_settings.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_2__modify_settings.sql index 61362777d..68c02f09a 100644 --- a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_2__modify_settings.sql +++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_2__modify_settings.sql @@ -37,7 +37,7 @@ alter table CCM_CORE.SETTINGS_STRING_LIST DROP COLUMN OBJECT_ID; alter table CCM_CORE.SETTINGS - rename column OBJECT_ID to SETTING_ID; + alter column OBJECT_ID rename to SETTING_ID; alter table CCM_CORE.SETTINGS add column DTYPE varchar(31) not null; diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_0__create_tables.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_0__create_tables.sql index 75cd4ed61..3b6301ada 100644 --- a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_0__create_tables.sql +++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_0__create_tables.sql @@ -1126,4 +1126,4 @@ foreign key (WORKFLOW_ID) references CCM_CORE.WORKFLOWS; - create sequence hibernate_sequence start 1 increment 1; \ No newline at end of file + -- create sequence hibernate_sequence start 1 increment 1; \ No newline at end of file