From f1622f872934a0c45aa3dc4ebe34b808e1508239 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Jul 2012 14:14:45 +0000 Subject: [PATCH 1/1] Restructured SLC building git-svn-id: https://svn.argeo.org/slc/trunk@5495 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dep/org.argeo.slc.dep.backend/pom.xml | 20 +++++-------------- .../org.argeo.slc.agent.ext.jdbc/pom.xml | 4 ++-- .../org.argeo.slc.agent.ext.xalan/pom.xml | 4 ++-- .../modules/org.argeo.slc.agent.jms/pom.xml | 4 ++-- .../org.argeo.slc.ext.activemq/pom.xml | 4 ++-- modules/agent/pom.xml | 4 ++-- modules/org.argeo.slc.agent.jcr/pom.xml | 4 ++-- modules/org.argeo.slc.agent/pom.xml | 4 ++-- modules/org.argeo.slc.node.jackrabbit/pom.xml | 4 ++-- .../org.argeo.slc.server.repo.webapp/pom.xml | 4 ++-- modules/org.argeo.slc.server.repo/pom.xml | 4 ++-- modules/server/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 2 -- plugins/org.argeo.slc.client.rcp/pom.xml | 4 ++-- plugins/org.argeo.slc.client.ui.dist/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 -- plugins/org.argeo.slc.client.ui/pom.xml | 10 +++++----- .../org.argeo.slc.support.castor/.classpath | 0 .../org.argeo.slc.support.castor/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../build.properties | 0 .../org.argeo.slc.support.castor/pom.xml | 0 .../execution/PrimitiveFieldHandler.java | 0 .../structure/tree/TreeSPathFieldHandler.java | 0 .../castor/test/tree/StatusFieldHandler.java | 0 .../xml/process/FileSlcExecutionNotifier.java | 0 .../xml/test/tree/XsltReportGenerator.java | 0 .../org/argeo/slc/castor/attachment.xml | 0 .../resources/org/argeo/slc/castor/common.xml | 0 .../org/argeo/slc/castor/execution.xml | 0 .../resources/org/argeo/slc/castor/msg.xml | 0 .../org/argeo/slc/castor/process.xml | 0 .../org/argeo/slc/castor/runtime.xml | 0 .../resources/org/argeo/slc/castor/spring.xml | 0 .../org/argeo/slc/castor/structure.xml | 0 .../resources/org/argeo/slc/castor/test.xml | 0 .../src/site/apt/index.apt | 0 .../slc/castor/AbstractCastorTestCase.java | 0 .../slc/castor/ExecutionAnswerCastorTest.java | 0 .../ExecutionModuleDescriptorCastorTest.java | 0 .../castor/ModularDistributionCastorTest.java | 0 .../slc/castor/ObjectListCastorTest.java | 0 .../castor/SlcAgentDescriptorCastorTest.java | 0 .../slc/castor/SlcExecutionCastorTest.java | 0 .../slc/castor/TreeTestResultCastorTest.java | 0 .../TreeTestResultCollectionCastorTest.java | 0 .../src/test/resources/log4j.properties | 0 .../argeo/slc/castor/applicationContext.xml | 0 runtime/pom.xml | 1 + 49 files changed, 36 insertions(+), 49 deletions(-) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/.classpath (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/.project (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/.settings/org.eclipse.jdt.core.prefs (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/build.properties (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/pom.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/structure/tree/TreeSPathFieldHandler.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/test/tree/StatusFieldHandler.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/process/FileSlcExecutionNotifier.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/test/tree/XsltReportGenerator.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/attachment.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/common.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/runtime.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test.xml (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/site/apt/index.apt (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionAnswerCastorTest.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionModuleDescriptorCastorTest.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ModularDistributionCastorTest.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ObjectListCastorTest.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcExecutionCastorTest.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCastorTest.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCollectionCastorTest.java (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/resources/log4j.properties (100%) rename {legacy/runtime => runtime}/org.argeo.slc.support.castor/src/test/resources/org/argeo/slc/castor/applicationContext.xml (100%) diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml index bb76b3049..6ffb9aae6 100644 --- a/dep/org.argeo.slc.dep.backend/pom.xml +++ b/dep/org.argeo.slc.dep.backend/pom.xml @@ -50,16 +50,6 @@ org.argeo.slc.support.jcr 1.1.3-SNAPSHOT - - org.argeo.slc.runtime - org.argeo.slc.support.activemq - 1.1.3-SNAPSHOT - - - org.argeo.slc.runtime - org.argeo.slc.server - 1.1.3-SNAPSHOT - org.argeo.slc.runtime org.argeo.slc.support.equinox @@ -68,17 +58,17 @@ - org.argeo.slc.modules + org.argeo.slc org.argeo.slc.agent 1.1.3-SNAPSHOT - org.argeo.slc.modules + org.argeo.slc org.argeo.slc.agent.jcr 1.1.3-SNAPSHOT - org.argeo.slc.modules + org.argeo.slc org.argeo.slc.node.jackrabbit 1.1.3-SNAPSHOT @@ -90,12 +80,12 @@ 1.1.3-SNAPSHOT - org.argeo.slc.modules + org.argeo.slc org.argeo.slc.server.repo 1.1.3-SNAPSHOT - org.argeo.slc.modules + org.argeo.slc org.argeo.slc.server.repo.webapp 1.1.3-SNAPSHOT diff --git a/legacy/modules/org.argeo.slc.agent.ext.jdbc/pom.xml b/legacy/modules/org.argeo.slc.agent.ext.jdbc/pom.xml index 929dc59cd..1288c1d53 100644 --- a/legacy/modules/org.argeo.slc.agent.ext.jdbc/pom.xml +++ b/legacy/modules/org.argeo.slc.agent.ext.jdbc/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - agent + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/legacy/modules/org.argeo.slc.agent.ext.xalan/pom.xml b/legacy/modules/org.argeo.slc.agent.ext.xalan/pom.xml index cb8bf1e8c..a74e35482 100644 --- a/legacy/modules/org.argeo.slc.agent.ext.xalan/pom.xml +++ b/legacy/modules/org.argeo.slc.agent.ext.xalan/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - agent + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/legacy/modules/org.argeo.slc.agent.jms/pom.xml b/legacy/modules/org.argeo.slc.agent.jms/pom.xml index d6d154ff5..fb3fd85b7 100644 --- a/legacy/modules/org.argeo.slc.agent.jms/pom.xml +++ b/legacy/modules/org.argeo.slc.agent.jms/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - agent + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/legacy/modules/org.argeo.slc.ext.activemq/pom.xml b/legacy/modules/org.argeo.slc.ext.activemq/pom.xml index b1241927b..185dba271 100644 --- a/legacy/modules/org.argeo.slc.ext.activemq/pom.xml +++ b/legacy/modules/org.argeo.slc.ext.activemq/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - agent + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index 84da38466..52f633ac9 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -6,8 +6,8 @@ 1.1.3-SNAPSHOT .. - org.argeo.slc.modules - agent + org.argeo.slc + modules pom SLC Modules Agent diff --git a/modules/org.argeo.slc.agent.jcr/pom.xml b/modules/org.argeo.slc.agent.jcr/pom.xml index a27eec627..a0b72ae5f 100644 --- a/modules/org.argeo.slc.agent.jcr/pom.xml +++ b/modules/org.argeo.slc.agent.jcr/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - agent + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/modules/org.argeo.slc.agent/pom.xml b/modules/org.argeo.slc.agent/pom.xml index b1b056580..03fdcb0b3 100644 --- a/modules/org.argeo.slc.agent/pom.xml +++ b/modules/org.argeo.slc.agent/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - agent + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/modules/org.argeo.slc.node.jackrabbit/pom.xml b/modules/org.argeo.slc.node.jackrabbit/pom.xml index 4363c321f..4bc021e24 100644 --- a/modules/org.argeo.slc.node.jackrabbit/pom.xml +++ b/modules/org.argeo.slc.node.jackrabbit/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - server + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/modules/org.argeo.slc.server.repo.webapp/pom.xml b/modules/org.argeo.slc.server.repo.webapp/pom.xml index 3f388ea07..880feb097 100644 --- a/modules/org.argeo.slc.server.repo.webapp/pom.xml +++ b/modules/org.argeo.slc.server.repo.webapp/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - server + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/modules/org.argeo.slc.server.repo/pom.xml b/modules/org.argeo.slc.server.repo/pom.xml index 85affbbbd..fb3abbd47 100644 --- a/modules/org.argeo.slc.server.repo/pom.xml +++ b/modules/org.argeo.slc.server.repo/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.argeo.slc.modules - server + org.argeo.slc + modules 1.1.3-SNAPSHOT .. diff --git a/modules/server/pom.xml b/modules/server/pom.xml index 31e8d4d96..fdc177d8c 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -6,8 +6,8 @@ 1.1.3-SNAPSHOT .. - org.argeo.slc.modules - server + org.argeo.slc + modules pom SLC Modules Server diff --git a/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF index 201bff662..03c71a755 100644 --- a/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF @@ -13,6 +13,4 @@ Import-Package: org.argeo.security.ui.rcp, org.argeo.slc.execution, org.argeo.slc.process, org.argeo.slc.runtime, - org.argeo.slc.services, - org.argeo.slc.services.impl Export-Package: org.argeo.slc.client.rcp diff --git a/plugins/org.argeo.slc.client.rcp/pom.xml b/plugins/org.argeo.slc.client.rcp/pom.xml index 62e86094e..bbe2e40ca 100644 --- a/plugins/org.argeo.slc.client.rcp/pom.xml +++ b/plugins/org.argeo.slc.client.rcp/pom.xml @@ -19,12 +19,12 @@ - org.argeo.slc.modules + org.argeo.slc org.argeo.slc.node.jackrabbit 1.1.3-SNAPSHOT - org.argeo.slc.modules + org.argeo.slc org.argeo.slc.agent 1.1.3-SNAPSHOT diff --git a/plugins/org.argeo.slc.client.ui.dist/pom.xml b/plugins/org.argeo.slc.client.ui.dist/pom.xml index 647520d94..5a234bfec 100644 --- a/plugins/org.argeo.slc.client.ui.dist/pom.xml +++ b/plugins/org.argeo.slc.client.ui.dist/pom.xml @@ -38,7 +38,7 @@ 1.1.3-SNAPSHOT - org.argeo.slc.modules + org.argeo.slc org.argeo.slc.server.repo 1.1.3-SNAPSHOT diff --git a/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF index f7ddb7998..07ac629c9 100644 --- a/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF +++ b/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF @@ -43,8 +43,6 @@ Import-Package: javax.jcr;version="2.0.0", org.argeo.slc.msg.test.tree, org.argeo.slc.process, org.argeo.slc.runtime, - org.argeo.slc.services, - org.argeo.slc.services.impl, org.argeo.slc.test, org.eclipse.core.expressions, org.eclipse.ui.forms, diff --git a/plugins/org.argeo.slc.client.ui/pom.xml b/plugins/org.argeo.slc.client.ui/pom.xml index 95c278784..b87c55870 100644 --- a/plugins/org.argeo.slc.client.ui/pom.xml +++ b/plugins/org.argeo.slc.client.ui/pom.xml @@ -36,11 +36,11 @@ 1.1.3-SNAPSHOT - - org.argeo.slc.runtime - org.argeo.slc.server - 1.1.3-SNAPSHOT - + + + + + diff --git a/legacy/runtime/org.argeo.slc.support.castor/.classpath b/runtime/org.argeo.slc.support.castor/.classpath similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/.classpath rename to runtime/org.argeo.slc.support.castor/.classpath diff --git a/legacy/runtime/org.argeo.slc.support.castor/.project b/runtime/org.argeo.slc.support.castor/.project similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/.project rename to runtime/org.argeo.slc.support.castor/.project diff --git a/legacy/runtime/org.argeo.slc.support.castor/.settings/org.eclipse.jdt.core.prefs b/runtime/org.argeo.slc.support.castor/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/.settings/org.eclipse.jdt.core.prefs rename to runtime/org.argeo.slc.support.castor/.settings/org.eclipse.jdt.core.prefs diff --git a/legacy/runtime/org.argeo.slc.support.castor/build.properties b/runtime/org.argeo.slc.support.castor/build.properties similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/build.properties rename to runtime/org.argeo.slc.support.castor/build.properties diff --git a/legacy/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/pom.xml rename to runtime/org.argeo.slc.support.castor/pom.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java rename to runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/structure/tree/TreeSPathFieldHandler.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/structure/tree/TreeSPathFieldHandler.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/structure/tree/TreeSPathFieldHandler.java rename to runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/structure/tree/TreeSPathFieldHandler.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/test/tree/StatusFieldHandler.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/test/tree/StatusFieldHandler.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/test/tree/StatusFieldHandler.java rename to runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/test/tree/StatusFieldHandler.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/process/FileSlcExecutionNotifier.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/process/FileSlcExecutionNotifier.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/process/FileSlcExecutionNotifier.java rename to runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/process/FileSlcExecutionNotifier.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/test/tree/XsltReportGenerator.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/test/tree/XsltReportGenerator.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/test/tree/XsltReportGenerator.java rename to runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/xml/test/tree/XsltReportGenerator.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/attachment.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/attachment.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/attachment.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/attachment.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/common.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/common.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/common.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/common.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/runtime.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/runtime.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/runtime.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/runtime.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test.xml rename to runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test.xml diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/site/apt/index.apt b/runtime/org.argeo.slc.support.castor/src/site/apt/index.apt similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/site/apt/index.apt rename to runtime/org.argeo.slc.support.castor/src/site/apt/index.apt diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionAnswerCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionAnswerCastorTest.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionAnswerCastorTest.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionAnswerCastorTest.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionModuleDescriptorCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionModuleDescriptorCastorTest.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionModuleDescriptorCastorTest.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ExecutionModuleDescriptorCastorTest.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ModularDistributionCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ModularDistributionCastorTest.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ModularDistributionCastorTest.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ModularDistributionCastorTest.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ObjectListCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ObjectListCastorTest.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ObjectListCastorTest.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/ObjectListCastorTest.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcAgentDescriptorCastorTest.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcExecutionCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcExecutionCastorTest.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcExecutionCastorTest.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/SlcExecutionCastorTest.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCastorTest.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCastorTest.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCastorTest.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCollectionCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCollectionCastorTest.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCollectionCastorTest.java rename to runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/TreeTestResultCollectionCastorTest.java diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/resources/log4j.properties b/runtime/org.argeo.slc.support.castor/src/test/resources/log4j.properties similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/resources/log4j.properties rename to runtime/org.argeo.slc.support.castor/src/test/resources/log4j.properties diff --git a/legacy/runtime/org.argeo.slc.support.castor/src/test/resources/org/argeo/slc/castor/applicationContext.xml b/runtime/org.argeo.slc.support.castor/src/test/resources/org/argeo/slc/castor/applicationContext.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.castor/src/test/resources/org/argeo/slc/castor/applicationContext.xml rename to runtime/org.argeo.slc.support.castor/src/test/resources/org/argeo/slc/castor/applicationContext.xml diff --git a/runtime/pom.xml b/runtime/pom.xml index d272adeee..97d206be0 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -22,6 +22,7 @@ org.argeo.slc.support.maven org.argeo.slc.support.jemmy org.argeo.slc.support.jcr + org.argeo.slc.support.castor org.argeo.slc.detached org.argeo.slc.detached.launcher org.argeo.slc.launcher -- 2.39.2