From e001c43351d06ab4e4890aa7ae69c439cf42cb39 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 11 Sep 2015 16:47:30 +0000 Subject: [PATCH] CCM NG: ccm-core: - Moved package for module system from org.libreccm.core.modules to org.libreccm.modules ccm-docrepo - Fixed wrong import for java.sql.Date, should be java.util.Date - Added a placeholder persistence.xml to avoid error in the ddl generator git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3611 8810af33-2d31-482b-a856-94f89814c4df --- .../main/java/org/libreccm/core/CcmCore.java | 14 +- .../{core => }/modules/CcmIntegrator.java | 2 +- .../{core => }/modules/CcmModule.java | 2 +- .../modules/CcmModuleContextListener.java | 5 +- .../modules/DependencyException.java | 2 +- .../modules/DependencyTreeManager.java | 2 +- .../{core => }/modules/InitEvent.java | 2 +- .../{core => }/modules/InstallEvent.java | 2 +- .../{core => }/modules/InstalledModule.java | 2 +- .../modules/IntegrationException.java | 2 +- .../libreccm/{core => }/modules/Module.java | 2 +- .../{core => }/modules/ModuleEvent.java | 2 +- .../{core => }/modules/ModuleInfo.java | 2 +- .../{core => }/modules/ModuleManager.java | 2 +- .../modules/ModuleManagerException.java | 2 +- .../{core => }/modules/ModuleStatus.java | 2 +- .../{core => }/modules/RequiredModule.java | 2 +- .../{core => }/modules/ShutdownEvent.java | 2 +- .../libreccm/{core => }/modules/TreeNode.java | 2 +- .../{core => }/modules/UnInstallEvent.java | 2 +- .../main/resources/META-INF/persistence.xml | 4 +- .../org.hibernate.integrator.spi.Integrator | 2 +- ...mModule => org.libreccm.modules.CcmModule} | 0 .../libreccm/core/modules/CcmModulesTest.java | 216 ------------------ .../test/cycle/TestModuleA.java | 14 +- .../test/cycle/TestModuleB.java | 14 +- .../test/cycle/TestModuleC.java | 14 +- .../test/cycle/TestModuleRoot.java | 14 +- .../test/valid/TestModuleA.java | 14 +- .../test/valid/TestModuleB.java | 14 +- .../test/valid/TestModuleC.java | 14 +- .../test/valid/TestModuleRoot.java | 12 +- .../modules/ComparableVersionTest.java | 2 +- .../DependencyTreeManagerCycleTest.java | 16 +- .../modules/DependencyTreeManagerTest.java | 15 +- ...endencyTreeManagerValidateVersionTest.java | 4 +- ccm-docrepo/pom.xml | 1 + .../org/libreccm/docrepo/ResourceImpl.java | 4 +- .../src/main/resources/persistence-build.xml | 41 ++++ .../java/org/libreccm/CcmModulesTest.java | 4 +- src/site/apt/entities.apt | 4 +- src/site/apt/module-system.apt | 7 +- 42 files changed, 172 insertions(+), 313 deletions(-) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/CcmIntegrator.java (99%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/CcmModule.java (98%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/CcmModuleContextListener.java (95%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/DependencyException.java (98%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/DependencyTreeManager.java (99%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/InitEvent.java (96%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/InstallEvent.java (96%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/InstalledModule.java (99%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/IntegrationException.java (97%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/Module.java (98%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/ModuleEvent.java (97%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/ModuleInfo.java (99%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/ModuleManager.java (99%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/ModuleManagerException.java (97%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/ModuleStatus.java (97%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/RequiredModule.java (96%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/ShutdownEvent.java (96%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/TreeNode.java (99%) rename ccm-core/src/main/java/org/libreccm/{core => }/modules/UnInstallEvent.java (96%) rename ccm-core/src/main/resources/META-INF/services/{org.libreccm.core.modules.CcmModule => org.libreccm.modules.CcmModule} (100%) delete mode 100644 ccm-core/src/test/java/org/libreccm/core/modules/CcmModulesTest.java rename ccm-core/src/test/java/org/libreccm/{core => }/modules/ComparableVersionTest.java (99%) rename ccm-core/src/test/java/org/libreccm/{core => }/modules/DependencyTreeManagerCycleTest.java (91%) rename ccm-core/src/test/java/org/libreccm/{core => }/modules/DependencyTreeManagerTest.java (91%) rename ccm-core/src/test/java/org/libreccm/{core => }/modules/DependencyTreeManagerValidateVersionTest.java (98%) create mode 100644 ccm-docrepo/src/main/resources/persistence-build.xml diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java index 67b7c28d9..70380ab92 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java @@ -18,12 +18,12 @@ */ package org.libreccm.core; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; import javax.persistence.EntityManager; @@ -46,7 +46,7 @@ import javax.persistence.EntityManager; org.libreccm.core.Role.class, org.libreccm.core.Subject.class, org.libreccm.core.User.class, - org.libreccm.core.modules.InstalledModule.class, + org.libreccm.modules.InstalledModule.class, org.libreccm.formbuilder.Component.class, org.libreccm.formbuilder.DataDrivenSelect.class, org.libreccm.formbuilder.FormSection.class, diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/CcmIntegrator.java b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java similarity index 99% rename from ccm-core/src/main/java/org/libreccm/core/modules/CcmIntegrator.java rename to ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java index 6c9e0f32c..45946018b 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/CcmIntegrator.java +++ b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/CcmModule.java b/ccm-core/src/main/java/org/libreccm/modules/CcmModule.java similarity index 98% rename from ccm-core/src/main/java/org/libreccm/core/modules/CcmModule.java rename to ccm-core/src/main/java/org/libreccm/modules/CcmModule.java index 919d8904c..38a5f08b1 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/CcmModule.java +++ b/ccm-core/src/main/java/org/libreccm/modules/CcmModule.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import javax.persistence.EntityManager; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/CcmModuleContextListener.java b/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java similarity index 95% rename from ccm-core/src/main/java/org/libreccm/core/modules/CcmModuleContextListener.java rename to ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java index 92f6c09d3..63eead7be 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/CcmModuleContextListener.java +++ b/ccm-core/src/main/java/org/libreccm/modules/CcmModuleContextListener.java @@ -16,15 +16,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import javax.inject.Inject; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.libreccm.core.modules.ModuleManager; +import org.libreccm.modules.ModuleManager; /** * diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/DependencyException.java b/ccm-core/src/main/java/org/libreccm/modules/DependencyException.java similarity index 98% rename from ccm-core/src/main/java/org/libreccm/core/modules/DependencyException.java rename to ccm-core/src/main/java/org/libreccm/modules/DependencyException.java index f17b2c10b..a10716a23 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/DependencyException.java +++ b/ccm-core/src/main/java/org/libreccm/modules/DependencyException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/DependencyTreeManager.java b/ccm-core/src/main/java/org/libreccm/modules/DependencyTreeManager.java similarity index 99% rename from ccm-core/src/main/java/org/libreccm/core/modules/DependencyTreeManager.java rename to ccm-core/src/main/java/org/libreccm/modules/DependencyTreeManager.java index 366813e79..489feade6 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/DependencyTreeManager.java +++ b/ccm-core/src/main/java/org/libreccm/modules/DependencyTreeManager.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import java.util.ArrayList; import java.util.HashMap; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/InitEvent.java b/ccm-core/src/main/java/org/libreccm/modules/InitEvent.java similarity index 96% rename from ccm-core/src/main/java/org/libreccm/core/modules/InitEvent.java rename to ccm-core/src/main/java/org/libreccm/modules/InitEvent.java index 223f4976a..9b645bed5 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/InitEvent.java +++ b/ccm-core/src/main/java/org/libreccm/modules/InitEvent.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/InstallEvent.java b/ccm-core/src/main/java/org/libreccm/modules/InstallEvent.java similarity index 96% rename from ccm-core/src/main/java/org/libreccm/core/modules/InstallEvent.java rename to ccm-core/src/main/java/org/libreccm/modules/InstallEvent.java index b21c0ea7d..d7ec7aa18 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/InstallEvent.java +++ b/ccm-core/src/main/java/org/libreccm/modules/InstallEvent.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/InstalledModule.java b/ccm-core/src/main/java/org/libreccm/modules/InstalledModule.java similarity index 99% rename from ccm-core/src/main/java/org/libreccm/core/modules/InstalledModule.java rename to ccm-core/src/main/java/org/libreccm/modules/InstalledModule.java index 8be9c8308..a6d0c3c39 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/InstalledModule.java +++ b/ccm-core/src/main/java/org/libreccm/modules/InstalledModule.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import java.io.Serializable; import java.util.Objects; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/IntegrationException.java b/ccm-core/src/main/java/org/libreccm/modules/IntegrationException.java similarity index 97% rename from ccm-core/src/main/java/org/libreccm/core/modules/IntegrationException.java rename to ccm-core/src/main/java/org/libreccm/modules/IntegrationException.java index aedf0ac38..8aca60f46 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/IntegrationException.java +++ b/ccm-core/src/main/java/org/libreccm/modules/IntegrationException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/Module.java b/ccm-core/src/main/java/org/libreccm/modules/Module.java similarity index 98% rename from ccm-core/src/main/java/org/libreccm/core/modules/Module.java rename to ccm-core/src/main/java/org/libreccm/modules/Module.java index fbd6b12a2..e5383871f 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/Module.java +++ b/ccm-core/src/main/java/org/libreccm/modules/Module.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleEvent.java b/ccm-core/src/main/java/org/libreccm/modules/ModuleEvent.java similarity index 97% rename from ccm-core/src/main/java/org/libreccm/core/modules/ModuleEvent.java rename to ccm-core/src/main/java/org/libreccm/modules/ModuleEvent.java index 99171f3ad..9428d73fd 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleEvent.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ModuleEvent.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import javax.persistence.EntityManager; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleInfo.java b/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java similarity index 99% rename from ccm-core/src/main/java/org/libreccm/core/modules/ModuleInfo.java rename to ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java index b937ed102..033fec90c 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleInfo.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ModuleInfo.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import java.io.IOException; import java.io.InputStream; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleManager.java b/ccm-core/src/main/java/org/libreccm/modules/ModuleManager.java similarity index 99% rename from ccm-core/src/main/java/org/libreccm/core/modules/ModuleManager.java rename to ccm-core/src/main/java/org/libreccm/modules/ModuleManager.java index 486947452..bf4d63a7c 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleManager.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ModuleManager.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import java.io.IOException; import java.io.InputStream; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleManagerException.java b/ccm-core/src/main/java/org/libreccm/modules/ModuleManagerException.java similarity index 97% rename from ccm-core/src/main/java/org/libreccm/core/modules/ModuleManagerException.java rename to ccm-core/src/main/java/org/libreccm/modules/ModuleManagerException.java index 45640304a..ea76080c7 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleManagerException.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ModuleManagerException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleStatus.java b/ccm-core/src/main/java/org/libreccm/modules/ModuleStatus.java similarity index 97% rename from ccm-core/src/main/java/org/libreccm/core/modules/ModuleStatus.java rename to ccm-core/src/main/java/org/libreccm/modules/ModuleStatus.java index d6f6cc0b8..15e9d69c3 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/ModuleStatus.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ModuleStatus.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * Enumeration describing the status of a module. diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/RequiredModule.java b/ccm-core/src/main/java/org/libreccm/modules/RequiredModule.java similarity index 96% rename from ccm-core/src/main/java/org/libreccm/core/modules/RequiredModule.java rename to ccm-core/src/main/java/org/libreccm/modules/RequiredModule.java index 51fcb933f..216ac9eb3 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/RequiredModule.java +++ b/ccm-core/src/main/java/org/libreccm/modules/RequiredModule.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/ShutdownEvent.java b/ccm-core/src/main/java/org/libreccm/modules/ShutdownEvent.java similarity index 96% rename from ccm-core/src/main/java/org/libreccm/core/modules/ShutdownEvent.java rename to ccm-core/src/main/java/org/libreccm/modules/ShutdownEvent.java index 3c081bb01..b7d5f082d 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/ShutdownEvent.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ShutdownEvent.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/TreeNode.java b/ccm-core/src/main/java/org/libreccm/modules/TreeNode.java similarity index 99% rename from ccm-core/src/main/java/org/libreccm/core/modules/TreeNode.java rename to ccm-core/src/main/java/org/libreccm/modules/TreeNode.java index 8c61d37cb..80418658b 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/TreeNode.java +++ b/ccm-core/src/main/java/org/libreccm/modules/TreeNode.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import java.util.ArrayList; import java.util.Collections; diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/UnInstallEvent.java b/ccm-core/src/main/java/org/libreccm/modules/UnInstallEvent.java similarity index 96% rename from ccm-core/src/main/java/org/libreccm/core/modules/UnInstallEvent.java rename to ccm-core/src/main/java/org/libreccm/modules/UnInstallEvent.java index 5fea1cdfc..342506d2c 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/UnInstallEvent.java +++ b/ccm-core/src/main/java/org/libreccm/modules/UnInstallEvent.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; /** * diff --git a/ccm-core/src/main/resources/META-INF/persistence.xml b/ccm-core/src/main/resources/META-INF/persistence.xml index 7a632f53d..3b1142797 100644 --- a/ccm-core/src/main/resources/META-INF/persistence.xml +++ b/ccm-core/src/main/resources/META-INF/persistence.xml @@ -19,9 +19,7 @@ --> org.hibernate.jpa.HibernatePersistenceProvider - - java:/comp/env/jdbc/ccm-core/db - + java:/comp/env/jdbc/ccm-core/db diff --git a/ccm-core/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator b/ccm-core/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator index c5ee23bd2..2554770e4 100644 --- a/ccm-core/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator +++ b/ccm-core/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator @@ -1 +1 @@ -org.libreccm.core.modules.CcmIntegrator \ No newline at end of file +org.libreccm.modules.CcmIntegrator \ No newline at end of file diff --git a/ccm-core/src/main/resources/META-INF/services/org.libreccm.core.modules.CcmModule b/ccm-core/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule similarity index 100% rename from ccm-core/src/main/resources/META-INF/services/org.libreccm.core.modules.CcmModule rename to ccm-core/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/CcmModulesTest.java b/ccm-core/src/test/java/org/libreccm/core/modules/CcmModulesTest.java deleted file mode 100644 index 10ea98e0a..000000000 --- a/ccm-core/src/test/java/org/libreccm/core/modules/CcmModulesTest.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (C) 2015 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 org.libreccm.core.modules; - -import static org.hamcrest.CoreMatchers.*; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.persistence.PersistenceTest; -import org.jboss.arquillian.transaction.api.annotation.TransactionMode; -import org.jboss.arquillian.transaction.api.annotation.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.libreccm.core.CcmCore; -import org.libreccm.tests.categories.IntegrationTest; - -import java.io.File; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.sql.DataSource; -import org.jboss.arquillian.persistence.CreateSchema; - -import static org.junit.Assert.*; - -/** - * - * @author Jens Pelzetter - */ -//@Category(IntegrationTest.class) -@RunWith(Arquillian.class) -@PersistenceTest -@Transactional(TransactionMode.COMMIT) -@CreateSchema({"clearup_schema.sql"}) -public class CcmModulesTest { - - @PersistenceContext(name = "LibreCCM") - private transient EntityManager entityManager; - - public CcmModulesTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - @Deployment - public static WebArchive createDeployment() { - final PomEquippedResolveStage pom = Maven - .resolver() - .loadPomFromFile("pom.xml"); - final PomEquippedResolveStage dependencies = pom - .importCompileAndRuntimeDependencies(); - final File[] libs = dependencies.resolve().withTransitivity().asFile(); - - for (File lib : libs) { - System.err.printf("Adding file '%s' to test archive...%n", - lib.getName()); - } - - return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-org.libreccm.core.modules.CcmModulesTest.war") - .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()). - addPackage(org.libreccm.categorization.Category.class. - getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.core.CcmCore.class.getPackage()) - .addPackage(org.libreccm.core.authentication.LoginManager.class. - getPackage()) - .addPackage(org.libreccm.core.modules.CcmModule.class. - getPackage()) - .addPackage(org.libreccm.formbuilder.Component.class. - getPackage()) - .addPackage( - org.libreccm.formbuilder.actions.ConfirmEmailListener.class. - getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class. - getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()). - addPackage(org.libreccm.messaging.Message.class.getPackage()) - .addPackage(org.libreccm.notification.Notification.class. - getPackage()) - .addPackage(org.libreccm.portal.Portal.class.getPackage()) - .addPackage(org.libreccm.runtime.Initalizer.class.getPackage()) - .addPackage(org.libreccm.search.lucene.Document.class. - getPackage()) - .addPackage(org.libreccm.web.Application.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class. - getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - .addAsLibraries(libs) - .addAsResource("test-persistence.xml", - "META-INF/persistence.xml") - .addAsWebInfResource("test-web.xml", "web.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") - .addAsResource( - "META-INF/services/org.hibernate.integrator.spi.Integrator"). - addAsResource( - "META-INF/services/org.libreccm.core.modules.CcmModule") - .addAsResource( - "module-info/org.libreccm.core.CcmCore.properties") - .addAsResource("db") - .addAsResource("ccm-core.config"); - - } - - @Test - public void verifyModules() throws SQLException { - final Object dataSourceObj = entityManager.getEntityManagerFactory() - .getProperties().get("javax.persistence.jtaDataSource"); - - assertThat(dataSourceObj, is(instanceOf(DataSource.class))); - - final DataSource dataSource = (DataSource) dataSourceObj; - final Connection connection = dataSource.getConnection(); - - assertThat(connection, is(instanceOf(Connection.class))); - - final ResultSet ccmObjectTable = connection.getMetaData() - .getTables(null, "ccm_core", "ccm_objects", null); - if (!ccmObjectTable.next()) { - fail("No metadata for table ccm_core.ccm_objects returned. " - + "Table does not exist?"); - } - - final ResultSet installedModulesTable = connection.getMetaData() - .getTables(null, "ccm_core", "installed_modules", null); - if (!installedModulesTable.next()) { - fail("No metadata for table ccm_core.installed_modules returned. " - + "Table does not exist?"); - } - - final Statement statement = connection.createStatement(); - final ResultSet installedModules = statement.executeQuery( - "SELECT module_id, module_class_name, status " - + "FROM ccm_core.installed_modules" - + " ORDER BY module_class_name"); - final List modulesList = new ArrayList<>(); - while (installedModules.next()) { - createInstalledModuleListEntry(installedModules, modulesList); - } - - assertThat(modulesList.size(), is(1)); - - assertThat(modulesList.get(0)[0], - is(equalTo(Integer.toString(CcmCore.class.getName(). - hashCode())))); - assertThat(modulesList.get(0)[1], - is(equalTo(CcmCore.class.getName()))); - assertThat(modulesList.get(0)[2], - is(equalTo(ModuleStatus.INSTALLED.toString()))); - - } - - private void createInstalledModuleListEntry( - final ResultSet resultSet, final List modulesList) - throws SQLException { - - final String[] moduleData = new String[3]; - moduleData[0] = Integer.toString(resultSet.getInt("module_id")); - moduleData[1] = resultSet.getString("module_class_name"); - moduleData[2] = resultSet.getString("status"); - - modulesList.add(moduleData); - } - -} diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleA.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleA.java index 97e4f0b3f..11bbd07dc 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleA.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleA.java @@ -18,13 +18,13 @@ */ package org.libreccm.core.modules.dependencytree.test.cycle; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.RequiredModule; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; /** * diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleB.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleB.java index ca33a4349..595229fda 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleB.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleB.java @@ -18,13 +18,13 @@ */ package org.libreccm.core.modules.dependencytree.test.cycle; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.RequiredModule; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; /** * diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleC.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleC.java index 51fe01c4a..aeaba6e23 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleC.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleC.java @@ -18,13 +18,13 @@ */ package org.libreccm.core.modules.dependencytree.test.cycle; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.RequiredModule; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; /** * diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleRoot.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleRoot.java index 4fea48939..394caefa0 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleRoot.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleRoot.java @@ -18,13 +18,13 @@ */ package org.libreccm.core.modules.dependencytree.test.cycle; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.RequiredModule; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; /** * diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleA.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleA.java index f9a5a66ed..6e741d8c4 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleA.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleA.java @@ -18,13 +18,13 @@ */ package org.libreccm.core.modules.dependencytree.test.valid; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.RequiredModule; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; /** * diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleB.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleB.java index b61f9b884..31510ca10 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleB.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleB.java @@ -18,13 +18,13 @@ */ package org.libreccm.core.modules.dependencytree.test.valid; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.RequiredModule; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; /** * diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleC.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleC.java index 2c8bf717a..b7dbad0e0 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleC.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleC.java @@ -18,13 +18,13 @@ */ package org.libreccm.core.modules.dependencytree.test.valid; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.RequiredModule; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; /** * diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleRoot.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleRoot.java index c7083a95f..35b7276b6 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleRoot.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleRoot.java @@ -18,12 +18,12 @@ */ package org.libreccm.core.modules.dependencytree.test.valid; -import org.libreccm.core.modules.CcmModule; -import org.libreccm.core.modules.InitEvent; -import org.libreccm.core.modules.InstallEvent; -import org.libreccm.core.modules.Module; -import org.libreccm.core.modules.ShutdownEvent; -import org.libreccm.core.modules.UnInstallEvent; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.Module; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.UnInstallEvent; /** diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/ComparableVersionTest.java b/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java similarity index 99% rename from ccm-core/src/test/java/org/libreccm/core/modules/ComparableVersionTest.java rename to ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java index 09ddbbf9b..b1efc5e25 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/ComparableVersionTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/ComparableVersionTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; import org.apache.maven.artifact.versioning.ComparableVersion; diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerCycleTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java similarity index 91% rename from ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerCycleTest.java rename to ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java index c986cf3c9..10c9ac597 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerCycleTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java @@ -16,7 +16,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; + +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.Module; +import org.libreccm.modules.ModuleStatus; +import org.libreccm.modules.TreeNode; +import org.libreccm.modules.DependencyException; +import org.libreccm.modules.UnInstallEvent; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.ModuleInfo; +import org.libreccm.modules.IntegrationException; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.DependencyTreeManager; import static org.hamcrest.Matchers.*; diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java similarity index 91% rename from ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerTest.java rename to ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java index 6a2a4a47d..8e629b157 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java @@ -16,8 +16,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; +import org.libreccm.modules.CcmModule; +import org.libreccm.modules.Module; +import org.libreccm.modules.ModuleStatus; +import org.libreccm.modules.TreeNode; +import org.libreccm.modules.DependencyException; +import org.libreccm.modules.UnInstallEvent; +import org.libreccm.modules.InitEvent; +import org.libreccm.modules.ShutdownEvent; +import org.libreccm.modules.ModuleInfo; +import org.libreccm.modules.IntegrationException; +import org.libreccm.modules.InstallEvent; +import org.libreccm.modules.RequiredModule; +import org.libreccm.modules.DependencyTreeManager; import org.libreccm.core.modules.dependencytree.test.valid.TestModuleB; import org.libreccm.core.modules.dependencytree.test.valid.TestModuleC; import org.libreccm.core.modules.dependencytree.test.valid.TestModuleA; diff --git a/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerValidateVersionTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java similarity index 98% rename from ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerValidateVersionTest.java rename to ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java index e1ed72dfb..0cbc4425e 100644 --- a/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerValidateVersionTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.core.modules; +package org.libreccm.modules; + +import org.libreccm.modules.DependencyTreeManager; import static org.hamcrest.Matchers.*; diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index de5e77c8e..4177655d6 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -192,6 +192,7 @@ org.libreccm + src/main/resources/persistence-build.xml true diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceImpl.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceImpl.java index ff02d1f67..96ec7a2d9 100644 --- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceImpl.java +++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/ResourceImpl.java @@ -21,12 +21,14 @@ package org.libreccm.docrepo; import org.hibernate.validator.constraints.NotBlank; import org.libreccm.core.CcmObject; +import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; -import java.sql.Date; + /** * diff --git a/ccm-docrepo/src/main/resources/persistence-build.xml b/ccm-docrepo/src/main/resources/persistence-build.xml new file mode 100644 index 000000000..3b1142797 --- /dev/null +++ b/ccm-docrepo/src/main/resources/persistence-build.xml @@ -0,0 +1,41 @@ + + + + + + + + + org.hibernate.jpa.HibernatePersistenceProvider + + java:/comp/env/jdbc/ccm-core/db + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-test-bundle-wildfly8/src/test/java/org/libreccm/CcmModulesTest.java b/ccm-test-bundle-wildfly8/src/test/java/org/libreccm/CcmModulesTest.java index c9f9b9fae..592c0532d 100644 --- a/ccm-test-bundle-wildfly8/src/test/java/org/libreccm/CcmModulesTest.java +++ b/ccm-test-bundle-wildfly8/src/test/java/org/libreccm/CcmModulesTest.java @@ -45,8 +45,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact; import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage; -import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinates; -import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependencyExclusion; import org.junit.After; import org.junit.AfterClass; @@ -59,7 +57,7 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.core.CcmCore; import org.libreccm.core.User; -import org.libreccm.core.modules.ModuleStatus; +import org.libreccm.modules.ModuleStatus; import org.libreccm.tests.categories.IntegrationTest; import javax.persistence.TypedQuery; diff --git a/src/site/apt/entities.apt b/src/site/apt/entities.apt index d9f088808..00899178c 100644 --- a/src/site/apt/entities.apt +++ b/src/site/apt/entities.apt @@ -20,11 +20,11 @@ How JPA is used in LibreCCM Usually we customise the table name to use underscores instead of camel case in the database. Also we usually customise the names of columns the use underscores. - + <> - + For examples look at the various examples in the code. Each entity may be accompanied by one or two helper classes. There should diff --git a/src/site/apt/module-system.apt b/src/site/apt/module-system.apt index a940301dc..33a904fb2 100644 --- a/src/site/apt/module-system.apt +++ b/src/site/apt/module-system.apt @@ -8,4 +8,9 @@ The module system of LibreCCM - Lorem ipsum \ No newline at end of file + The functionality of LibreCCM is organised in modules which can bundled to + serve specific needs. The bundling is done by special modules which packaged + as WAR files. A module itself is packaged as JAR file. + + The module system provides several features like automatic database + migrations. \ No newline at end of file