From 0d967f68325f27c132f463c0678260dc5a30ef4b Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 26 Aug 2015 18:57:22 +0000 Subject: [PATCH] CCM NG: Some cleanup, some files for testing the module system git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3590 8810af33-2d31-482b-a856-94f89814c4df --- .../org/libreccm/core/modules/CcmModule.java | 1 - .../modules}/ComparableVersionTest.java | 2 +- .../DependencyTreeManagerCycleTest.java | 32 +++++++---------- .../modules}/DependencyTreeManagerTest.java | 35 ++++++++----------- ...endencyTreeManagerValidateVersionTest.java | 2 +- .../test/cycle/TestModuleA.java | 28 ++++++++------- .../test/cycle}/TestModuleB.java | 27 +++++++------- .../test/cycle}/TestModuleC.java | 29 ++++++++------- .../test/cycle/TestModuleRoot.java | 25 +++++++------ .../test/valid/TestModuleA.java | 27 +++++++------- .../test/valid}/TestModuleB.java | 28 ++++++++------- .../test/valid}/TestModuleC.java | 30 ++++++++-------- .../test/valid/TestModuleRoot.java | 25 ++++++++----- .../module-a.properties | 4 +++ .../module-b.properties | 4 +++ .../module-c.properties | 4 +++ .../module-root.properties | 4 +++ .../module-a.properties | 4 +++ .../module-b.properties | 4 +++ .../module-c.properties | 4 +++ .../module-root.properties | 4 +++ .../module-a | 1 + .../module-b | 1 + .../module-c | 1 + .../module-root | 1 + .../dependency-tree-manager-test/module-a | 1 + .../dependency-tree-manager-test/module-b | 1 + .../dependency-tree-manager-test/module-c | 1 + .../dependency-tree-manager-test/module-root | 1 + 29 files changed, 191 insertions(+), 140 deletions(-) rename ccm-core/src/test/java/org/libreccm/{modules/dependencytree => core/modules}/ComparableVersionTest.java (98%) rename ccm-core/src/test/java/org/libreccm/{modules/dependencytree => core/modules}/DependencyTreeManagerCycleTest.java (80%) rename ccm-core/src/test/java/org/libreccm/{modules/dependencytree => core/modules}/DependencyTreeManagerTest.java (79%) rename ccm-core/src/test/java/org/libreccm/{modules/dependencytree => core/modules}/DependencyTreeManagerValidateVersionTest.java (99%) rename ccm-core/src/test/java/org/libreccm/{ => core}/modules/dependencytree/test/cycle/TestModuleA.java (59%) rename ccm-core/src/test/java/org/libreccm/{modules/dependencytree/test/valid => core/modules/dependencytree/test/cycle}/TestModuleB.java (59%) rename ccm-core/src/test/java/org/libreccm/{modules/dependencytree/test/valid => core/modules/dependencytree/test/cycle}/TestModuleC.java (57%) rename ccm-core/src/test/java/org/libreccm/{ => core}/modules/dependencytree/test/cycle/TestModuleRoot.java (63%) rename ccm-core/src/test/java/org/libreccm/{ => core}/modules/dependencytree/test/valid/TestModuleA.java (58%) rename ccm-core/src/test/java/org/libreccm/{modules/dependencytree/test/cycle => core/modules/dependencytree/test/valid}/TestModuleB.java (58%) rename ccm-core/src/test/java/org/libreccm/{modules/dependencytree/test/cycle => core/modules/dependencytree/test/valid}/TestModuleC.java (56%) rename ccm-core/src/test/java/org/libreccm/{ => core}/modules/dependencytree/test/valid/TestModuleRoot.java (63%) create mode 100644 ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-a.properties create mode 100644 ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-b.properties create mode 100644 ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-c.properties create mode 100644 ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-root.properties create mode 100644 ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-a.properties create mode 100644 ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-b.properties create mode 100644 ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-c.properties create mode 100644 ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-root.properties create mode 100644 ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-a create mode 100644 ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-b create mode 100644 ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-c create mode 100644 ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-root create mode 100644 ccm-core/src/test/resources/services/dependency-tree-manager-test/module-a create mode 100644 ccm-core/src/test/resources/services/dependency-tree-manager-test/module-b create mode 100644 ccm-core/src/test/resources/services/dependency-tree-manager-test/module-c create mode 100644 ccm-core/src/test/resources/services/dependency-tree-manager-test/module-root diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/CcmModule.java b/ccm-core/src/main/java/org/libreccm/core/modules/CcmModule.java index 4e65d601f..919d8904c 100644 --- a/ccm-core/src/main/java/org/libreccm/core/modules/CcmModule.java +++ b/ccm-core/src/main/java/org/libreccm/core/modules/CcmModule.java @@ -19,7 +19,6 @@ package org.libreccm.core.modules; import javax.persistence.EntityManager; -import org.libreccm.modules.ModuleManager; /** * This interface is implemented by all CCM module classes. It defines several diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/ComparableVersionTest.java b/ccm-core/src/test/java/org/libreccm/core/modules/ComparableVersionTest.java similarity index 98% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/ComparableVersionTest.java rename to ccm-core/src/test/java/org/libreccm/core/modules/ComparableVersionTest.java index 70e8b7661..09ddbbf9b 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/ComparableVersionTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/ComparableVersionTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree; +package org.libreccm.core.modules; import org.apache.maven.artifact.versioning.ComparableVersion; diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerCycleTest.java b/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerCycleTest.java similarity index 80% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerCycleTest.java rename to ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerCycleTest.java index 21ef69a14..6f16fa22c 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerCycleTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerCycleTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree; +package org.libreccm.core.modules; import static org.hamcrest.Matchers.*; @@ -38,20 +38,17 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.annotations.Module; -import org.libreccm.modules.dependencytree.test.cycle.TestModuleA; -import org.libreccm.modules.dependencytree.test.cycle.TestModuleB; -import org.libreccm.modules.dependencytree.test.cycle.TestModuleC; -import org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot; +import org.libreccm.core.modules.dependencytree.test.cycle.TestModuleA; +import org.libreccm.core.modules.dependencytree.test.cycle.TestModuleB; +import org.libreccm.core.modules.dependencytree.test.cycle.TestModuleC; +import org.libreccm.core.modules.dependencytree.test.cycle.TestModuleRoot; import org.libreccm.tests.categories.IntegrationTest; import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.ServiceLoader; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; /** * @@ -61,9 +58,7 @@ import javax.inject.Inject; @RunWith(Arquillian.class) public class DependencyTreeManagerCycleTest { - @Inject - @Module - private transient Instance modules; + private transient ServiceLoader modules; public DependencyTreeManagerCycleTest() { } @@ -78,6 +73,7 @@ public class DependencyTreeManagerCycleTest { @Before public void setUp() { + modules = ServiceLoader.load(CcmModule.class); } @After @@ -106,11 +102,9 @@ public class DependencyTreeManagerCycleTest { .getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) - .addPackage( - org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot.class + .addPackage(org.libreccm.core.modules.dependencytree.test.cycle.TestModuleRoot.class .getPackage()) - .addClass(org.libreccm.modules.ModuleDescriptor.class) - .addClass(org.libreccm.modules.ModuleUtil.class) + .addPackage(CcmModule.class.getPackage()) .addAsLibraries(libs) .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); @@ -119,9 +113,9 @@ public class DependencyTreeManagerCycleTest { @Test @SuppressWarnings("unchecked") public void allModulesInjected() { - final List> moduleList = new ArrayList<>(); - for (final ModuleDescriptor module : modules) { - moduleList.add((Class) module.getClass()); + final List> moduleList = new ArrayList<>(); + for (final CcmModule module : modules) { + moduleList.add((Class) module.getClass()); } assertThat(moduleList.size(), is(4)); diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerTest.java b/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerTest.java similarity index 79% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerTest.java rename to ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerTest.java index d13e8d647..7484db8c3 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerTest.java @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree; +package org.libreccm.core.modules; -import org.libreccm.modules.dependencytree.test.valid.TestModuleB; -import org.libreccm.modules.dependencytree.test.valid.TestModuleC; -import org.libreccm.modules.dependencytree.test.valid.TestModuleA; -import org.libreccm.modules.dependencytree.test.valid.TestModuleRoot; +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; +import org.libreccm.core.modules.dependencytree.test.valid.TestModuleRoot; import static org.hamcrest.Matchers.*; @@ -42,17 +42,13 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.ModuleUtil; -import org.libreccm.modules.annotations.Module; import org.libreccm.tests.categories.IntegrationTest; import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.ServiceLoader; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; /** * @@ -62,9 +58,7 @@ import javax.inject.Inject; @RunWith(Arquillian.class) public class DependencyTreeManagerTest { - @Inject - @Module - private transient Instance modules; + private transient ServiceLoader modules; public DependencyTreeManagerTest() { } @@ -79,6 +73,7 @@ public class DependencyTreeManagerTest { @Before public void setUp() { + modules = ServiceLoader.load(CcmModule.class); } @After @@ -107,11 +102,9 @@ public class DependencyTreeManagerTest { .getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) - .addPackage( - org.libreccm.modules.dependencytree.test.valid.TestModuleRoot.class + .addPackage(org.libreccm.core.modules.dependencytree.test.valid.TestModuleRoot.class .getPackage()) - .addClass(org.libreccm.modules.ModuleDescriptor.class) - .addClass(org.libreccm.modules.ModuleUtil.class) + .addPackage(CcmModule.class.getPackage()) .addAsLibraries(libs) .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); @@ -120,9 +113,9 @@ public class DependencyTreeManagerTest { @Test @SuppressWarnings("unchecked") public void allModulesInjected() { - final List> moduleList = new ArrayList<>(); - for (final ModuleDescriptor module : modules) { - moduleList.add((Class) module.getClass()); + final List> moduleList = new ArrayList<>(); + for (final CcmModule module : modules) { + moduleList.add((Class) module.getClass()); } assertThat(moduleList.size(), is(4)); @@ -141,7 +134,7 @@ public class DependencyTreeManagerTest { final List modulesInOrder = new ArrayList<>(); for (final TreeNode node : ordered) { - modulesInOrder.add(ModuleUtil.getModuleName(node.getModule())); + modulesInOrder.add(node.getModuleInfo().getModuleName()); } assertThat(modulesInOrder, diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerValidateVersionTest.java b/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerValidateVersionTest.java similarity index 99% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerValidateVersionTest.java rename to ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerValidateVersionTest.java index acbaa845b..e1ed72dfb 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerValidateVersionTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerValidateVersionTest.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree; +package org.libreccm.core.modules; import static org.hamcrest.Matchers.*; diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleA.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleA.java similarity index 59% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleA.java rename to ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleA.java index 44375017a..97e4f0b3f 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleA.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleA.java @@ -16,39 +16,41 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree.test.cycle; +package org.libreccm.core.modules.dependencytree.test.cycle; -import org.libreccm.modules.dependencytree.test.valid.*; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.annotations.RequiredModule; +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; /** * * @author Jens Pelzetter */ -@org.libreccm.modules.annotations.Module( - name = "org.libreccm.core.ccm-testmodule-a", version = "1.0.0", - requiredModules = { - @RequiredModule(module = TestModuleRoot.class)}) -public class TestModuleA implements ModuleDescriptor { +@Module(requiredModules = { + @RequiredModule(module = TestModuleRoot.class)}) +public class TestModuleA implements CcmModule { @Override - public void prepare() { + public void install(final InstallEvent event) { //Nothing } @Override - public void uninstall() { + public void init(final InitEvent event) { //Nothing } @Override - public void init() { + public void shutdown(final ShutdownEvent event) { //Nothing } @Override - public void shutdown() { + public void uninstall(final UnInstallEvent event) { //Nothing } diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleB.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleB.java similarity index 59% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleB.java rename to ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleB.java index 9c739a7ad..ca33a4349 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleB.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleB.java @@ -16,38 +16,41 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree.test.valid; +package org.libreccm.core.modules.dependencytree.test.cycle; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.annotations.RequiredModule; +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; /** * * @author Jens Pelzetter */ -@org.libreccm.modules.annotations.Module( - name = "org.libreccm.core.ccm-testmodule-b", version = "1.0.0", - requiredModules = { - @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0")}) -public class TestModuleB implements ModuleDescriptor { +@Module(requiredModules = { + @RequiredModule(module = TestModuleRoot.class)}) +public class TestModuleB implements CcmModule { @Override - public void prepare() { + public void install(final InstallEvent event) { //Nothing } @Override - public void uninstall() { + public void init(final InitEvent event) { //Nothing } @Override - public void init() { + public void shutdown(final ShutdownEvent event) { //Nothing } @Override - public void shutdown() { + public void uninstall(final UnInstallEvent event) { //Nothing } diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleC.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleC.java similarity index 57% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleC.java rename to ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleC.java index c9086e45f..51fe01c4a 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleC.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleC.java @@ -16,39 +16,42 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree.test.valid; +package org.libreccm.core.modules.dependencytree.test.cycle; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.annotations.RequiredModule; +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; /** * * @author Jens Pelzetter */ -@org.libreccm.modules.annotations.Module( - name = "org.libreccm.core.ccm-testmodule-c", version = "1.0.0", - requiredModules = { - @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0"), - @RequiredModule(module = TestModuleA.class, minVersion = "1.0.0")}) -public class TestModuleC implements ModuleDescriptor { +@Module(requiredModules = { + @RequiredModule(module = TestModuleRoot.class), + @RequiredModule(module = TestModuleA.class)}) +public class TestModuleC implements CcmModule { @Override - public void prepare() { + public void install(final InstallEvent event) { //Nothing } @Override - public void uninstall() { + public void init(final InitEvent event) { //Nothing } @Override - public void init() { + public void shutdown(final ShutdownEvent event) { //Nothing } @Override - public void shutdown() { + public void uninstall(final UnInstallEvent event) { //Nothing } diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleRoot.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleRoot.java similarity index 63% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleRoot.java rename to ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleRoot.java index e5c7aa24e..4fea48939 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleRoot.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleRoot.java @@ -16,39 +16,42 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree.test.cycle; +package org.libreccm.core.modules.dependencytree.test.cycle; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.annotations.RequiredModule; +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; /** * * @author Jens Pelzetter */ -@org.libreccm.modules.annotations.Module( - name = "org.libreccm.core.ccm-testmodule-root", - version = "1.0.0", +@Module( requiredModules = { @RequiredModule(module = TestModuleB.class)}) -public class TestModuleRoot implements ModuleDescriptor { +public class TestModuleRoot implements CcmModule { @Override - public void prepare() { + public void install(final InstallEvent event) { //Nothing } @Override - public void uninstall() { + public void init(final InitEvent event) { //Nothing } @Override - public void init() { + public void shutdown(final ShutdownEvent event) { //Nothing } @Override - public void shutdown() { + public void uninstall(final UnInstallEvent event) { //Nothing } diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleA.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleA.java similarity index 58% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleA.java rename to ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleA.java index d7cc355ea..f9a5a66ed 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleA.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleA.java @@ -16,38 +16,41 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree.test.valid; +package org.libreccm.core.modules.dependencytree.test.valid; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.annotations.RequiredModule; +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; /** * * @author Jens Pelzetter */ -@org.libreccm.modules.annotations.Module( - name = "org.libreccm.core.ccm-testmodule-a", version = "1.0.0", - requiredModules = { - @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0")}) -public class TestModuleA implements ModuleDescriptor { +@Module(requiredModules = { + @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0")}) +public class TestModuleA implements CcmModule { @Override - public void prepare() { + public void install(final InstallEvent event) { //Nothing } @Override - public void uninstall() { + public void init(final InitEvent event) { //Nothing } @Override - public void init() { + public void shutdown(final ShutdownEvent event) { //Nothing } @Override - public void shutdown() { + public void uninstall(final UnInstallEvent event) { //Nothing } diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleB.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleB.java similarity index 58% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleB.java rename to ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleB.java index 1ce7922c5..b61f9b884 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleB.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleB.java @@ -16,39 +16,41 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree.test.cycle; +package org.libreccm.core.modules.dependencytree.test.valid; -import org.libreccm.modules.dependencytree.test.valid.*; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.annotations.RequiredModule; +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; /** * * @author Jens Pelzetter */ -@org.libreccm.modules.annotations.Module( - name = "org.libreccm.core.ccm-testmodule-b", version = "1.0.0", - requiredModules = { - @RequiredModule(module = TestModuleRoot.class)}) -public class TestModuleB implements ModuleDescriptor { +@Module(requiredModules = { + @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0")}) +public class TestModuleB implements CcmModule { @Override - public void prepare() { + public void install(final InstallEvent event) { //Nothing } @Override - public void uninstall() { + public void init(final InitEvent event) { //Nothing } @Override - public void init() { + public void shutdown(final ShutdownEvent event) { //Nothing } @Override - public void shutdown() { + public void uninstall(final UnInstallEvent event) { //Nothing } diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleC.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleC.java similarity index 56% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleC.java rename to ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleC.java index a83d97bee..2c8bf717a 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleC.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleC.java @@ -16,40 +16,42 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree.test.cycle; +package org.libreccm.core.modules.dependencytree.test.valid; -import org.libreccm.modules.dependencytree.test.valid.*; -import org.libreccm.modules.ModuleDescriptor; -import org.libreccm.modules.annotations.RequiredModule; +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; /** * * @author Jens Pelzetter */ -@org.libreccm.modules.annotations.Module( - name = "org.libreccm.core.ccm-testmodule-c", version = "1.0.0", - requiredModules = { - @RequiredModule(module = TestModuleRoot.class), - @RequiredModule(module = TestModuleA.class)}) -public class TestModuleC implements ModuleDescriptor { +@Module(requiredModules = { + @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0"), + @RequiredModule(module = TestModuleA.class, minVersion = "1.0.0")}) +public class TestModuleC implements CcmModule { @Override - public void prepare() { + public void install(final InstallEvent event) { //Nothing } @Override - public void uninstall() { + public void init(final InitEvent event) { //Nothing } @Override - public void init() { + public void shutdown(final ShutdownEvent event) { //Nothing } @Override - public void shutdown() { + public void uninstall(final UnInstallEvent event) { //Nothing } diff --git a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleRoot.java b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleRoot.java similarity index 63% rename from ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleRoot.java rename to ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleRoot.java index e95cd48b3..c7083a95f 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleRoot.java +++ b/ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleRoot.java @@ -16,36 +16,43 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.libreccm.modules.dependencytree.test.valid; +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.ModuleDescriptor; /** * * @author Jens Pelzetter */ -@org.libreccm.modules.annotations.Module( - name = "org.libreccm.core.ccm-testmodule-root", version = "1.0.0") -public class TestModuleRoot implements ModuleDescriptor { +@Module +public class TestModuleRoot implements CcmModule { @Override - public void prepare() { + public void install(final InstallEvent event) { //Nothing } @Override - public void uninstall() { + public void init(final InitEvent event) { //Nothing } @Override - public void init() { + public void shutdown(final ShutdownEvent event) { //Nothing } @Override - public void shutdown() { + public void uninstall(final UnInstallEvent event) { //Nothing } + + } diff --git a/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-a.properties b/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-a.properties new file mode 100644 index 000000000..524c52b8d --- /dev/null +++ b/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-a.properties @@ -0,0 +1,4 @@ +groupId=org.libreccm.core.modules.dependencytree.test.cycle +artifactId=test-module-a +version=1.0.0 +build.date=2015-08-26T20:47Z+02:00 \ No newline at end of file diff --git a/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-b.properties b/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-b.properties new file mode 100644 index 000000000..5d4f7ad83 --- /dev/null +++ b/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-b.properties @@ -0,0 +1,4 @@ +groupId=org.libreccm.core.modules.dependencytree.test.cycle +artifactId=test-module-b +version=1.0.0 +build.date=2015-08-26T20:47Z+02:00 \ No newline at end of file diff --git a/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-c.properties b/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-c.properties new file mode 100644 index 000000000..19c7d9b32 --- /dev/null +++ b/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-c.properties @@ -0,0 +1,4 @@ +groupId=org.libreccm.core.modules.dependencytree.test.cycle +artifactId=test-module-c +version=1.0.0 +build.date=2015-08-26T20:47Z+02:00 \ No newline at end of file diff --git a/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-root.properties b/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-root.properties new file mode 100644 index 000000000..54147948e --- /dev/null +++ b/ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-root.properties @@ -0,0 +1,4 @@ +groupId=org.libreccm.core.modules.dependencytree.test.cycle +artifactId=test-module-root +version=1.0.0 +build.date=2015-08-26T20:47+02:00 \ No newline at end of file diff --git a/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-a.properties b/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-a.properties new file mode 100644 index 000000000..4fbbbdb83 --- /dev/null +++ b/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-a.properties @@ -0,0 +1,4 @@ +groupId=org.libreccm.core.modules.dependencytree.test.valid +artifactId=test-module-a +version=1.0.0 +build.date=2015-08-26T20:47Z+02:00 \ No newline at end of file diff --git a/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-b.properties b/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-b.properties new file mode 100644 index 000000000..9b9cb6b3e --- /dev/null +++ b/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-b.properties @@ -0,0 +1,4 @@ +groupId=org.libreccm.core.modules.dependencytree.test.valid +artifactId=test-module-b +version=1.0.0 +build.date=2015-08-26T20:47Z+02:00 \ No newline at end of file diff --git a/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-c.properties b/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-c.properties new file mode 100644 index 000000000..1b7c75c6c --- /dev/null +++ b/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-c.properties @@ -0,0 +1,4 @@ +groupId=org.libreccm.core.modules.dependencytree.test.valid +artifactId=test-module-c +version=1.0.0 +build.date=2015-08-26T20:47Z+02:00 \ No newline at end of file diff --git a/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-root.properties b/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-root.properties new file mode 100644 index 000000000..199a04ec5 --- /dev/null +++ b/ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-root.properties @@ -0,0 +1,4 @@ +groupId=org.libreccm.core.modules.dependencytree.test.valid +artifactId=test-module-root +version=1.0.0 +build.date=2015-08-26T20:47+02:00 \ No newline at end of file diff --git a/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-a b/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-a new file mode 100644 index 000000000..6b280063c --- /dev/null +++ b/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-a @@ -0,0 +1 @@ +org.libreccm.core.modules.dependencytree.test.cycle.TestModuleA \ No newline at end of file diff --git a/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-b b/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-b new file mode 100644 index 000000000..91e539e91 --- /dev/null +++ b/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-b @@ -0,0 +1 @@ +org.libreccm.core.modules.dependencytree.test.cycle.TestModuleB \ No newline at end of file diff --git a/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-c b/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-c new file mode 100644 index 000000000..bad3ad39a --- /dev/null +++ b/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-c @@ -0,0 +1 @@ +org.libreccm.core.modules.dependencytree.test.cycle.TestModuleC \ No newline at end of file diff --git a/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-root b/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-root new file mode 100644 index 000000000..82bf0bc19 --- /dev/null +++ b/ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-root @@ -0,0 +1 @@ +org.libreccm.core.modules.dependencytree.test.cycle.TestModuleRoot \ No newline at end of file diff --git a/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-a b/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-a new file mode 100644 index 000000000..6b356d493 --- /dev/null +++ b/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-a @@ -0,0 +1 @@ +org.libreccm.core.modules.dependencytree.test.valid.TestModuleA \ No newline at end of file diff --git a/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-b b/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-b new file mode 100644 index 000000000..288a3d465 --- /dev/null +++ b/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-b @@ -0,0 +1 @@ +org.libreccm.core.modules.dependencytree.test.valid.TestModuleB \ No newline at end of file diff --git a/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-c b/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-c new file mode 100644 index 000000000..b6521a7ee --- /dev/null +++ b/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-c @@ -0,0 +1 @@ +org.libreccm.core.modules.dependencytree.test.valid.TestModuleC \ No newline at end of file diff --git a/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-root b/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-root new file mode 100644 index 000000000..21cc27429 --- /dev/null +++ b/ccm-core/src/test/resources/services/dependency-tree-manager-test/module-root @@ -0,0 +1 @@ +org.libreccm.core.modules.dependencytree.test.valid.TestModuleRoot \ No newline at end of file