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

@@ -62,25 +62,36 @@
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
                 <configuration>
+                    
+                    <version>10.0.0.Final</version>
+                    
                     <skip>false</skip>
                     
-                    <address>subsystem=datasources,data-source=java:/comp/env/jdbc/libreccm/db</address>
-                    <resources>
-                        <resource>
-                            <properties>
-                                <jndi-name>java:/comp/env/jdbc/libreccm/db</jndi-name>
-                                <enabled>true</enabled>
-                                <connection-url>jdbc:h2:${project.build.directory}/libreccm-db</connection-url>
-                                <driver-class>org.h2.Driver</driver-class>
-                                <user-name>sa</user-name>
-                                <password>sa</password>
-                            </properties>
-                        </resource>
-                    </resources>
+                    <add-user>
+                        <users>
+                            <user>
+                                <username>admin</username>
+                                <password>admin1234</password>
+                            </user>
+                        </users>
+                    </add-user>
+
+                    <beforeDeployment>
+                        <commands>
+                            <command>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</command>
+                        </commands>
+                    </beforeDeployment>
                 </configuration>
                 
             </plugin>
         </plugins>
     </build>
 
+    <!--<profiles>
+        <profile>
+            <id>h2</id>
+            
+        </profile>
+    </profiles>-->
+
 </project>

ccm-core/src/main/java/com/arsdigita/ui/admin/ApplicationsAdminTab.java

@@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- */
-public class ApplicationsAdminTab extends LayoutPanel {
-    
-    public ApplicationsAdminTab() {
-        super();
-        
-        setLeft(new Label("Applications Admin Tab Left"));
-        
-        setBody(new Label("Applications Admin Tab Body"));
-    }
-    
-}

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;
+    -- create sequence hibernate_sequence start with 1 increment by 1;

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;

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;
+    -- create sequence hibernate_sequence start 1 increment 1;