From 7f336b6f763c2149424a6b5fae381b94975cd7a6 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 22 Jan 2019 16:55:54 +0000 Subject: [PATCH] CCM NG: Replaced Wildfly Swarm with its sucessor Thorntail git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5803 8810af33-2d31-482b-a856-94f89814c4df --- .../pom.xml | 60 ++++++++++--------- .../pom.xml.releaseBackup | 0 .../java/org/libreccm/CcmBundleDevel.java | 0 .../java/org/libreccm/CcmBundleDevel.java.off | 0 .../src/main/resources/log4j2.xml | 0 .../src/main/resources/project-defaults.yml | 0 .../src/main/resources/shiro.ini | 0 .../src/main/resources/stylesheet-paths.txt | 0 .../resources/systeminformation.properties | 0 .../src/main/webapp/WEB-INF/beans.xml | 0 .../WEB-INF/classes/META-INF/persistence.xml | 0 .../WEB-INF/conf/registry/registry.properties | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../webapp/ccm-editor/ccm-editor-loader.js | 0 .../org/libreccm/modules/CcmIntegrator.java | 8 ++- .../security/AuthorizationRequired.java | 7 ++- .../libreccm/security/JwtVerifyingFilter.java | 1 - .../org/libreccm/security/RequiresRole.java | 7 ++- pom.xml | 41 ++++++------- 19 files changed, 71 insertions(+), 53 deletions(-) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/pom.xml (82%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/pom.xml.releaseBackup (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/java/org/libreccm/CcmBundleDevel.java (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/java/org/libreccm/CcmBundleDevel.java.off (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/resources/log4j2.xml (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/resources/project-defaults.yml (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/resources/shiro.ini (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/resources/stylesheet-paths.txt (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/resources/systeminformation.properties (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/webapp/WEB-INF/beans.xml (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/webapp/WEB-INF/conf/registry/registry.properties (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/webapp/WEB-INF/web.xml (100%) rename {ccm-bundle-devel-wildfly-swarm => ccm-bundle-devel-thorntail}/src/main/webapp/ccm-editor/ccm-editor-loader.js (100%) diff --git a/ccm-bundle-devel-wildfly-swarm/pom.xml b/ccm-bundle-devel-thorntail/pom.xml similarity index 82% rename from ccm-bundle-devel-wildfly-swarm/pom.xml rename to ccm-bundle-devel-thorntail/pom.xml index 1a682fc6b..cb7618c18 100644 --- a/ccm-bundle-devel-wildfly-swarm/pom.xml +++ b/ccm-bundle-devel-thorntail/pom.xml @@ -17,10 +17,10 @@ org.libreccm - ccm-bundle-devel-wildfly-swarm + ccm-bundle-devel-thorntail war - LibreCCM Devel Bundle for Wildfly Swarm + LibreCCM Devel Bundle for Thorntail http://www.libreccm.org @@ -48,9 +48,9 @@ - org.wildfly.swarm - bom-all - 2017.11.0 + io.thorntail + bom + 2.3.0.Final import pom @@ -60,67 +60,72 @@ - org.wildfly.swarm + io.thorntail cdi - + - org.wildfly.swarm - container - - - - org.wildfly.swarm + io.thorntail datasources - org.wildfly.swarm + io.thorntail ejb - org.wildfly.swarm + io.thorntail hibernate-search - org.wildfly.swarm + io.thorntail hibernate-validator - org.wildfly.swarm + io.thorntail jaxrs - - org.wildfly.swarm + + + + io.thorntail + jaxrs-jsonp - org.wildfly.swarm + io.thorntail jpa - org.wildfly.swarm + io.thorntail jsf - org.wildfly.swarm + io.thorntail + jsonp + + + + io.thorntail logging - org.wildfly.swarm + io.thorntail mail - org.wildfly.swarm + io.thorntail undertow @@ -157,11 +162,8 @@ - org.wildfly.swarm - wildfly-swarm-plugin - + io.thorntail + thorntail-maven-plugin diff --git a/ccm-bundle-devel-wildfly-swarm/pom.xml.releaseBackup b/ccm-bundle-devel-thorntail/pom.xml.releaseBackup similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/pom.xml.releaseBackup rename to ccm-bundle-devel-thorntail/pom.xml.releaseBackup diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java b/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java rename to ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java.off b/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java.off similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java.off rename to ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java.off diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/log4j2.xml b/ccm-bundle-devel-thorntail/src/main/resources/log4j2.xml similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/log4j2.xml rename to ccm-bundle-devel-thorntail/src/main/resources/log4j2.xml diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/project-defaults.yml b/ccm-bundle-devel-thorntail/src/main/resources/project-defaults.yml similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/project-defaults.yml rename to ccm-bundle-devel-thorntail/src/main/resources/project-defaults.yml diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/shiro.ini b/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/shiro.ini rename to ccm-bundle-devel-thorntail/src/main/resources/shiro.ini diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/stylesheet-paths.txt b/ccm-bundle-devel-thorntail/src/main/resources/stylesheet-paths.txt similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/stylesheet-paths.txt rename to ccm-bundle-devel-thorntail/src/main/resources/stylesheet-paths.txt diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/systeminformation.properties b/ccm-bundle-devel-thorntail/src/main/resources/systeminformation.properties similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/systeminformation.properties rename to ccm-bundle-devel-thorntail/src/main/resources/systeminformation.properties diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/beans.xml b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/beans.xml similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/beans.xml rename to ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/beans.xml diff --git a/ccm-bundle-devel-wildfly-swarm/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 similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml rename to ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/conf/registry/registry.properties b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/conf/registry/registry.properties similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/conf/registry/registry.properties rename to ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/conf/registry/registry.properties diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/web.xml rename to ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/web.xml diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/ccm-editor/ccm-editor-loader.js b/ccm-bundle-devel-thorntail/src/main/webapp/ccm-editor/ccm-editor-loader.js similarity index 100% rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/ccm-editor/ccm-editor-loader.js rename to ccm-bundle-devel-thorntail/src/main/webapp/ccm-editor/ccm-editor-loader.js diff --git a/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java index 37723d9ec..ffad56378 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java +++ b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java @@ -29,8 +29,14 @@ import org.hibernate.integrator.spi.Integrator; import org.hibernate.service.spi.SessionFactoryServiceRegistry; import org.libreccm.search.SearchConfig; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + import javax.sql.DataSource; -import java.sql.*; + import java.util.List; import java.util.Locale; import java.util.Optional; diff --git a/ccm-core/src/main/java/org/libreccm/security/AuthorizationRequired.java b/ccm-core/src/main/java/org/libreccm/security/AuthorizationRequired.java index 86b7db956..eaa703acf 100644 --- a/ccm-core/src/main/java/org/libreccm/security/AuthorizationRequired.java +++ b/ccm-core/src/main/java/org/libreccm/security/AuthorizationRequired.java @@ -18,8 +18,13 @@ */ package org.libreccm.security; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + import javax.interceptor.InterceptorBinding; -import java.lang.annotation.*; /** * Use this annotation to secure a method by the diff --git a/ccm-core/src/main/java/org/libreccm/security/JwtVerifyingFilter.java b/ccm-core/src/main/java/org/libreccm/security/JwtVerifyingFilter.java index 6aa42cf1c..b81a8463a 100644 --- a/ccm-core/src/main/java/org/libreccm/security/JwtVerifyingFilter.java +++ b/ccm-core/src/main/java/org/libreccm/security/JwtVerifyingFilter.java @@ -25,7 +25,6 @@ import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; -import org.apache.shiro.subject.SubjectContext; import org.apache.shiro.web.filter.AccessControlFilter; import java.security.Key; diff --git a/ccm-core/src/main/java/org/libreccm/security/RequiresRole.java b/ccm-core/src/main/java/org/libreccm/security/RequiresRole.java index 4c722859b..348fea9c7 100644 --- a/ccm-core/src/main/java/org/libreccm/security/RequiresRole.java +++ b/ccm-core/src/main/java/org/libreccm/security/RequiresRole.java @@ -18,7 +18,12 @@ */ package org.libreccm.security; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * This annotation is used together with the {@link AuthorizationRequired} diff --git a/pom.xml b/pom.xml index 41d7e108f..5187cb355 100644 --- a/pom.xml +++ b/pom.xml @@ -82,13 +82,14 @@ ccm-bundle-devel ccm-bundle-devel-wildfly-web ccm-bundle-devel-wildfly - ccm-bundle-devel-wildfly-swarm + ccm-bundle-devel-thorntail ccm-archetype-module ccm-cms-archetype-contenttype + @@ -97,7 +98,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.9 + @@ -113,7 +114,7 @@ org.codehaus.mojo versions-maven-plugin - 2.4 + file:///${session.executionRootDirectory}/maven-version-rules.xml @@ -276,6 +277,11 @@ hibernate51-ddl-maven-plugin 2.1.0 + + io.thorntail + thorntail-maven-plugin + 2.3.0.Final + org.codehaus.mojo build-helper-maven-plugin @@ -301,7 +307,7 @@ org.codehaus.mojo versions-maven-plugin - 2.5 + 2.7 org.jacoco @@ -313,11 +319,6 @@ wildfly-maven-plugin 1.2.1.Final - - org.wildfly.swarm - wildfly-swarm-plugin - 2017.11.0 - @@ -468,17 +469,17 @@ io.jsonwebtoken jjwt-api 0.10.5 - - - io.jsonwebtoken - jjwt-impl - 0.10.5 - - - io.jsonwebtoken - jjwt-jackson - 0.10.5 - + + + io.jsonwebtoken + jjwt-impl + 0.10.5 + + + io.jsonwebtoken + jjwt-jackson + 0.10.5 +