LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

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
pull/2/head
jensp 2015-08-26 18:57:22 +00:00
parent 98d1f02f21
commit 0d967f6832
29 changed files with 191 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-core/src/main/java/org/libreccm/core/modules/CcmModule.java
View File

@ -19,7 +19,6 @@
package org.libreccm.core.modules; package org.libreccm.core.modules;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import org.libreccm.modules.ModuleManager;
/** /**
* This interface is implemented by all CCM module classes. It defines several * This interface is implemented by all CCM module classes. It defines several

2
ccm-core/src/test/java/org/libreccm/modules/dependencytree/ComparableVersionTest.java → ccm-core/src/test/java/org/libreccm/core/modules/ComparableVersionTest.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package org.libreccm.modules.dependencytree; package org.libreccm.core.modules;
import org.apache.maven.artifact.versioning.ComparableVersion; import org.apache.maven.artifact.versioning.ComparableVersion;

32
ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerCycleTest.java → ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerCycleTest.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package org.libreccm.modules.dependencytree; package org.libreccm.core.modules;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
@ -38,20 +38,17 @@ import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.libreccm.modules.ModuleDescriptor; import org.libreccm.core.modules.dependencytree.test.cycle.TestModuleA;
import org.libreccm.modules.annotations.Module; import org.libreccm.core.modules.dependencytree.test.cycle.TestModuleB;
import org.libreccm.modules.dependencytree.test.cycle.TestModuleA; import org.libreccm.core.modules.dependencytree.test.cycle.TestModuleC;
import org.libreccm.modules.dependencytree.test.cycle.TestModuleB; import org.libreccm.core.modules.dependencytree.test.cycle.TestModuleRoot;
import org.libreccm.modules.dependencytree.test.cycle.TestModuleC;
import org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot;
import org.libreccm.tests.categories.IntegrationTest; import org.libreccm.tests.categories.IntegrationTest;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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) @RunWith(Arquillian.class)
public class DependencyTreeManagerCycleTest { public class DependencyTreeManagerCycleTest {
@Inject private transient ServiceLoader<CcmModule> modules;
@Module
private transient Instance<ModuleDescriptor> modules;
public DependencyTreeManagerCycleTest() { public DependencyTreeManagerCycleTest() {
} }
@ -78,6 +73,7 @@ public class DependencyTreeManagerCycleTest {
@Before @Before
public void setUp() { public void setUp() {
modules = ServiceLoader.load(CcmModule.class);
} }
@After @After
@ -106,11 +102,9 @@ public class DependencyTreeManagerCycleTest {
.getPackage()) .getPackage())
.addPackage(org.libreccm.tests.categories.IntegrationTest.class .addPackage(org.libreccm.tests.categories.IntegrationTest.class
.getPackage()) .getPackage())
.addPackage( .addPackage(org.libreccm.core.modules.dependencytree.test.cycle.TestModuleRoot.class
org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot.class
.getPackage()) .getPackage())
.addClass(org.libreccm.modules.ModuleDescriptor.class) .addPackage(CcmModule.class.getPackage())
.addClass(org.libreccm.modules.ModuleUtil.class)
.addAsLibraries(libs) .addAsLibraries(libs)
.addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource("test-web.xml", "web.xml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
@ -119,9 +113,9 @@ public class DependencyTreeManagerCycleTest {
@Test @Test
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void allModulesInjected() { public void allModulesInjected() {
final List<Class<ModuleDescriptor>> moduleList = new ArrayList<>(); final List<Class<CcmModule>> moduleList = new ArrayList<>();
for (final ModuleDescriptor module : modules) { for (final CcmModule module : modules) {
moduleList.add((Class<ModuleDescriptor>) module.getClass()); moduleList.add((Class<CcmModule>) module.getClass());
} }
assertThat(moduleList.size(), is(4)); assertThat(moduleList.size(), is(4));

35
ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerTest.java → ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerTest.java
View File

@ -16,12 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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.core.modules.dependencytree.test.valid.TestModuleB;
import org.libreccm.modules.dependencytree.test.valid.TestModuleC; import org.libreccm.core.modules.dependencytree.test.valid.TestModuleC;
import org.libreccm.modules.dependencytree.test.valid.TestModuleA; import org.libreccm.core.modules.dependencytree.test.valid.TestModuleA;
import org.libreccm.modules.dependencytree.test.valid.TestModuleRoot; import org.libreccm.core.modules.dependencytree.test.valid.TestModuleRoot;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
@ -42,17 +42,13 @@ import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; 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 org.libreccm.tests.categories.IntegrationTest;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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) @RunWith(Arquillian.class)
public class DependencyTreeManagerTest { public class DependencyTreeManagerTest {
@Inject private transient ServiceLoader<CcmModule> modules;
@Module
private transient Instance<ModuleDescriptor> modules;
public DependencyTreeManagerTest() { public DependencyTreeManagerTest() {
} }
@ -79,6 +73,7 @@ public class DependencyTreeManagerTest {
@Before @Before
public void setUp() { public void setUp() {
modules = ServiceLoader.load(CcmModule.class);
} }
@After @After
@ -107,11 +102,9 @@ public class DependencyTreeManagerTest {
.getPackage()) .getPackage())
.addPackage(org.libreccm.tests.categories.IntegrationTest.class .addPackage(org.libreccm.tests.categories.IntegrationTest.class
.getPackage()) .getPackage())
.addPackage( .addPackage(org.libreccm.core.modules.dependencytree.test.valid.TestModuleRoot.class
org.libreccm.modules.dependencytree.test.valid.TestModuleRoot.class
.getPackage()) .getPackage())
.addClass(org.libreccm.modules.ModuleDescriptor.class) .addPackage(CcmModule.class.getPackage())
.addClass(org.libreccm.modules.ModuleUtil.class)
.addAsLibraries(libs) .addAsLibraries(libs)
.addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource("test-web.xml", "web.xml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
@ -120,9 +113,9 @@ public class DependencyTreeManagerTest {
@Test @Test
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void allModulesInjected() { public void allModulesInjected() {
final List<Class<ModuleDescriptor>> moduleList = new ArrayList<>(); final List<Class<CcmModule>> moduleList = new ArrayList<>();
for (final ModuleDescriptor module : modules) { for (final CcmModule module : modules) {
moduleList.add((Class<ModuleDescriptor>) module.getClass()); moduleList.add((Class<CcmModule>) module.getClass());
} }
assertThat(moduleList.size(), is(4)); assertThat(moduleList.size(), is(4));
@ -141,7 +134,7 @@ public class DependencyTreeManagerTest {
final List<String> modulesInOrder = new ArrayList<>(); final List<String> modulesInOrder = new ArrayList<>();
for (final TreeNode node : ordered) { for (final TreeNode node : ordered) {
modulesInOrder.add(ModuleUtil.getModuleName(node.getModule())); modulesInOrder.add(node.getModuleInfo().getModuleName());
} }
assertThat(modulesInOrder, assertThat(modulesInOrder,

2
ccm-core/src/test/java/org/libreccm/modules/dependencytree/DependencyTreeManagerValidateVersionTest.java → ccm-core/src/test/java/org/libreccm/core/modules/DependencyTreeManagerValidateVersionTest.java
View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
package org.libreccm.modules.dependencytree; package org.libreccm.core.modules;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;

28
ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleA.java → ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleA.java
View File

@ -16,39 +16,41 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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.core.modules.CcmModule;
import org.libreccm.modules.ModuleDescriptor; import org.libreccm.core.modules.InitEvent;
import org.libreccm.modules.annotations.RequiredModule; 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@org.libreccm.modules.annotations.Module( @Module(requiredModules = {
name = "org.libreccm.core.ccm-testmodule-a", version = "1.0.0", @RequiredModule(module = TestModuleRoot.class)})
requiredModules = { public class TestModuleA implements CcmModule {
@RequiredModule(module = TestModuleRoot.class)})
public class TestModuleA implements ModuleDescriptor {
@Override @Override
public void prepare() { public void install(final InstallEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void uninstall() { public void init(final InitEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void init() { public void shutdown(final ShutdownEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void shutdown() { public void uninstall(final UnInstallEvent event) {
//Nothing //Nothing
} }

27
ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleB.java → ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleB.java
View File

@ -16,38 +16,41 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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.core.modules.CcmModule;
import org.libreccm.modules.annotations.RequiredModule; 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@org.libreccm.modules.annotations.Module( @Module(requiredModules = {
name = "org.libreccm.core.ccm-testmodule-b", version = "1.0.0", @RequiredModule(module = TestModuleRoot.class)})
requiredModules = { public class TestModuleB implements CcmModule {
@RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0")})
public class TestModuleB implements ModuleDescriptor {
@Override @Override
public void prepare() { public void install(final InstallEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void uninstall() { public void init(final InitEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void init() { public void shutdown(final ShutdownEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void shutdown() { public void uninstall(final UnInstallEvent event) {
//Nothing //Nothing
} }

29
ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleC.java → ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleC.java
View File

@ -16,39 +16,42 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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.core.modules.CcmModule;
import org.libreccm.modules.annotations.RequiredModule; 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@org.libreccm.modules.annotations.Module( @Module(requiredModules = {
name = "org.libreccm.core.ccm-testmodule-c", version = "1.0.0", @RequiredModule(module = TestModuleRoot.class),
requiredModules = { @RequiredModule(module = TestModuleA.class)})
@RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0"), public class TestModuleC implements CcmModule {
@RequiredModule(module = TestModuleA.class, minVersion = "1.0.0")})
public class TestModuleC implements ModuleDescriptor {
@Override @Override
public void prepare() { public void install(final InstallEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void uninstall() { public void init(final InitEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void init() { public void shutdown(final ShutdownEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void shutdown() { public void uninstall(final UnInstallEvent event) {
//Nothing //Nothing
} }

25
ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleRoot.java → ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/cycle/TestModuleRoot.java
View File

@ -16,39 +16,42 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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.core.modules.CcmModule;
import org.libreccm.modules.annotations.RequiredModule; 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@org.libreccm.modules.annotations.Module( @Module(
name = "org.libreccm.core.ccm-testmodule-root",
version = "1.0.0",
requiredModules = { requiredModules = {
@RequiredModule(module = TestModuleB.class)}) @RequiredModule(module = TestModuleB.class)})
public class TestModuleRoot implements ModuleDescriptor { public class TestModuleRoot implements CcmModule {
@Override @Override
public void prepare() { public void install(final InstallEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void uninstall() { public void init(final InitEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void init() { public void shutdown(final ShutdownEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void shutdown() { public void uninstall(final UnInstallEvent event) {
//Nothing //Nothing
} }

27
ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleA.java → ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleA.java
View File

@ -16,38 +16,41 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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.core.modules.CcmModule;
import org.libreccm.modules.annotations.RequiredModule; 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@org.libreccm.modules.annotations.Module( @Module(requiredModules = {
name = "org.libreccm.core.ccm-testmodule-a", version = "1.0.0", @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0")})
requiredModules = { public class TestModuleA implements CcmModule {
@RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0")})
public class TestModuleA implements ModuleDescriptor {
@Override @Override
public void prepare() { public void install(final InstallEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void uninstall() { public void init(final InitEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void init() { public void shutdown(final ShutdownEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void shutdown() { public void uninstall(final UnInstallEvent event) {
//Nothing //Nothing
} }

28
ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleB.java → ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleB.java
View File

@ -16,39 +16,41 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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.core.modules.CcmModule;
import org.libreccm.modules.ModuleDescriptor; import org.libreccm.core.modules.InitEvent;
import org.libreccm.modules.annotations.RequiredModule; 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@org.libreccm.modules.annotations.Module( @Module(requiredModules = {
name = "org.libreccm.core.ccm-testmodule-b", version = "1.0.0", @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0")})
requiredModules = { public class TestModuleB implements CcmModule {
@RequiredModule(module = TestModuleRoot.class)})
public class TestModuleB implements ModuleDescriptor {
@Override @Override
public void prepare() { public void install(final InstallEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void uninstall() { public void init(final InitEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void init() { public void shutdown(final ShutdownEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void shutdown() { public void uninstall(final UnInstallEvent event) {
//Nothing //Nothing
} }

30
ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/cycle/TestModuleC.java → ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleC.java
View File

@ -16,40 +16,42 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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.core.modules.CcmModule;
import org.libreccm.modules.ModuleDescriptor; import org.libreccm.core.modules.InitEvent;
import org.libreccm.modules.annotations.RequiredModule; 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@org.libreccm.modules.annotations.Module( @Module(requiredModules = {
name = "org.libreccm.core.ccm-testmodule-c", version = "1.0.0", @RequiredModule(module = TestModuleRoot.class, minVersion = "1.0.0"),
requiredModules = { @RequiredModule(module = TestModuleA.class, minVersion = "1.0.0")})
@RequiredModule(module = TestModuleRoot.class), public class TestModuleC implements CcmModule {
@RequiredModule(module = TestModuleA.class)})
public class TestModuleC implements ModuleDescriptor {
@Override @Override
public void prepare() { public void install(final InstallEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void uninstall() { public void init(final InitEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void init() { public void shutdown(final ShutdownEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void shutdown() { public void uninstall(final UnInstallEvent event) {
//Nothing //Nothing
} }

25
ccm-core/src/test/java/org/libreccm/modules/dependencytree/test/valid/TestModuleRoot.java → ccm-core/src/test/java/org/libreccm/core/modules/dependencytree/test/valid/TestModuleRoot.java
View File

@ -16,36 +16,43 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@org.libreccm.modules.annotations.Module( @Module
name = "org.libreccm.core.ccm-testmodule-root", version = "1.0.0") public class TestModuleRoot implements CcmModule {
public class TestModuleRoot implements ModuleDescriptor {
@Override @Override
public void prepare() { public void install(final InstallEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void uninstall() { public void init(final InitEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void init() { public void shutdown(final ShutdownEvent event) {
//Nothing //Nothing
} }
@Override @Override
public void shutdown() { public void uninstall(final UnInstallEvent event) {
//Nothing //Nothing
} }
} }

4
ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-a.properties 100644
View File

@ -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

4
ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-b.properties 100644
View File

@ -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

4
ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-c.properties 100644
View File

@ -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

4
ccm-core/src/test/resources/module-info/dependency-tree-manager-cycle-test/module-root.properties 100644
View File

@ -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

4
ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-a.properties 100644
View File

@ -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

4
ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-b.properties 100644
View File

@ -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

4
ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-c.properties 100644
View File

@ -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

4
ccm-core/src/test/resources/module-info/dependency-tree-manager-test/module-root.properties 100644
View File

@ -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

1
ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-a 100644
View File

@ -0,0 +1 @@
org.libreccm.core.modules.dependencytree.test.cycle.TestModuleA

1
ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-b 100644
View File

@ -0,0 +1 @@
org.libreccm.core.modules.dependencytree.test.cycle.TestModuleB

1
ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-c 100644
View File

@ -0,0 +1 @@
org.libreccm.core.modules.dependencytree.test.cycle.TestModuleC

1
ccm-core/src/test/resources/services/dependency-tree-manager-cycle-test/module-root 100644
View File

@ -0,0 +1 @@
org.libreccm.core.modules.dependencytree.test.cycle.TestModuleRoot

1
ccm-core/src/test/resources/services/dependency-tree-manager-test/module-a 100644
View File

@ -0,0 +1 @@
org.libreccm.core.modules.dependencytree.test.valid.TestModuleA

1
ccm-core/src/test/resources/services/dependency-tree-manager-test/module-b 100644
View File

@ -0,0 +1 @@
org.libreccm.core.modules.dependencytree.test.valid.TestModuleB

1
ccm-core/src/test/resources/services/dependency-tree-manager-test/module-c 100644
View File

@ -0,0 +1 @@
org.libreccm.core.modules.dependencytree.test.valid.TestModuleC

1
ccm-core/src/test/resources/services/dependency-tree-manager-test/module-root 100644
View File

@ -0,0 +1 @@
org.libreccm.core.modules.dependencytree.test.valid.TestModuleRoot