diff --git a/ccm-bundle-devel-thorntail/pom.xml b/ccm-bundle-devel-thorntail/pom.xml deleted file mode 100644 index 8882c9e6a..000000000 --- a/ccm-bundle-devel-thorntail/pom.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - 4.0.0 - - - org.libreccm - ccm-bundle-devel - ../ccm-bundle-devel - 7.0.0-SNAPSHOT - - - org.libreccm - ccm-bundle-devel-thorntail - war - - LibreCCM Devel Bundle for Thorntail - http://www.libreccm.org - - - libreccm-site - LibreCCM - http://www.libreccm.org/project-sites/ - - - - - LibreCCM Foundation - - - - - LGPLv2 or newer - http://www.gnu.org/licenses/lgpl-2.0.html - - - - - false - - - - - - - - io.thorntail - cdi - - - - io.thorntail - datasources - - - - io.thorntail - ejb - - - - io.thorntail - hibernate-search - - - - io.thorntail - hibernate-validator - - - - io.thorntail - jaxrs - - - - - - io.thorntail - jaxrs-jsonp - - - - io.thorntail - jpa - - - - io.thorntail - jsf - - - - io.thorntail - jsonp - - - - io.thorntail - logging - - - - io.thorntail - mail - - - - io.thorntail - undertow - - - - org.libreccm - ccm-wildfly - 7.0.0-SNAPSHOT - - - - com.h2database - h2 - - - org.postgresql - postgresql - 42.2.5.jre7 - - - - org.webjars - font-awesome - - - org.webjars - requirejs - - - org.webjars - requirejs-domready - - - - - - ccm-bundle-devel-wildfly - - - - io.thorntail - thorntail-maven-plugin - - - - package - - - - - - - org.apache.maven.plugins - maven-war-plugin - - - - org.libreccm - ccm-editor - jar - - - org.libreccm - ccm-theme-foundry - jar - - - org.libreccm - ccm-core - jar - - assets/ - - - - org.librecms - ccm-cms - jar - - templates/ - - - - - - - - - diff --git a/ccm-bundle-devel-thorntail/pom.xml.releaseBackup b/ccm-bundle-devel-thorntail/pom.xml.releaseBackup deleted file mode 100644 index ccf5872ae..000000000 --- a/ccm-bundle-devel-thorntail/pom.xml.releaseBackup +++ /dev/null @@ -1,215 +0,0 @@ - - - - 4.0.0 - - - - - org.libreccm - ccm-bundle-devel - ../ccm-bundle-devel - 7.0.0-SNAPSHOT - - - org.libreccm - ccm-bundle-devel-wildfly-swarm - war - - LibreCCM Devel Bundle for Wildfly Swarm - http://www.libreccm.org - - - libreccm-site - LibreCCM - http://www.libreccm.org/project-sites/ - - - - - LibreCCM Foundation - - - - - LGPLv2 or newer - http://www.gnu.org/licenses/lgpl-2.0.html - - - - - false - - - - - - org.wildfly.swarm - bom-all - 2017.11.0 - import - pom - - - - - - - - org.wildfly.swarm - cdi - - - - org.wildfly.swarm - container - - - - org.wildfly.swarm - datasources - - - - org.wildfly.swarm - ejb - - - - org.wildfly.swarm - hibernate-search - - - - org.wildfly.swarm - hibernate-validator - - - - org.wildfly.swarm - jaxrs - - - - org.wildfly.swarm - jaxrs-cdi - - - - org.wildfly.swarm - jpa - - - - org.wildfly.swarm - jsf - - - - org.wildfly.swarm - logging - - - - org.wildfly.swarm - mail - - - - org.wildfly.swarm - undertow - - - - com.h2database - h2 - - - org.postgresql - postgresql - 42.1.4.jre7 - - - - org.webjars - font-awesome - 4.7.0 - - - org.webjars - requirejs - 2.3.5 - - - org.webjars - requirejs-domready - 2.0.1-2 - - - - - - ccm-bundle-devel-wildfly - - - - org.wildfly.swarm - wildfly-swarm-plugin - - - - - package - - - - - - - org.apache.maven.plugins - maven-war-plugin - - - - org.libreccm - ccm-editor - jar - - - org.libreccm - ccm-theme-foundry - jar - - - org.libreccm - ccm-core - jar - - assets/ - VAADIN/ - - - - org.librecms - ccm-cms - jar - - templates/ - - - - - - - - - diff --git a/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java b/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java deleted file mode 100644 index 5e0447046..000000000 --- a/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.libreccm; - -import org.wildfly.swarm.Swarm; - -/** - * - * @author Jens Pelzetter - */ -public class CcmBundleDevel { - - public static void main(final String[] args) throws Exception { - - final Swarm swarm = new Swarm(); - - swarm.start(); - - } - -} diff --git a/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java.off b/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java.off deleted file mode 100644 index 5e0447046..000000000 --- a/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java.off +++ /dev/null @@ -1,19 +0,0 @@ -package org.libreccm; - -import org.wildfly.swarm.Swarm; - -/** - * - * @author Jens Pelzetter - */ -public class CcmBundleDevel { - - public static void main(final String[] args) throws Exception { - - final Swarm swarm = new Swarm(); - - swarm.start(); - - } - -} diff --git a/ccm-bundle-devel-thorntail/src/main/resources/log4j2.xml b/ccm-bundle-devel-thorntail/src/main/resources/log4j2.xml deleted file mode 100644 index 4927cf628..000000000 --- a/ccm-bundle-devel-thorntail/src/main/resources/log4j2.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ccm-bundle-devel-thorntail/src/main/resources/project-defaults.yml b/ccm-bundle-devel-thorntail/src/main/resources/project-defaults.yml deleted file mode 100644 index 9a6f2d00d..000000000 --- a/ccm-bundle-devel-thorntail/src/main/resources/project-defaults.yml +++ /dev/null @@ -1,5 +0,0 @@ -swarm: - deployment: - ccm-bundle-devel-wildfly.war: - jaxrs: - application-path: /jaxrs diff --git a/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini b/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini deleted file mode 100644 index 056b076e5..000000000 --- a/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini +++ /dev/null @@ -1,17 +0,0 @@ -[main] - -filterChainResolver = org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver - -passwordMatcher = org.apache.shiro.authc.credential.PasswordMatcher -passwordService = org.apache.shiro.authc.credential.DefaultPasswordService -passwordMatcher.passwordService = $passwordService - -ccmRealm = org.libreccm.security.CcmShiroRealm -ccmRealm.credentialsMatcher = $passwordMatcher - -securityManager.realms = $ccmRealm -securityManager.rememberMeManager.cipherKey = p5h/Aphy0gfV+XThbEPqSG4iQNh2fTNH9ZEkSBAt/Ok= - -cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager -securityManager.cacheManager = $cacheManager - diff --git a/ccm-bundle-devel-thorntail/src/main/resources/stylesheet-paths.txt b/ccm-bundle-devel-thorntail/src/main/resources/stylesheet-paths.txt deleted file mode 100644 index 221b973e1..000000000 --- a/ccm-bundle-devel-thorntail/src/main/resources/stylesheet-paths.txt +++ /dev/null @@ -1,65 +0,0 @@ -# -*- text -*- -# This file locates stylesheets, if you are using the -# "PatternStylesheetResolver". Please read the Javadoc for that file for -# the full story. - -# Currently the "resource" part is actually "short-circuited", see -# Templating#transformURL(url). As long as we store and synchronize all theme -# files in each server's local file system, we use the direct file apprach to -# avoid unnecessary http request and traffic between client (user) and server! -# Additionally all modules are installed into one webapp context, so the -# webapp tag is redundant, but sort of required by some part of the code. - - -# Theme with single entry point (e.g Mandalay) managed by themedirector -#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl -http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl - -# Theme with single entry point (e.g Mandalay) unmanaged default -#http://::host::/resource/::webapp::/themes/mandalay/start.xsl -#http://::host::/::webapp::/themes/mandalay/start.xsl - -# Theme with single entry point (e.g Mandalay) unmanaged default -#http://::host::/resource/::webapp::/themes/mandalay/start.xsl -http://::host::/::webapp::/themes/libreccm-default/start.xsl - - - - -# ============================================================================== -# The following is for multi-entry themes, not used in ScientificCMS -# ============================================================================== - -# Output type is for things such as text/javascript -# NOT used by ScientificCMS, uses Mandalay only! -#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::-::locale::.xsl -#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::outputtype::.xsl - -# Grabs custom item xsl for CMS -# NOT used by ScientificCMS, uses Mandalay only! -#http://::host::/themes/servlet/content-item/index.xsl?oid=::item_template_oid::&delegated=::item_delegated_url:: - -# Theme, with optional locale & prefix -# NOT used by ScientificCMS, uses Mandalay only! -#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl -#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl - -# Theme, with optional locale -# NOT used by ScientificCMS, uses Mandalay only! -#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl -#http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl - -# APLAWS generic default, with locale and prefix -# XXX change ROOT -> ccm-ldn-aplaws -# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl -# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl - -# APLAWS generic default, with locale -# XXX change ROOT -> ccm-ldn-aplaws -# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl -# http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl - -# Global default, from application's own web app -# NOT used by ScientificCMS -#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl -#http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl diff --git a/ccm-bundle-devel-thorntail/src/main/resources/systeminformation.properties b/ccm-bundle-devel-thorntail/src/main/resources/systeminformation.properties deleted file mode 100644 index f34883af8..000000000 --- a/ccm-bundle-devel-thorntail/src/main/resources/systeminformation.properties +++ /dev/null @@ -1,3 +0,0 @@ -version = 7.0.0-SNAPSHOT -appname = LibreCCM -apphomepage = http://www.libreccm.org diff --git a/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/beans.xml b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index 194f21e6e..000000000 --- a/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/beans.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml deleted file mode 100644 index ebb1371dd..000000000 --- a/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - org.hibernate.jpa.HibernatePersistenceProvider - - java:jboss/datasources/LibreCCM - - - - lib/ccm-core-7.0.0-SNAPSHOT.jar - lib/ccm-cms-7.0.0-SNAPSHOT.jar - lib/ccm-shortcuts-7.0.0-SNAPSHOT.jar - - - - - - - - - - - - - - - - - - diff --git a/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/conf/registry/registry.properties b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/conf/registry/registry.properties deleted file mode 100644 index 9bb7b6ea9..000000000 --- a/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/conf/registry/registry.properties +++ /dev/null @@ -1 +0,0 @@ -waf.config.packages=ccm-core \ No newline at end of file diff --git a/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 2afd7ee37..000000000 --- a/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - LibreCCM Devel Bundle for Wildfly - - - ccm.develmode - true - - - ccm.distribution - libreccm - - - - - COOKIE - - - - - ShiroFilter - org.apache.shiro.web.servlet.ShiroFilter - - - - ShiroFilter - /* - - - - org.apache.shiro.web.env.EnvironmentLoaderListener - - - - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - Faces Servlet - *.xhtml - - - - javax.faces.PROJECT_STAGE - Development - - - javax.faces.FACELETS_SKIP_COMMENTS - true - - - - vaadin-servlet - com.vaadin.cdi.server.VaadinCDIServlet - - - - vaadin-servlet - /vaadin/* - - - vaadin-servlet - /VAADIN/* - - - diff --git a/ccm-bundle-devel-thorntail/src/main/webapp/ccm-editor/ccm-editor-loader.js b/ccm-bundle-devel-thorntail/src/main/webapp/ccm-editor/ccm-editor-loader.js deleted file mode 100644 index 871bbf362..000000000 --- a/ccm-bundle-devel-thorntail/src/main/webapp/ccm-editor/ccm-editor-loader.js +++ /dev/null @@ -1,72 +0,0 @@ -requirejs(["./ccm-editor", - "./ccm-cms-editor", - "../webjars/requirejs-domready/2.0.1/domReady!"], - function(editor, cmseditor, doc) { - - editor.addEditor(".editor-textarea", { - "commandGroups": [ - { - "name": "blocks", - "title": "Format blocks", - "commands": [ - editor.FormatBlockCommand - ] - }, - { - "name": "format-text", - "title": "Format text", - "commands": [ - editor.MakeBoldCommand, - editor.MakeItalicCommand, - editor.MakeUnderlineCommand, - editor.StrikeThroughCommand, - editor.SubscriptCommand, - editor.SuperscriptCommand, - editor.RemoveFormatCommand, - editor.InsertExternalLinkCommand, - cmseditor.InsertInternalLinkCommand, - cmseditor.InsertMediaAssetCommand - ] - }, - { - "name": "insert-list", - "title": "Insert list", - "commands": [ - editor.InsertUnorderedListCommand, - editor.InsertOrderedListCommand - ] - }, - { - "name": "html", - "title": "HTML", - "commands": [editor.ToggleHtmlCommand] - } - ], - "settings": { - "ccm-editor-css.path": "/libreccm/ccm-editor/ccm-editor.css", - "font-awesome.path": "/libreccm/webjars/font-awesome/4.7.0/css/font-awesome.min.css", - "formatBlock.blocks": [ - { - "element": "h3", - "title": "Heading 3" - }, - { - "element": "h4", - "title": "Heading 4" - }, - { - "element": "h5", - "title": "Heading 5" - }, - { - "element": "h6", - "title": "Heading 6" - }, - { - "element": "p", - "title": "Paragraph" - } - ] - } - }); -}); diff --git a/ccm-bundle-devel-wildfly/.gitignore b/ccm-bundle-devel-wildfly/.gitignore index ee3de53b9..d16cb9544 100644 --- a/ccm-bundle-devel-wildfly/.gitignore +++ b/ccm-bundle-devel-wildfly/.gitignore @@ -1,2 +1,3 @@ datasource.properties +runtime.properties wildfly.properties diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml index 006d284fc..5bc921f3a 100644 --- a/ccm-bundle-devel-wildfly/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -284,6 +284,27 @@ + + org.codehaus.mojo + properties-maven-plugin + + + read-runtime-properties + initialize + + read-project-properties + + + + ${project.basedir}/runtime.example.properties + ${project.basedir}/runtime.properties + + true + + + + + org.wildfly.plugins wildfly-maven-plugin @@ -295,6 +316,58 @@ + + + org.wildfly.plugins + wildfly-jar-maven-plugin + + + -agentlib:jdwp=transport=dt_socket,server=y,suspend=${libreccm.debug.suspend},address=${libreccm.debug.port} + + + -Dorg.wildfly.datasources.postgresql.database=${libreccm.database.name} + -Dorg.wildfly.datasources.postgresql.host=${libreccm.database.host} + -Dorg.wildfly.datasources.postgresql.jndi-name=java:/comp/env/jdbc/libreccm/db + -Dorg.wildfly.datasources.postgresql.password=${libreccm.database.password} + -Dorg.wildfly.datasources.postgresql.port=${libreccm.database.port} + -Dorg.wildfly.datasources.postgresql.user-name=${libreccm.database.user} + + + + wildfly@maven(org.jboss.universe:community-universe)#24.0.1.Final + + + org.wildfly + wildfly-datasources-galleon-pack + 2.0.2.Final + + + + cdi + datasources + ejb + jaxrs + jpa + jsf + jsonp + logging + mail + management + postgresql-datasource + + + false + + + + + package + + + + diff --git a/ccm-bundle-devel-wildfly/runtime.example.properties b/ccm-bundle-devel-wildfly/runtime.example.properties new file mode 100644 index 000000000..f7bd45dea --- /dev/null +++ b/ccm-bundle-devel-wildfly/runtime.example.properties @@ -0,0 +1,10 @@ +libreccm.http.port=8080 +libreccm.https.port=8180 +libreccm.debug.port=8787 +libreccm.debug.suspend=n + +libreccm.database.host=localhost +libreccm.database.port=5432 +libreccm.database.name=libreccm-devel +libreccm.database.user=libreccm +libreccm.database.password=libreccm \ No newline at end of file diff --git a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml index 9689a70e3..8b9183508 100644 --- a/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml +++ b/ccm-bundle-devel-wildfly/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml @@ -25,7 +25,6 @@ lib/ccm-cms-7.0.0-SNAPSHOT.jar lib/ccm-shortcuts-7.0.0-SNAPSHOT.jar - diff --git a/pom.xml b/pom.xml index a468bb10d..7691c31d0 100644 --- a/pom.xml +++ b/pom.xml @@ -88,15 +88,14 @@ ccm-bundle-devel ccm-bundle-devel-wildfly - ccm-bundle-devel-thorntail - + ccm-archetype-module ccm-cms-archetype-contenttype - ccm-wildfly - + ccm-wildfly + true @@ -343,6 +342,14 @@ 24.0.1.Final + + org.wildfly.plugins + wildfly-jar-maven-plugin + 3.0.2.Final + + true + +