From 2f57b9abf7e5110603e8cf952259509c76c9a162 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 22 Nov 2008 18:02:13 +0000 Subject: [PATCH] Refactor package names git-svn-id: https://svn.argeo.org/slc/trunk@1868 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../slc/example/ContextExampleTestDef.java | 4 +- .../slc/example/ExampleDeployedSystem.java | 8 +- .../org/argeo/slc/example/ExampleTask.java | 14 +- .../argeo/slc/example/ExampleTestData.java | 2 +- .../slc/example/SimpleExampleTestDef.java | 11 +- .../src/main/resources/META-INF/MANIFEST.MF | 51 +++--- .../slc/example/appli/SubCategory2Test.java | 2 +- .../slc/example/context/BaseContextTest.java | 2 +- .../slc/example/context/ContextTest.java | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 18 +-- .../slc/ws/ScenarioWsIntegrationTest.java | 4 +- .../slc/ws/SlcExecutionWsIntegrationTest.java | 4 +- runtime/org.argeo.slc.launcher/pom.xml | 2 +- .../main/java/org/argeo/slc/cli/SlcMain.java | 2 +- .../slc/maven/MavenDeployEnvironment.java | 4 +- .../java/org/argeo/slc/maven/MavenFile.java | 4 +- .../org/argeo/slc/maven/MavenManager.java | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 24 +-- .../slc/ant/detached/SlcDetachedTask.java | 2 +- .../lib/detached/DetachedTestDefinition.java | 10 +- .../detached/DetachedXmlConverterSpring.java | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 50 +++--- .../slc/services/test/TestManagerService.java | 2 +- .../test/impl/TestManagerServiceImpl.java | 4 +- .../argeo/slc/web/mvc/XsltMarshallerView.java | 4 +- .../web/mvc/XsltMarshallerViewResolver.java | 2 +- .../process/SlcExecutionListController.java | 2 +- .../process/SlcExecutionViewController.java | 6 +- .../slc/web/mvc/result/ResultExcelView.java | 4 +- .../slc/web/mvc/result/ResultPdfView.java | 4 +- .../web/mvc/result/ResultViewController.java | 6 +- .../web/mvc/result/TestRunViewController.java | 2 +- .../slc/ws/process/SlcExecutionRequestEp.java | 4 +- .../process/SlcExecutionStepsRequestEp.java | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 120 +++++++------- .../argeo/slc/{core => }/SlcException.java | 2 +- .../slc/{core => }/UnsupportedException.java | 2 +- .../slc/{core => }/build/Distribution.java | 2 +- .../argeo/slc/{core => }/build/package.html | 0 .../argeo/slc/core/deploy/DeploymentData.java | 5 - .../org/argeo/slc/core/deploy/TargetData.java | 5 - .../argeo/slc/core/test/BasicTestData.java | 23 --- .../slc/dao/process/SlcExecutionDao.java | 4 +- .../org/argeo/slc/dao/test/TestResultDao.java | 2 +- .../slc/dao/test/TestRunDescriptorDao.java | 2 +- .../deploy/AbstractDeployedSystem.java | 6 +- .../{core => }/deploy/DeployEnvironment.java | 2 +- .../slc/{core => }/deploy/DeployedSystem.java | 4 +- .../deploy/DeployedSystemManager.java | 2 +- .../slc/{core => }/deploy/Deployment.java | 4 +- .../org/argeo/slc/deploy/DeploymentData.java | 5 + .../deploy/InstalledExecutables.java | 2 +- .../java/org/argeo/slc/deploy/TargetData.java | 5 + .../argeo/slc/{core => }/deploy/package.html | 0 .../org/argeo/slc/{core => }/package.html | 0 .../slc/{core => }/process/SlcExecution.java | 2 +- .../{core => }/process/SlcExecutionAware.java | 2 +- .../process/SlcExecutionNotifier.java | 2 +- .../process/SlcExecutionRelated.java | 2 +- .../{core => }/process/SlcExecutionStep.java | 2 +- .../slc/runtime/SlcExecutionContext.java | 2 +- .../{core => }/structure/StructureAware.java | 2 +- .../structure/StructureElement.java | 2 +- .../structure/StructureElementProvider.java | 2 +- .../{core => }/structure/StructurePath.java | 2 +- .../structure/StructureRegistry.java | 2 +- .../slc/{core => }/structure/package.html | 0 .../{core => }/test/ExecutableTestRun.java | 2 +- .../test/IncompatibleTestDataException.java | 4 +- .../argeo/slc/{core => }/test/TestData.java | 2 +- .../slc/{core => }/test/TestDataProvider.java | 2 +- .../slc/{core => }/test/TestDefinition.java | 2 +- .../argeo/slc/{core => }/test/TestReport.java | 2 +- .../argeo/slc/{core => }/test/TestResult.java | 2 +- .../{core => }/test/TestResultListener.java | 2 +- .../slc/{core => }/test/TestResultPart.java | 2 +- .../argeo/slc/{core => }/test/TestRun.java | 6 +- .../slc/{core => }/test/TestRunAware.java | 2 +- .../{core => }/test/TestRunDescriptor.java | 6 +- .../argeo/slc/{core => }/test/TestStatus.java | 2 +- .../slc/{core => }/test/WritableTestRun.java | 4 +- .../{core => }/test/context/ContextAware.java | 2 +- .../test/context/ParentContextAware.java | 2 +- .../slc/{core => }/test/context/package.html | 0 .../argeo/slc/{core => }/test/package.html | 0 .../src/main/resources/META-INF/MANIFEST.MF | 40 +++-- .../argeo/slc/ant/AntExecutionContext.java | 2 +- .../java/org/argeo/slc/ant/AntRunner.java | 2 +- .../org/argeo/slc/ant/AntSlcApplication.java | 6 +- .../java/org/argeo/slc/ant/AntSlcRuntime.java | 4 +- .../slc/ant/SlcExecutionBuildListener.java | 8 +- .../argeo/slc/ant/deploy/SlcDeployTask.java | 8 +- .../argeo/slc/ant/deploy/SlcManagerTask.java | 6 +- .../slc/ant/spring/AbstractSpringTask.java | 2 +- .../org/argeo/slc/ant/spring/ListArg.java | 2 +- .../java/org/argeo/slc/ant/spring/MapArg.java | 2 +- .../org/argeo/slc/ant/spring/SpringArg.java | 2 +- .../argeo/slc/ant/structure/SAwareTask.java | 8 +- .../argeo/slc/ant/test/ParentContextType.java | 6 +- .../slc/ant/test/SlcCloseTestResultTask.java | 4 +- .../org/argeo/slc/ant/test/SlcReportTask.java | 8 +- .../org/argeo/slc/ant/test/SlcTestTask.java | 20 +-- .../ant/unit/MinimalAntClasspathTestCase.java | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 105 ++++++------ .../castor/test/tree/StatusFieldHandler.java | 2 +- .../process/FileSlcExecutionNotifier.java | 5 +- .../core/test/tree/XsltReportGenerator.java | 6 +- .../src/main/resources/META-INF/MANIFEST.MF | 71 ++++---- .../org/argeo/slc/castor/msg/mapping.xml | 4 +- .../org/argeo/slc/castor/process/mapping.xml | 6 +- .../org/argeo/slc/castor/test/mapping.xml | 2 +- .../core/process/SlcExecutionCastorTest.java | 2 + .../process/SlcExecutionDaoHibernate.java | 6 +- .../test/TestRunDescriptorDaoHibernate.java | 2 +- .../test/tree/TreeTestResultDaoHibernate.java | 6 +- .../hibernate/unit/IndependentDbTestCase.java | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 76 ++++----- .../hibernate/process/SlcExecution.hbm.xml | 4 +- .../process/SlcExecutionStep.hbm.xml | 2 +- .../hibernate/test/TestRunDescriptor.hbm.xml | 2 +- .../process/SlcExecutionHibernateTest.java | 4 +- .../tree/TreeTestResultDaoHibernateTest.java | 2 +- .../slc/core/deploy/SimpleExecutables.java | 5 +- .../slc/core/structure/SimpleSElement.java | 1 + .../slc/core/structure/tree/TreeSPath.java | 6 +- .../core/structure/tree/TreeSRegistry.java | 6 +- .../slc/core/structure/tree/TreeSRelated.java | 6 +- .../structure/tree/TreeSRelatedHelper.java | 4 +- .../argeo/slc/core/test/BasicTestData.java | 2 + .../slc/core/test/BasicTestDefinition.java | 9 +- .../argeo/slc/core/test/SimpleResultPart.java | 5 + .../argeo/slc/core/test/SimpleTestResult.java | 5 +- .../argeo/slc/core/test/SimpleTestRun.java | 13 +- .../org/argeo/slc/core/test/SlcTestUtils.java | 3 +- .../argeo/slc/core/test/TestDataUtils.java | 4 +- .../slc/core/test/context/ContextUtils.java | 12 +- .../test/context/DefaultContextTestData.java | 4 +- .../core/test/context/SimpleContextAware.java | 4 +- .../context/SimpleParentContextAware.java | 2 + .../tree/CompositeTreeTestDefinition.java | 14 +- .../argeo/slc/core/test/tree/PartSubList.java | 4 +- .../slc/core/test/tree/TreeTestResult.java | 18 +-- .../core/test/tree/TreeTestResultLogger.java | 6 +- .../slc/dao/test/tree/TreeTestResultDao.java | 2 +- .../test/tree/TreeTestResultPersister.java | 4 +- .../org/argeo/slc/diff/TableDiffPosition.java | 2 +- .../org/argeo/slc/diff/XPathDiffPosition.java | 2 +- .../org/argeo/slc/logging/Log4jUtils.java | 2 +- .../slc/msg/process/SlcExecutionRequest.java | 2 +- .../msg/process/SlcExecutionStepsRequest.java | 2 +- .../tree/CreateTreeTestResultRequest.java | 2 +- .../slc/msg/test/tree/ResultPartRequest.java | 6 +- .../org/argeo/slc/spring/SpringUtils.java | 2 +- .../deploy/HttpdApplicationDeployment.java | 14 +- .../deploy/HttpdApplicationTargetData.java | 4 +- .../argeo/slc/support/deploy/HttpdServer.java | 8 +- .../support/deploy/HttpdServerDeployment.java | 10 +- .../deploy/HttpdServerDeploymentData.java | 2 +- .../support/deploy/HttpdServerManager.java | 4 +- .../support/deploy/HttpdServerTargetData.java | 4 +- .../deploy/SimpleHttpdApplication.java | 4 +- .../slc/support/deploy/WebApplication.java | 2 +- .../argeo/slc/support/deploy/WebServer.java | 2 +- .../support/deploy/db/DbUnitDeployment.java | 14 +- .../deploy/db/DbUnitDeploymentData.java | 4 +- .../support/deploy/db/SimpleJdbcDatabase.java | 2 +- .../slc/unit/AbstractSpringTestCase.java | 2 +- .../unit/process/SlcExecutionTestUtils.java | 4 +- .../test/tree/TreeTestResultTestUtils.java | 14 +- .../slc/unit/test/tree/UnitTestTreeUtil.java | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 153 +++++++++--------- .../slc/core/test/context/ContextTest.java | 5 +- .../WebServiceSlcExecutionNotifier.java | 6 +- .../WebServiceTreeTestResultNotifier.java | 4 +- .../src/main/resources/META-INF/MANIFEST.MF | 50 +++--- .../src/main/resources/META-INF/MANIFEST.MF | 16 +- 176 files changed, 742 insertions(+), 717 deletions(-) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/SlcException.java (88%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/UnsupportedException.java (94%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/build/Distribution.java (64%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/build/package.html (100%) delete mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeploymentData.java delete mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/TargetData.java delete mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/BasicTestData.java rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/deploy/AbstractDeployedSystem.java (78%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/deploy/DeployEnvironment.java (83%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/deploy/DeployedSystem.java (73%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/deploy/DeployedSystemManager.java (77%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/deploy/Deployment.java (74%) create mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeploymentData.java rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/deploy/InstalledExecutables.java (76%) create mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/TargetData.java rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/deploy/package.html (100%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/package.html (100%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/process/SlcExecution.java (93%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/process/SlcExecutionAware.java (70%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/process/SlcExecutionNotifier.java (87%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/process/SlcExecutionRelated.java (77%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/process/SlcExecutionStep.java (92%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/structure/StructureAware.java (84%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/structure/StructureElement.java (80%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/structure/StructureElementProvider.java (69%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/structure/StructurePath.java (86%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/structure/StructureRegistry.java (93%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/structure/package.html (100%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/ExecutableTestRun.java (78%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/IncompatibleTestDataException.java (82%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestData.java (75%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestDataProvider.java (74%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestDefinition.java (84%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestReport.java (86%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestResult.java (91%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestResultListener.java (88%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestResultPart.java (87%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestRun.java (76%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestRunAware.java (75%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestRunDescriptor.java (89%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/TestStatus.java (93%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/WritableTestRun.java (78%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/context/ContextAware.java (86%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/context/ParentContextAware.java (80%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/context/package.html (100%) rename runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/{core => }/test/package.html (100%) diff --git a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ContextExampleTestDef.java b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ContextExampleTestDef.java index 9385a0bdd..ab150a039 100644 --- a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ContextExampleTestDef.java +++ b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ContextExampleTestDef.java @@ -1,10 +1,10 @@ package org.argeo.slc.example; import org.argeo.slc.core.structure.tree.TreeSRelatedHelper; -import org.argeo.slc.core.test.TestDefinition; -import org.argeo.slc.core.test.TestRun; import org.argeo.slc.core.test.context.ContextUtils; import org.argeo.slc.core.test.context.DefaultContextTestData; +import org.argeo.slc.test.TestDefinition; +import org.argeo.slc.test.TestRun; public class ContextExampleTestDef extends TreeSRelatedHelper implements TestDefinition { diff --git a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleDeployedSystem.java b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleDeployedSystem.java index c45801760..c33d4edf0 100644 --- a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleDeployedSystem.java +++ b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleDeployedSystem.java @@ -1,9 +1,9 @@ package org.argeo.slc.example; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.deploy.DeploymentData; -import org.argeo.slc.core.deploy.TargetData; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; import org.argeo.slc.example.appli.ExampleAppli; /** Example deployed sytem. */ diff --git a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleTask.java b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleTask.java index f856b15fd..76e8679f5 100644 --- a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleTask.java +++ b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleTask.java @@ -1,15 +1,15 @@ package org.argeo.slc.example; import org.argeo.slc.core.structure.SimpleSElement; -import org.argeo.slc.core.structure.StructureAware; -import org.argeo.slc.core.structure.StructureElement; -import org.argeo.slc.core.structure.StructureElementProvider; -import org.argeo.slc.core.structure.StructureRegistry; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestDefinition; -import org.argeo.slc.core.test.TestResult; -import org.argeo.slc.core.test.TestRun; +import org.argeo.slc.structure.StructureAware; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.structure.StructureElementProvider; +import org.argeo.slc.structure.StructureRegistry; +import org.argeo.slc.test.TestDefinition; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestRun; /** Example task. */ public class ExampleTask implements StructureAware, TestDefinition, diff --git a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleTestData.java b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleTestData.java index 628df1a8f..e34f3ab37 100644 --- a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleTestData.java +++ b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/ExampleTestData.java @@ -2,7 +2,7 @@ package org.argeo.slc.example; import java.io.File; -import org.argeo.slc.core.test.TestData; +import org.argeo.slc.test.TestData; public class ExampleTestData implements TestData { private File inputFile; diff --git a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/SimpleExampleTestDef.java b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/SimpleExampleTestDef.java index 505623c7f..56d9e42ca 100644 --- a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/SimpleExampleTestDef.java +++ b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/SimpleExampleTestDef.java @@ -7,14 +7,13 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestStatus; -import org.argeo.slc.core.test.TestDefinition; -import org.argeo.slc.core.test.TestResult; -import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.core.test.TestRun; import org.argeo.slc.example.appli.ExampleAppli; +import org.argeo.slc.test.TestDefinition; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestRun; +import org.argeo.slc.test.TestStatus; public class SimpleExampleTestDef implements TestDefinition { private Log log = LogFactory.getLog(SimpleExampleTestDef.class); diff --git a/examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF b/examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF index b6e1396c0..7afbb0974 100644 --- a/examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF +++ b/examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF @@ -1,33 +1,36 @@ Manifest-Version: 1.0 -Export-Package: org.argeo.slc.example.appli;version="0.11.2.SNAPSHOT", - org.argeo.slc.example.ws.client.spring;version="0.11.2.SNAPSHOT",org. - argeo.slc.example;uses:="org.argeo.slc.core.structure,org.argeo.slc.e - xample.appli,org.apache.commons.logging,org.argeo.slc.core.test.conte - xt,org.argeo.slc.core.build,org.argeo.slc.core.deploy,org.argeo.slc.c - ore.test,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT" -Tool: Bnd-0.0.255 -Bundle-Name: Argeo SLC Example 01 -Created-By: 1.6.0 (Sun Microsystems Inc.) -Require-Bundle: org.argeo.slc.core,org.argeo.slc.agent -Bundle-Vendor: Argeo -Bundle-Version: 0.11.2.SNAPSHOT Bundle-Activator: org.argeo.slc.example.Activator -Bundle-ManifestVersion: 2 +Created-By: 1.5.0_16 (Sun Microsystems Inc.) Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Description: An Example SLC application Import-Package: org.apache.commons.logging;version="1.1",org.apache.to ols.ant;version="1.7",org.apache.tools.ant.taskdefs;version="1.7",org - .apache.tools.ant.types;version="1.7",org.argeo.slc.core.build;versio - n="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNAPSHO - T",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.argeo.s - lc.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.t - est;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;version - ="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2.SNA - PSHOT",org.argeo.slc.example;version="0.11.2.SNAPSHOT",org.argeo.slc. - example.appli;version="0.11.2.SNAPSHOT",org.argeo.slc.example.ws.clie - nt.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;versi + .apache.tools.ant.types;version="1.7",org.argeo.slc.build;version="0. + 11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT" + ,org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.arge + o.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.con + text;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version + ="0.11.2.SNAPSHOT",org.argeo.slc.deploy;version="0.11.2.SNAPSHOT",org + .argeo.slc.example;version="0.11.2.SNAPSHOT",org.argeo.slc.example.ap + pli;version="0.11.2.SNAPSHOT",org.argeo.slc.example.ws.client.spring; + version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11.2 + .SNAPSHOT",org.argeo.slc.structure;version="0.11.2.SNAPSHOT",org.arge + o.slc.test;version="0.11.2.SNAPSHOT",org.argeo.slc.test.context;versi on="0.11.2.SNAPSHOT",org.springframework.oxm.castor;version="1.5.5.A" -Bundle-SymbolicName: org.argeo.slc.example01 +Export-Package: org.argeo.slc.example.appli;version="0.11.2.SNAPSHOT", + org.argeo.slc.example;uses:="org.argeo.slc.test.context,org.argeo.slc + .test,org.argeo.slc.core.test,org.argeo.slc.core.test.context,org.arg + eo.slc.build,org.apache.commons.logging,org.argeo.slc.structure,org.a + rgeo.slc.example.appli,org.argeo.slc.core.structure.tree,org.argeo.sl + c.deploy,org.argeo.slc.core.structure";version="0.11.2.SNAPSHOT",org. + argeo.slc.example.ws.client.spring;version="0.11.2.SNAPSHOT" +Bundle-Version: 0.11.2.SNAPSHOT +Bundle-Name: Argeo SLC Example 01 +Bundle-Description: An Example SLC application Bundle-DocURL: http://www.argeo.org Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) +Bundle-Vendor: Argeo +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.argeo.slc.example01 +Tool: Bnd-0.0.255 +Require-Bundle: org.argeo.slc.core,org.argeo.slc.agent diff --git a/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java b/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java index 924c072a8..d91ba58cb 100644 --- a/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java +++ b/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/appli/SubCategory2Test.java @@ -4,8 +4,8 @@ import static org.argeo.slc.unit.test.tree.UnitTestTreeUtil.assertPart; import org.argeo.slc.ant.AntExecutionContext; import org.argeo.slc.ant.unit.AntSlcApplicationTestCase; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.test.TestStatus; public class SubCategory2Test extends AntSlcApplicationTestCase { public void testSimpleRun() { diff --git a/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/context/BaseContextTest.java b/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/context/BaseContextTest.java index d7fd93e57..71f6ea9b6 100644 --- a/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/context/BaseContextTest.java +++ b/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/context/BaseContextTest.java @@ -2,8 +2,8 @@ package org.argeo.slc.example.context; import org.argeo.slc.ant.AntExecutionContext; import org.argeo.slc.ant.unit.AntSlcApplicationTestCase; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.test.TestStatus; import org.argeo.slc.unit.test.tree.UnitTestTreeUtil; public class BaseContextTest extends AntSlcApplicationTestCase { diff --git a/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/context/ContextTest.java b/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/context/ContextTest.java index d23c27557..be9d0917d 100644 --- a/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/context/ContextTest.java +++ b/examples/org.argeo.slc.example01/src/test/java/org/argeo/slc/example/context/ContextTest.java @@ -2,8 +2,8 @@ package org.argeo.slc.example.context; import org.argeo.slc.ant.AntExecutionContext; import org.argeo.slc.ant.unit.AntSlcApplicationTestCase; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.test.TestStatus; import org.argeo.slc.unit.test.tree.UnitTestTreeUtil; public class ContextTest extends AntSlcApplicationTestCase { diff --git a/org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF index c684f3fe0..0d3f8f54c 100644 --- a/org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF +++ b/org.argeo.slc.detached.launcher/src/main/resources/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ Manifest-Version: 1.0 +Created-By: 1.5.0_16 (Sun Microsystems Inc.) +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Import-Package: org.argeo.slc.detached.launcher;version="0.11.2.SNAPSH + OT",org.eclipse.core.runtime.adaptor,org.osgi.framework;version="1.4" Export-Package: org.argeo.slc.detached.launcher;uses:="org.osgi.framew ork,org.eclipse.core.runtime.adaptor";version="0.11.2.SNAPSHOT" -Tool: Bnd-0.0.255 -Bundle-Name: Argeo SLC Detached Launcher -Created-By: 1.6.0 (Sun Microsystems Inc.) -Bundle-Vendor: Argeo Bundle-Version: 0.11.2.SNAPSHOT -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-Name: Argeo SLC Detached Launcher Bundle-Description: SLC Distribution -Import-Package: org.argeo.slc.detached.launcher;version="0.11.2.SNAPSH - OT",org.eclipse.core.runtime.adaptor,org.osgi.framework;version="1.4" -Bundle-SymbolicName: org.argeo.slc.detached.launcher Bundle-DocURL: http://www.argeo.org Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) +Bundle-ManifestVersion: 2 +Bundle-Vendor: Argeo +Bundle-SymbolicName: org.argeo.slc.detached.launcher +Tool: Bnd-0.0.255 diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java index b14c70d38..7d4d06742 100644 --- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java +++ b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/ScenarioWsIntegrationTest.java @@ -7,8 +7,6 @@ import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleR import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionStep; import org.argeo.slc.core.test.SimpleResultPart; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.msg.process.SlcExecutionRequest; @@ -17,6 +15,8 @@ import org.argeo.slc.msg.process.SlcExecutionStepsRequest; import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; import org.argeo.slc.msg.test.tree.ResultPartRequest; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.unit.AbstractSpringTestCase; import org.argeo.slc.unit.process.SlcExecutionTestUtils; import org.springframework.ws.client.core.WebServiceTemplate; diff --git a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java index 27f1e72f3..b40e97335 100644 --- a/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java +++ b/org.argeo.slc.webapp/src/test/java/org/argeo/slc/ws/SlcExecutionWsIntegrationTest.java @@ -9,11 +9,11 @@ import org.springframework.ws.soap.client.SoapFaultClientException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionStep; import org.argeo.slc.msg.process.SlcExecutionRequest; import org.argeo.slc.msg.process.SlcExecutionStatusRequest; import org.argeo.slc.msg.process.SlcExecutionStepsRequest; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.unit.AbstractSpringTestCase; import org.argeo.slc.unit.process.SlcExecutionTestUtils; import org.argeo.slc.ws.client.WebServiceUtils; diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml index 1d010d091..4abb9d740 100644 --- a/runtime/org.argeo.slc.launcher/pom.xml +++ b/runtime/org.argeo.slc.launcher/pom.xml @@ -55,7 +55,7 @@ org.argeo.slc.* - *,org.argeo.slc.core.test.spring,org.apache.commons.cli;resolution:=optional + *,org.argeo.slc.test.spring,org.apache.commons.cli;resolution:=optional diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java index 15b42cd74..c4193369a 100644 --- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java +++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java @@ -14,7 +14,7 @@ import org.apache.commons.cli.ParseException; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.argeo.slc.logging.Log4jUtils; import org.argeo.slc.runtime.SlcExecutionContext; import org.argeo.slc.runtime.SlcRuntime; diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java index 08e13d663..e99864c2e 100644 --- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java +++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java @@ -9,8 +9,8 @@ import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; //import org.argeo.slc.ant.AntRunner; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.deploy.DeployEnvironment; +import org.argeo.slc.SlcException; +import org.argeo.slc.deploy.DeployEnvironment; public class MavenDeployEnvironment {/*implements DeployEnvironment { private static final Log log = LogFactory diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenFile.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenFile.java index 31c6385a6..18f71b4b7 100644 --- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenFile.java +++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenFile.java @@ -1,7 +1,7 @@ package org.argeo.slc.maven; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.DeploymentData; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.DeploymentData; public class MavenFile implements Distribution, DeploymentData { private String groupId; diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenManager.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenManager.java index 9908c3b8b..458188d7d 100644 --- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenManager.java +++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/maven/MavenManager.java @@ -11,7 +11,7 @@ import org.apache.commons.logging.LogFactory; //import org.apache.maven.embedder.MavenEmbedder; //import org.apache.maven.embedder.MavenEmbedderException; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; public class MavenManager {/* FIXME private final Log log = LogFactory.getLog(getClass()); diff --git a/runtime/org.argeo.slc.launcher/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.launcher/src/main/resources/META-INF/MANIFEST.MF index e94b86788..8564dcb11 100644 --- a/runtime/org.argeo.slc.launcher/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.launcher/src/main/resources/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Created-By: 1.5.0_16 (Sun Microsystems Inc.) Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Import-Package: org.apache.commons.cli;resolution:=optional;version="1 .1",org.apache.commons.io;version="1.4",org.apache.commons.logging;ve - rsion="1.1",org.argeo.slc.cli;version="0.11.2.SNAPSHOT",org.argeo.slc - .core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;version="0.1 - 1.2.SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNAPSHOT",org - .argeo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.l - ogging;version="0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2. - SNAPSHOT",org.argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.argeo.s - lc.support.deploy.ant;version="0.11.2.SNAPSHOT" + rsion="1.1",org.argeo.slc;version="0.11.2.SNAPSHOT",org.argeo.slc.bui + ld;version="0.11.2.SNAPSHOT",org.argeo.slc.cli;version="0.11.2.SNAPSH + OT",org.argeo.slc.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.logg + ing;version="0.11.2.SNAPSHOT",org.argeo.slc.maven;version="0.11.2.SNA + PSHOT",org.argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.argeo.slc. + support.deploy.ant;version="0.11.2.SNAPSHOT",org.argeo.slc.test.sprin + g Export-Package: org.argeo.slc.support.deploy.ant;version="0.11.2.SNAPS - HOT",org.argeo.slc.maven;uses:="org.argeo.slc.core.deploy,org.argeo.s - lc.core.build";version="0.11.2.SNAPSHOT",org.argeo.slc.cli;uses:="org - .argeo.slc.logging,org.argeo.slc.core,org.argeo.slc.runtime,org.apach - e.commons.io,org.apache.commons.logging,org.apache.commons.cli";versi - on="0.11.2.SNAPSHOT" + HOT",org.argeo.slc.maven;uses:="org.argeo.slc.build,org.argeo.slc.dep + loy";version="0.11.2.SNAPSHOT",org.argeo.slc.cli;uses:="org.argeo.slc + ,org.argeo.slc.logging,org.argeo.slc.runtime,org.apache.commons.io,or + g.apache.commons.logging,org.apache.commons.cli";version="0.11.2.SNAP + SHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Launcher Bundle-Description: SLC Distribution diff --git a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/ant/detached/SlcDetachedTask.java b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/ant/detached/SlcDetachedTask.java index d973d3815..3678c170d 100644 --- a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/ant/detached/SlcDetachedTask.java +++ b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/ant/detached/SlcDetachedTask.java @@ -5,9 +5,9 @@ import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.argeo.slc.SlcException; import org.argeo.slc.ant.spring.MapArg; import org.argeo.slc.ant.structure.SAwareTask; -import org.argeo.slc.core.SlcException; import org.argeo.slc.detached.DetachedAnswer; import org.argeo.slc.detached.DetachedClient; import org.argeo.slc.detached.DetachedRequest; diff --git a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedTestDefinition.java b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedTestDefinition.java index becb4f8ce..5b691b1a0 100644 --- a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedTestDefinition.java +++ b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedTestDefinition.java @@ -6,19 +6,19 @@ import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.argeo.slc.core.structure.tree.TreeSRelatedHelper; import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestDefinition; -import org.argeo.slc.core.test.TestResult; -import org.argeo.slc.core.test.TestRun; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.context.ContextUtils; import org.argeo.slc.detached.DetachedAnswer; import org.argeo.slc.detached.DetachedClient; import org.argeo.slc.detached.DetachedRequest; import org.argeo.slc.detached.DetachedStep; import org.argeo.slc.detached.ui.UiStep; +import org.argeo.slc.test.TestDefinition; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestRun; +import org.argeo.slc.test.TestStatus; import org.springframework.beans.BeansException; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.BeanFactory; diff --git a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedXmlConverterSpring.java b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedXmlConverterSpring.java index 799b4739c..b7351a767 100644 --- a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedXmlConverterSpring.java +++ b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedXmlConverterSpring.java @@ -5,7 +5,7 @@ import java.io.IOException; import javax.xml.transform.Result; import javax.xml.transform.Source; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.argeo.slc.detached.DetachedAnswer; import org.argeo.slc.detached.DetachedCommunication; import org.argeo.slc.detached.DetachedException; diff --git a/runtime/org.argeo.slc.lib.detached/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.lib.detached/src/main/resources/META-INF/MANIFEST.MF index ba0a1dfcc..8c8c19baa 100644 --- a/runtime/org.argeo.slc.lib.detached/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.lib.detached/src/main/resources/META-INF/MANIFEST.MF @@ -2,30 +2,32 @@ Manifest-Version: 1.0 Created-By: 1.5.0_16 (Sun Microsystems Inc.) Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Import-Package: javax.xml.transform;version="1.3",org.apache.commons.l - ogging;version="1.1",org.argeo.slc.ant.detached;version="0.11.2.SNAPS - HOT",org.argeo.slc.ant.spring;version="0.11.2.SNAPSHOT",org.argeo.slc - .ant.structure;version="0.11.2.SNAPSHOT",org.argeo.slc.core;version=" - 0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SN - APSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.s - lc.core.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc.detached - ;version="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2. - SNAPSHOT",org.argeo.slc.lib.detached;version="0.11.2.SNAPSHOT",org.ar - geo.slc.spring;version="0.11.2.SNAPSHOT",org.springframework.beans;ve - rsion="2.5.6.A",org.springframework.beans.factory;version="2.5.6.A",o - rg.springframework.beans.factory.config;version="2.5.6.A",org.springf - ramework.beans.factory.support;version="2.5.6.A",org.springframework. - context;version="2.5.6.A",org.springframework.oxm;version="1.5.5.A" -Export-Package: org.argeo.slc.ant.detached;uses:="org.argeo.slc.ant.st - ructure,org.argeo.slc.core,org.argeo.slc.ant.spring,org.argeo.slc.det - ached,org.apache.commons.logging,org.argeo.slc.spring,org.springframe - work.context,org.springframework.beans.factory";version="0.11.2.SNAPS - HOT",org.argeo.slc.lib.detached;uses:="org.argeo.slc.core.test,org.ar - geo.slc.core,org.argeo.slc.core.test.context,org.argeo.slc.detached,o - rg.apache.commons.logging,org.springframework.oxm,org.argeo.slc.detac - hed.ui,javax.xml.transform,org.springframework.beans.factory.support, - org.springframework.beans.factory.config,org.springframework.beans,or - g.springframework.beans.factory,org.argeo.slc.core.structure.tree";ve - rsion="0.11.2.SNAPSHOT" + ogging;version="1.1",org.argeo.slc;version="0.11.2.SNAPSHOT",org.arge + o.slc.ant.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.spring + ;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.structure;version="0.11. + 2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSHO + T",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.co + re.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc.detached;vers + ion="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2.SNAPS + HOT",org.argeo.slc.lib.detached;version="0.11.2.SNAPSHOT",org.argeo.s + lc.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.test;version="0.11. + 2.SNAPSHOT",org.argeo.slc.test.context;version="0.11.2.SNAPSHOT",org. + springframework.beans;version="2.5.6.A",org.springframework.beans.fac + tory;version="2.5.6.A",org.springframework.beans.factory.config;versi + on="2.5.6.A",org.springframework.beans.factory.support;version="2.5.6 + .A",org.springframework.context;version="2.5.6.A",org.springframework + .oxm;version="1.5.5.A" +Export-Package: org.argeo.slc.ant.detached;uses:="org.argeo.slc,org.ar + geo.slc.ant.structure,org.argeo.slc.ant.spring,org.argeo.slc.detached + ,org.apache.commons.logging,org.argeo.slc.spring,org.springframework. + context,org.springframework.beans.factory";version="0.11.2.SNAPSHOT", + org.argeo.slc.lib.detached;uses:="org.argeo.slc.test.context,org.arge + o.slc.test,org.argeo.slc,org.argeo.slc.core.test,org.argeo.slc.core.t + est.context,org.argeo.slc.detached,org.apache.commons.logging,org.spr + ingframework.oxm,org.argeo.slc.detached.ui,javax.xml.transform,org.sp + ringframework.beans.factory.support,org.springframework.beans.factory + .config,org.springframework.beans,org.springframework.beans.factory,o + rg.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Lib Detached Bundle-Description: SLC Distribution diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java index 8e58fd2a4..f1fd71a0d 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java @@ -1,6 +1,6 @@ package org.argeo.slc.services.test; -import org.argeo.slc.core.test.TestRunDescriptor; +import org.argeo.slc.test.TestRunDescriptor; public interface TestManagerService { public void registerTestRunDescriptor(TestRunDescriptor testRunDescriptor); diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java index b9a3a7045..253f849d0 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java @@ -2,14 +2,14 @@ package org.argeo.slc.services.test.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.test.TestRunDescriptor; import org.argeo.slc.core.test.tree.TreeTestResultCollection; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.dao.test.TestRunDescriptorDao; import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; import org.argeo.slc.dao.test.tree.TreeTestResultDao; +import org.argeo.slc.process.SlcExecution; import org.argeo.slc.services.test.TestManagerService; +import org.argeo.slc.test.TestRunDescriptor; public class TestManagerServiceImpl implements TestManagerService { private Log log = LogFactory.getLog(getClass()); diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java index bec44e8d1..6701ae118 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java @@ -5,10 +5,10 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.SlcException; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.core.test.tree.TreeTestResultCollection; +import org.argeo.slc.process.SlcExecution; import org.springframework.oxm.Marshaller; import org.springframework.web.servlet.view.xslt.XsltView; import org.w3c.dom.Document; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java index 62af08ea6..f8b89aa03 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java @@ -11,7 +11,7 @@ import javax.xml.transform.stream.StreamSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.springframework.core.io.Resource; import org.springframework.oxm.Marshaller; import org.springframework.web.servlet.view.AbstractUrlBasedView; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java index e5cbbeece..cd95fc9f7 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionListController.java @@ -11,8 +11,8 @@ import org.springframework.web.servlet.mvc.ParameterizableViewController; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.process.SlcExecution; import org.argeo.slc.dao.process.SlcExecutionDao; +import org.argeo.slc.process.SlcExecution; public class SlcExecutionListController extends ParameterizableViewController { private Log log = LogFactory.getLog(getClass()); diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java index 8867d85ce..fd947d9c1 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java @@ -11,10 +11,10 @@ import org.springframework.web.servlet.mvc.ParameterizableViewController; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.SlcException; import org.argeo.slc.dao.process.SlcExecutionDao; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; public class SlcExecutionViewController extends ParameterizableViewController { private Log log = LogFactory.getLog(getClass()); diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java index 5f2c9ef78..5083719f8 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java @@ -9,12 +9,12 @@ import jxl.write.Label; import jxl.write.WritableSheet; import jxl.write.WritableWorkbook; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SlcTestUtils; -import org.argeo.slc.core.test.TestResultPart; import org.argeo.slc.core.test.tree.PartSubList; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.test.TestResultPart; import org.springframework.web.servlet.view.document.AbstractJExcelView; public class ResultExcelView extends AbstractJExcelView { diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java index 36d3b8922..debe797c2 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java @@ -8,10 +8,10 @@ import javax.servlet.http.HttpServletResponse; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SlcTestUtils; -import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.PartSubList; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestStatus; import org.springframework.web.servlet.view.document.AbstractPdfView; import com.lowagie.text.Cell; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultViewController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultViewController.java index f87f3acc6..2c6d19240 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultViewController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultViewController.java @@ -9,13 +9,13 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.ParameterizableViewController; -import org.argeo.slc.core.structure.StructureElement; import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.PartSubList; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.dao.test.tree.TreeTestResultDao; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestStatus; public class ResultViewController extends ParameterizableViewController { public final static String MODELKEY_RESULT = "result"; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java index 8665ffecf..e00b9f2de 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/TestRunViewController.java @@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.ParameterizableViewController; -import org.argeo.slc.core.test.TestRunDescriptor; import org.argeo.slc.dao.test.TestRunDescriptorDao; +import org.argeo.slc.test.TestRunDescriptor; public class TestRunViewController extends ParameterizableViewController { private final TestRunDescriptorDao testRunDescriptorDao; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java index 21239893d..fe416c593 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java @@ -3,11 +3,11 @@ package org.argeo.slc.ws.process; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.SlcException; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.msg.process.SlcExecutionRequest; import org.argeo.slc.msg.process.SlcExecutionStatusRequest; +import org.argeo.slc.process.SlcExecution; import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java index c15b4de75..4295c182b 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java @@ -2,9 +2,9 @@ package org.argeo.slc.ws.process; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.process.SlcExecutionStep; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.msg.process.SlcExecutionStepsRequest; +import org.argeo.slc.process.SlcExecutionStep; import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; public class SlcExecutionStepsRequestEp extends diff --git a/runtime/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF index a283f4ac1..6fb4e9182 100644 --- a/runtime/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.server/src/main/resources/META-INF/MANIFEST.MF @@ -6,69 +6,69 @@ Import-Package: com.lowagie.text;version="2.0",com.lowagie.text.pdf;ve x.xml.parsers;version="1.3",javax.xml.transform;version="1.3",javax.x ml.transform.dom;version="1.3",javax.xml.transform.stream;version="1. 3",jxl.write;version="2.6",org.apache.commons.logging;version="1.1",o - rg.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.proces - s;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.1 - 1.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11.2.SNAPS - HOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc. - core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.process;ve - rsion="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2.SNAPSH - OT",org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org.argeo.s - lc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree; - version="0.11.2.SNAPSHOT",org.argeo.slc.server.spring;version="0.11.2 - .SNAPSHOT",org.argeo.slc.services.test;version="0.11.2.SNAPSHOT",org. - argeo.slc.services.test.impl;version="0.11.2.SNAPSHOT",org.argeo.slc. - web.mvc;version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.admin;version - ="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.process;version="0.11.2.SNAP - SHOT",org.argeo.slc.web.mvc.result;version="0.11.2.SNAPSHOT",org.arge - o.slc.ws;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;version=" - 0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAPSHOT" - ,org.springframework.context;version="2.5.6.A",org.springframework.co - re.io;version="2.5.6.A",org.springframework.oxm;version="1.5.5.A",org - .springframework.web.servlet;version="2.5.6.A",org.springframework.we - b.servlet.handler;version="2.5.6.A",org.springframework.web.servlet.m - vc;version="2.5.6.A",org.springframework.web.servlet.view;version="2. - 5.6.A",org.springframework.web.servlet.view.document;version="2.5.6.A - ",org.springframework.web.servlet.view.xslt;version="2.5.6.A",org.spr - ingframework.ws.context;version="1.5.5.A",org.springframework.ws.serv - er.endpoint;version="1.5.5.A",org.springframework.ws.soap;version="1. - 5.5.A",org.springframework.ws.soap.server.endpoint;version="1.5.5.A", - org.w3c.dom;version="1.3" + rg.argeo.slc;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.t + ree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2 + .SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org + .argeo.slc.dao.process;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.te + st;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test.tree;version="0.1 + 1.2.SNAPSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org + .argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.proc + ess;version="0.11.2.SNAPSHOT",org.argeo.slc.server.spring;version="0. + 11.2.SNAPSHOT",org.argeo.slc.services.test;version="0.11.2.SNAPSHOT", + org.argeo.slc.services.test.impl;version="0.11.2.SNAPSHOT",org.argeo. + slc.structure;version="0.11.2.SNAPSHOT",org.argeo.slc.test;version="0 + .11.2.SNAPSHOT",org.argeo.slc.web.mvc;version="0.11.2.SNAPSHOT",org.a + rgeo.slc.web.mvc.admin;version="0.11.2.SNAPSHOT",org.argeo.slc.web.mv + c.process;version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.result;vers + ion="0.11.2.SNAPSHOT",org.argeo.slc.ws;version="0.11.2.SNAPSHOT",org. + argeo.slc.ws.process;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.test. + tree;version="0.11.2.SNAPSHOT",org.springframework.context;version="2 + .5.6.A",org.springframework.core.io;version="2.5.6.A",org.springframe + work.oxm;version="1.5.5.A",org.springframework.web.servlet;version="2 + .5.6.A",org.springframework.web.servlet.handler;version="2.5.6.A",org + .springframework.web.servlet.mvc;version="2.5.6.A",org.springframewor + k.web.servlet.view;version="2.5.6.A",org.springframework.web.servlet. + view.document;version="2.5.6.A",org.springframework.web.servlet.view. + xslt;version="2.5.6.A",org.springframework.ws.context;version="1.5.5. + A",org.springframework.ws.server.endpoint;version="1.5.5.A",org.sprin + gframework.ws.soap;version="1.5.5.A",org.springframework.ws.soap.serv + er.endpoint;version="1.5.5.A",org.w3c.dom;version="1.3" Export-Package: org.argeo.slc.ws;uses:="org.springframework.ws.soap,or g.springframework.ws.context,javax.xml.namespace,org.springframework. ws.soap.server.endpoint,org.apache.commons.logging";version="0.11.2.S - NAPSHOT",org.argeo.slc.web.mvc.process;uses:="javax.servlet.http,org. - argeo.slc.core.process,org.argeo.slc.core,org.apache.commons.logging, - org.argeo.slc.dao.process,org.springframework.web.servlet.mvc,org.spr - ingframework.web.servlet";version="0.11.2.SNAPSHOT",org.argeo.slc.web - .mvc.admin;uses:="javax.servlet.http,org.springframework.web.servlet, - org.springframework.web.servlet.mvc";version="0.11.2.SNAPSHOT",org.ar - geo.slc.server.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.test - .tree;uses:="org.argeo.slc.dao.test.tree,org.argeo.slc.core.test.tree - ,org.argeo.slc.msg.test.tree,org.argeo.slc.core.test,org.springframew - ork.ws.server.endpoint,org.argeo.slc.services.test,org.apache.commons - .logging,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT" - ,org.argeo.slc.services.test.impl;uses:="org.argeo.slc.dao.test.tree, - org.argeo.slc.core.test.tree,org.argeo.slc.core.test,org.argeo.slc.co - re.process,org.argeo.slc.dao.test,org.argeo.slc.services.test,org.apa - che.commons.logging,org.argeo.slc.dao.process";version="0.11.2.SNAPSH - OT",org.argeo.slc.services.test;uses:="org.argeo.slc.core.test";versi - on="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;uses:="org.argeo.slc.co - re.process,org.springframework.ws.server.endpoint,org.argeo.slc.msg.p - rocess,org.argeo.slc.core,org.apache.commons.logging,org.argeo.slc.da - o.process";version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc;uses:="org - .springframework.web.servlet.view,org.argeo.slc.core.process,org.arge - o.slc.core,org.w3c.dom,org.apache.commons.logging,org.springframework - .context,org.springframework.oxm,org.springframework.web.servlet.view - .xslt,javax.xml.transform,javax.xml.transform.dom,org.argeo.slc.core. - test.tree,org.springframework.core.io,javax.xml.parsers,javax.xml.tra - nsform.stream";version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.result - ;uses:="org.argeo.slc.dao.test.tree,javax.servlet.http,org.argeo.slc. - core.test,org.argeo.slc.core,org.argeo.slc.dao.test,org.argeo.slc.ser - vices.test,jxl.write,org.springframework.web.servlet,org.springframew - ork.web.servlet.mvc,org.argeo.slc.core.test.tree,org.springframework. - web.servlet.handler,org.springframework.web.servlet.view.document,com - .lowagie.text.pdf,com.lowagie.text,org.argeo.slc.core.structure.tree, - org.argeo.slc.core.structure";version="0.11.2.SNAPSHOT" + NAPSHOT",org.argeo.slc.web.mvc.process;uses:="org.argeo.slc,javax.ser + vlet.http,org.argeo.slc.process,org.apache.commons.logging,org.argeo. + slc.dao.process,org.springframework.web.servlet.mvc,org.springframewo + rk.web.servlet";version="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc.admin + ;uses:="javax.servlet.http,org.springframework.web.servlet,org.spring + framework.web.servlet.mvc";version="0.11.2.SNAPSHOT",org.argeo.slc.se + rver.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;uses + :="org.argeo.slc.test,org.argeo.slc.dao.test.tree,org.argeo.slc.core. + test.tree,org.argeo.slc.msg.test.tree,org.argeo.slc.core.test,org.spr + ingframework.ws.server.endpoint,org.argeo.slc.services.test,org.apach + e.commons.logging,org.argeo.slc.core.structure.tree";version="0.11.2. + SNAPSHOT",org.argeo.slc.services.test.impl;uses:="org.argeo.slc.dao.t + est.tree,org.argeo.slc.test,org.argeo.slc.core.test.tree,org.argeo.sl + c.process,org.argeo.slc.dao.test,org.argeo.slc.services.test,org.apac + he.commons.logging,org.argeo.slc.dao.process";version="0.11.2.SNAPSHO + T",org.argeo.slc.services.test;uses:="org.argeo.slc.test";version="0. + 11.2.SNAPSHOT",org.argeo.slc.ws.process;uses:="org.argeo.slc,org.arge + o.slc.process,org.springframework.ws.server.endpoint,org.argeo.slc.ms + g.process,org.apache.commons.logging,org.argeo.slc.dao.process";versi + on="0.11.2.SNAPSHOT",org.argeo.slc.web.mvc;uses:="org.argeo.slc,org.s + pringframework.web.servlet.view,org.w3c.dom,org.apache.commons.loggin + g,org.springframework.context,org.springframework.oxm,org.springframe + work.web.servlet.view.xslt,javax.xml.transform,javax.xml.transform.do + m,org.argeo.slc.core.test.tree,org.argeo.slc.process,org.springframew + ork.core.io,javax.xml.parsers,javax.xml.transform.stream";version="0. + 11.2.SNAPSHOT",org.argeo.slc.web.mvc.result;uses:="org.argeo.slc.dao. + test.tree,org.argeo.slc.test,org.argeo.slc,javax.servlet.http,org.arg + eo.slc.core.test,org.argeo.slc.dao.test,org.argeo.slc.services.test,o + rg.argeo.slc.structure,jxl.write,org.springframework.web.servlet,org. + springframework.web.servlet.mvc,org.argeo.slc.core.test.tree,org.spri + ngframework.web.servlet.handler,org.springframework.web.servlet.view. + document,com.lowagie.text.pdf,com.lowagie.text,org.argeo.slc.core.str + ucture.tree";version="0.11.2.SNAPSHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Server Bundle-Description: SLC Server diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/SlcException.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/SlcException.java similarity index 88% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/SlcException.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/SlcException.java index 7daffaf87..49647d496 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/SlcException.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/SlcException.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core; +package org.argeo.slc; /** Basis for all SLC exceptions. This is an unchecked exception. */ public class SlcException extends RuntimeException { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/UnsupportedException.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/UnsupportedException.java similarity index 94% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/UnsupportedException.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/UnsupportedException.java index 4b46b35de..0102311a8 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/UnsupportedException.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/UnsupportedException.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core; +package org.argeo.slc; /** Exception for unsupported features or actions. */ public class UnsupportedException extends SlcException { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/build/Distribution.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/Distribution.java similarity index 64% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/build/Distribution.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/Distribution.java index a9ada27f0..a71620650 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/build/Distribution.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/Distribution.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.build; +package org.argeo.slc.build; public interface Distribution { public String getDistributionId(); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/build/package.html b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/package.html similarity index 100% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/build/package.html rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/build/package.html diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeploymentData.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeploymentData.java deleted file mode 100644 index 0148ea529..000000000 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeploymentData.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.argeo.slc.core.deploy; - -public interface DeploymentData { - -} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/TargetData.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/TargetData.java deleted file mode 100644 index 2fe155d31..000000000 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/TargetData.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.argeo.slc.core.deploy; - -public interface TargetData { - -} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/BasicTestData.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/BasicTestData.java deleted file mode 100644 index e6be49632..000000000 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/BasicTestData.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.argeo.slc.core.test; - -public class BasicTestData implements TestData { - private Object expected; - private Object reached; - - public Object getExpected() { - return expected; - } - - public void setExpected(Object expected) { - this.expected = expected; - } - - public Object getReached() { - return reached; - } - - public void setReached(Object reached) { - this.reached = reached; - } - -} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java index ca3d9f46a..e10d5fdc4 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java @@ -2,8 +2,8 @@ package org.argeo.slc.dao.process; import java.util.List; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; public interface SlcExecutionDao { public void create(SlcExecution slcExecution); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestResultDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestResultDao.java index 6b72cfa7c..3f36ad799 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestResultDao.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestResultDao.java @@ -3,7 +3,7 @@ package org.argeo.slc.dao.test; import java.util.Date; import java.util.List; -import org.argeo.slc.core.test.TestResult; +import org.argeo.slc.test.TestResult; /** * The dao for TestResult. diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java index 53bc89a3c..7bf98cb7c 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java @@ -1,6 +1,6 @@ package org.argeo.slc.dao.test; -import org.argeo.slc.core.test.TestRunDescriptor; +import org.argeo.slc.test.TestRunDescriptor; public interface TestRunDescriptorDao { public TestRunDescriptor getTestRunDescriptor(String id); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/AbstractDeployedSystem.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/AbstractDeployedSystem.java similarity index 78% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/AbstractDeployedSystem.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/AbstractDeployedSystem.java index 3941f5529..b90d7111b 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/AbstractDeployedSystem.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/AbstractDeployedSystem.java @@ -1,7 +1,7 @@ -package org.argeo.slc.core.deploy; +package org.argeo.slc.deploy; -import org.argeo.slc.core.UnsupportedException; -import org.argeo.slc.core.build.Distribution; +import org.argeo.slc.UnsupportedException; +import org.argeo.slc.build.Distribution; public abstract class AbstractDeployedSystem implements DeployedSystem { public String getDeployedSystemId() { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployEnvironment.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployEnvironment.java similarity index 83% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployEnvironment.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployEnvironment.java index ca747f65e..dd4736929 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployEnvironment.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployEnvironment.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.deploy; +package org.argeo.slc.deploy; import java.io.File; import java.util.Map; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployedSystem.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployedSystem.java similarity index 73% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployedSystem.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployedSystem.java index fa383c331..1642b095c 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployedSystem.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployedSystem.java @@ -1,6 +1,6 @@ -package org.argeo.slc.core.deploy; +package org.argeo.slc.deploy; -import org.argeo.slc.core.build.Distribution; +import org.argeo.slc.build.Distribution; /** An instance of a software system. */ public interface DeployedSystem extends TargetData { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployedSystemManager.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployedSystemManager.java similarity index 77% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployedSystemManager.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployedSystemManager.java index 281f81c73..411bcb6b9 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/DeployedSystemManager.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeployedSystemManager.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.deploy; +package org.argeo.slc.deploy; public interface DeployedSystemManager { public void setDeployedSystem(T deployedSystem); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/Deployment.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java similarity index 74% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/Deployment.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java index fede6c1b3..5be7ffd71 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/Deployment.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/Deployment.java @@ -1,6 +1,6 @@ -package org.argeo.slc.core.deploy; +package org.argeo.slc.deploy; -import org.argeo.slc.core.build.Distribution; +import org.argeo.slc.build.Distribution; public interface Deployment { public DeployedSystem getDeployedSystem(); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeploymentData.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeploymentData.java new file mode 100644 index 000000000..18e63f829 --- /dev/null +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/DeploymentData.java @@ -0,0 +1,5 @@ +package org.argeo.slc.deploy; + +public interface DeploymentData { + +} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/InstalledExecutables.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/InstalledExecutables.java similarity index 76% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/InstalledExecutables.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/InstalledExecutables.java index a5d0b6d90..2d65a716c 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/InstalledExecutables.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/InstalledExecutables.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.deploy; +package org.argeo.slc.deploy; public interface InstalledExecutables extends DeployedSystem { public String getExecutablePath(String key); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/TargetData.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/TargetData.java new file mode 100644 index 000000000..f1c7e7d13 --- /dev/null +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/TargetData.java @@ -0,0 +1,5 @@ +package org.argeo.slc.deploy; + +public interface TargetData { + +} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/package.html b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/package.html similarity index 100% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/deploy/package.html rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/deploy/package.html diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/package.html b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/package.html similarity index 100% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/package.html rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/package.html diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecution.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java similarity index 93% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecution.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java index 8264796f6..e1ae1ecf3 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecution.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.process; +package org.argeo.slc.process; import java.util.List; import java.util.Map; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionAware.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionAware.java similarity index 70% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionAware.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionAware.java index 089dc317e..e7696eb0f 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionAware.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionAware.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.process; +package org.argeo.slc.process; public interface SlcExecutionAware { public void notifySlcExecution(SlcExecution slcExecution); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionNotifier.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionNotifier.java similarity index 87% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionNotifier.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionNotifier.java index bf3b67ba5..a11977d9d 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionNotifier.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionNotifier.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.process; +package org.argeo.slc.process; import java.util.List; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionRelated.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionRelated.java similarity index 77% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionRelated.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionRelated.java index 8d825bd41..61d8eb580 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionRelated.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionRelated.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.process; +package org.argeo.slc.process; public interface SlcExecutionRelated { public String getSlcExecutionUuid(); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java similarity index 92% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java index 50032d8cd..59cf231d8 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionStep.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.process; +package org.argeo.slc.process; import java.io.IOException; import java.io.StringReader; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java index 23788313b..d1a25c44b 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java @@ -1,6 +1,6 @@ package org.argeo.slc.runtime; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.process.SlcExecution; /** Provides access to the object used during the execution */ public interface SlcExecutionContext { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureAware.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureAware.java similarity index 84% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureAware.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureAware.java index 643af73af..0c7b5b6ef 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureAware.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureAware.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.structure; +package org.argeo.slc.structure; /** * Wrapper for an element, which is able to propagate registration to diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureElement.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureElement.java similarity index 80% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureElement.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureElement.java index 8e9d15bff..2edb8bf2f 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureElement.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureElement.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.structure; +package org.argeo.slc.structure; /** * Atomic element holding metadata such as description about the element which diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureElementProvider.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureElementProvider.java similarity index 69% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureElementProvider.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureElementProvider.java index b9aa14452..4b23fdef2 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureElementProvider.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureElementProvider.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.structure; +package org.argeo.slc.structure; public interface StructureElementProvider { public StructureElement createStructureElement(); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructurePath.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructurePath.java similarity index 86% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructurePath.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructurePath.java index 452dc9514..69204fdee 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructurePath.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructurePath.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.structure; +package org.argeo.slc.structure; /** * Path allowing to uniquely identify a StructureElement within a diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureRegistry.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureRegistry.java similarity index 93% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureRegistry.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureRegistry.java index e90916408..7420f07be 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/StructureRegistry.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/StructureRegistry.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.structure; +package org.argeo.slc.structure; import java.util.List; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/package.html b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/package.html similarity index 100% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/structure/package.html rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/structure/package.html diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/ExecutableTestRun.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java similarity index 78% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/ExecutableTestRun.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java index 34216799f..db7d01fb3 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/ExecutableTestRun.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/ExecutableTestRun.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; /** A test run that can be executed */ public interface ExecutableTestRun extends TestRun { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/IncompatibleTestDataException.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java similarity index 82% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/IncompatibleTestDataException.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java index db4184d05..1b5a9e47d 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/IncompatibleTestDataException.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java @@ -1,6 +1,6 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; /** * Exception to throw when a test definition cannot interpret the provided test diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestData.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestData.java similarity index 75% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestData.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestData.java index 4105e0925..47973adee 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestData.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestData.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; /** * Any data required by a test in order to run: configuration, expected, diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestDataProvider.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestDataProvider.java similarity index 74% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestDataProvider.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestDataProvider.java index e0e02c3a6..754a3df00 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestDataProvider.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestDataProvider.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; public interface TestDataProvider { public T getTestData(Class clss, String key); diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestDefinition.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestDefinition.java similarity index 84% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestDefinition.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestDefinition.java index 7c75d6a73..c7bfeac71 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestDefinition.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestDefinition.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; /** * The programmatic definition of a test, which will be associated with diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestReport.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestReport.java similarity index 86% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestReport.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestReport.java index afc18a8b7..cb55fa09e 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestReport.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestReport.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; /** * A report that can be generated based on a given test result. This diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResult.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResult.java similarity index 91% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResult.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResult.java index 5de69700c..193277ca2 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResult.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResult.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; import java.util.Date; import java.util.Map; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResultListener.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResultListener.java similarity index 88% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResultListener.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResultListener.java index fc8f1d73f..3443ffa20 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResultListener.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResultListener.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; /** Listener to the operations on a test result. */ public interface TestResultListener { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResultPart.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResultPart.java similarity index 87% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResultPart.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResultPart.java index 9956d8624..004891010 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestResultPart.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestResultPart.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; /** * Part of a test result. diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRun.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRun.java similarity index 76% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRun.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRun.java index 17cf42394..af40c04e2 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRun.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRun.java @@ -1,7 +1,7 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.process.SlcExecutionAware; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.process.SlcExecutionAware; /** The actual run of a test */ public interface TestRun extends SlcExecutionAware { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRunAware.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunAware.java similarity index 75% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRunAware.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunAware.java index 6cca1440e..2a6ae6e92 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRunAware.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunAware.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; public interface TestRunAware { /** Notifies the current test run. */ diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRunDescriptor.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java similarity index 89% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRunDescriptor.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java index 5b939d004..4707595e8 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestRunDescriptor.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java @@ -1,7 +1,7 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.process.SlcExecutionRelated; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.process.SlcExecutionRelated; public class TestRunDescriptor { private String testRunUuid; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestStatus.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestStatus.java similarity index 93% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestStatus.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestStatus.java index d6954be8f..2392ba967 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/TestStatus.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestStatus.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; /** * Simple statuses. diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/WritableTestRun.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/WritableTestRun.java similarity index 78% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/WritableTestRun.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/WritableTestRun.java index 8cfe2b72c..f02df8b42 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/WritableTestRun.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/WritableTestRun.java @@ -1,6 +1,6 @@ -package org.argeo.slc.core.test; +package org.argeo.slc.test; -import org.argeo.slc.core.deploy.DeployedSystem; +import org.argeo.slc.deploy.DeployedSystem; /** Test run whose various components can be externally set. */ public interface WritableTestRun extends ExecutableTestRun { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/context/ContextAware.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/context/ContextAware.java similarity index 86% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/context/ContextAware.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/context/ContextAware.java index 5e411831e..225cd825f 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/context/ContextAware.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/context/ContextAware.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test.context; +package org.argeo.slc.test.context; import java.util.Map; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/context/ParentContextAware.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/context/ParentContextAware.java similarity index 80% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/context/ParentContextAware.java rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/context/ParentContextAware.java index 5d13324a2..b4044f7ca 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/context/ParentContextAware.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/context/ParentContextAware.java @@ -1,4 +1,4 @@ -package org.argeo.slc.core.test.context; +package org.argeo.slc.test.context; import java.util.Collection; diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/context/package.html b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/context/package.html similarity index 100% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/context/package.html rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/context/package.html diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/package.html b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/package.html similarity index 100% rename from runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/core/test/package.html rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/package.html diff --git a/runtime/org.argeo.slc.specs/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.specs/src/main/resources/META-INF/MANIFEST.MF index ff4de3c5e..f18a0eed0 100644 --- a/runtime/org.argeo.slc.specs/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.specs/src/main/resources/META-INF/MANIFEST.MF @@ -1,27 +1,25 @@ Manifest-Version: 1.0 Created-By: 1.5.0_16 (Sun Microsystems Inc.) Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Import-Package: org.apache.commons.io;version="1.4",org.argeo.slc.core - ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.S - NAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.arge - o.slc.core.process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.struc - ture;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11. - 2.SNAPSHOT",org.argeo.slc.core.test.context;version="0.11.2.SNAPSHOT" - ,org.argeo.slc.dao.process;version="0.11.2.SNAPSHOT",org.argeo.slc.da - o.test;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;version="0.11. - 2.SNAPSHOT" -Export-Package: org.argeo.slc.core.deploy;uses:="org.argeo.slc.core,or - g.argeo.slc.core.build";version="0.11.2.SNAPSHOT",org.argeo.slc.core. - test;uses:="org.argeo.slc.core.deploy,org.argeo.slc.core.process,org. - argeo.slc.core";version="0.11.2.SNAPSHOT",org.argeo.slc.core.process; - uses:="org.apache.commons.io";version="0.11.2.SNAPSHOT",org.argeo.slc - .core;version="0.11.2.SNAPSHOT",org.argeo.slc.runtime;uses:="org.arge - o.slc.core.process";version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test; - uses:="org.argeo.slc.core.test";version="0.11.2.SNAPSHOT",org.argeo.s - lc.core.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.proc - ess;uses:="org.argeo.slc.core.process";version="0.11.2.SNAPSHOT",org. - argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.argeo.slc.core.str - ucture;version="0.11.2.SNAPSHOT" +Import-Package: org.apache.commons.io;version="1.4",org.argeo.slc;vers + ion="0.11.2.SNAPSHOT",org.argeo.slc.build;version="0.11.2.SNAPSHOT",o + rg.argeo.slc.dao.process;version="0.11.2.SNAPSHOT",org.argeo.slc.dao. + test;version="0.11.2.SNAPSHOT",org.argeo.slc.deploy;version="0.11.2.S + NAPSHOT",org.argeo.slc.process;version="0.11.2.SNAPSHOT",org.argeo.sl + c.runtime;version="0.11.2.SNAPSHOT",org.argeo.slc.structure;version=" + 0.11.2.SNAPSHOT",org.argeo.slc.test;version="0.11.2.SNAPSHOT",org.arg + eo.slc.test.context;version="0.11.2.SNAPSHOT" +Export-Package: org.argeo.slc.test.context;version="0.11.2.SNAPSHOT",o + rg.argeo.slc.test;uses:="org.argeo.slc,org.argeo.slc.process,org.arge + o.slc.deploy";version="0.11.2.SNAPSHOT",org.argeo.slc;version="0.11.2 + .SNAPSHOT",org.argeo.slc.process;uses:="org.apache.commons.io";versio + n="0.11.2.SNAPSHOT",org.argeo.slc.runtime;uses:="org.argeo.slc.proces + s";version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;uses:="org.argeo. + slc.test";version="0.11.2.SNAPSHOT",org.argeo.slc.build;version="0.11 + .2.SNAPSHOT",org.argeo.slc.dao.process;uses:="org.argeo.slc.process"; + version="0.11.2.SNAPSHOT",org.argeo.slc.structure;version="0.11.2.SNA + PSHOT",org.argeo.slc.deploy;uses:="org.argeo.slc,org.argeo.slc.build" + ;version="0.11.2.SNAPSHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Specifications Bundle-Description: SLC Distribution diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntExecutionContext.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntExecutionContext.java index 75bfd340e..8b1b47ef4 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntExecutionContext.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntExecutionContext.java @@ -1,7 +1,7 @@ package org.argeo.slc.ant; import org.apache.tools.ant.Project; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.process.SlcExecution; import org.argeo.slc.runtime.SlcExecutionContext; import org.springframework.context.ApplicationContext; diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntRunner.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntRunner.java index 1adb21058..2791fe626 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntRunner.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntRunner.java @@ -10,7 +10,7 @@ import java.util.Vector; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.helper.ProjectHelper2; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; /** Run regular Ant script (that is, not SLC instrumented) */ public class AntRunner { diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcApplication.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcApplication.java index 1ff4d3059..f340db27f 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcApplication.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcApplication.java @@ -19,14 +19,14 @@ import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.helper.ProjectHelper2; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.SlcException; import org.argeo.slc.core.structure.SimpleSElement; -import org.argeo.slc.core.structure.StructureRegistry; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.structure.tree.TreeSRegistry; import org.argeo.slc.logging.Log4jUtils; +import org.argeo.slc.process.SlcExecution; import org.argeo.slc.runtime.SlcExecutionOutput; +import org.argeo.slc.structure.StructureRegistry; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcRuntime.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcRuntime.java index dfd32819d..b51759673 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcRuntime.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/AntSlcRuntime.java @@ -12,8 +12,8 @@ import java.util.UUID; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.SlcException; +import org.argeo.slc.process.SlcExecution; import org.argeo.slc.runtime.SlcExecutionOutput; import org.argeo.slc.runtime.SlcRuntime; import org.argeo.slc.spring.SpringUtils; diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java index 7447583ab..2077ec5eb 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java @@ -10,10 +10,10 @@ import org.apache.log4j.spi.LoggingEvent; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionNotifier; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.SlcException; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionNotifier; +import org.argeo.slc.process.SlcExecutionStep; public class SlcExecutionBuildListener extends AppenderSkeleton implements BuildListener { diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java index 2055e3b66..8ea4d28e2 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java @@ -5,10 +5,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.tools.ant.BuildException; import org.argeo.slc.ant.spring.SpringArg; import org.argeo.slc.ant.structure.SAwareTask; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.Deployment; -import org.argeo.slc.core.deploy.DeploymentData; -import org.argeo.slc.core.deploy.TargetData; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.Deployment; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; /** Ant task wrapping a deployment. */ public class SlcDeployTask extends SAwareTask { diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcManagerTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcManagerTask.java index c4cc74bb1..36f5cbb5e 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcManagerTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/deploy/SlcManagerTask.java @@ -2,10 +2,10 @@ package org.argeo.slc.ant.deploy; import java.lang.reflect.Method; +import org.argeo.slc.SlcException; import org.argeo.slc.ant.structure.SAwareTask; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.deploy.DeployedSystemManager; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.deploy.DeployedSystemManager; public class SlcManagerTask extends SAwareTask { private String action; diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/AbstractSpringTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/AbstractSpringTask.java index f0eae3fd0..8d851ce49 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/AbstractSpringTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/AbstractSpringTask.java @@ -5,7 +5,7 @@ import org.springframework.context.ApplicationContext; import org.apache.tools.ant.Task; import org.argeo.slc.ant.AntConstants; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.process.SlcExecution; /** Abstract Ant task providing access to a Spring context. */ public abstract class AbstractSpringTask extends Task { diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/ListArg.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/ListArg.java index 7c270eef4..582346ae6 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/ListArg.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/ListArg.java @@ -3,7 +3,7 @@ package org.argeo.slc.ant.spring; import java.util.List; import java.util.Vector; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; /** List of overrides */ public class ListArg { diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/MapArg.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/MapArg.java index 6f53994fe..185853ca3 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/MapArg.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/MapArg.java @@ -7,7 +7,7 @@ import java.util.Vector; import org.apache.tools.ant.BuildException; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; public class MapArg { private List entries = new Vector(); diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/SpringArg.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/SpringArg.java index 3f3bb3c1d..3361805a9 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/SpringArg.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/spring/SpringArg.java @@ -6,8 +6,8 @@ import java.util.Vector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tools.ant.types.DataType; +import org.argeo.slc.SlcException; import org.argeo.slc.ant.AntConstants; -import org.argeo.slc.core.SlcException; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.factory.InitializingBean; diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java index 134b2c150..61a4ae912 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java @@ -5,15 +5,15 @@ import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Target; +import org.argeo.slc.SlcException; import org.argeo.slc.ant.AntConstants; import org.argeo.slc.ant.spring.AbstractSpringTask; import org.argeo.slc.ant.spring.SpringArg; -import org.argeo.slc.core.SlcException; import org.argeo.slc.core.structure.SimpleSElement; -import org.argeo.slc.core.structure.StructureAware; -import org.argeo.slc.core.structure.StructureElement; -import org.argeo.slc.core.structure.StructureRegistry; import org.argeo.slc.core.structure.tree.TreeSPath; +import org.argeo.slc.structure.StructureAware; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.structure.StructureRegistry; /** Ant task that can be registered within a structure. */ public abstract class SAwareTask extends AbstractSpringTask { diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/ParentContextType.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/ParentContextType.java index 7915b1a42..83dd5a17f 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/ParentContextType.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/ParentContextType.java @@ -7,11 +7,11 @@ import java.util.Vector; import org.apache.tools.ant.types.DataType; +import org.argeo.slc.SlcException; import org.argeo.slc.ant.spring.MapArg; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.test.context.ContextAware; import org.argeo.slc.core.test.context.ContextUtils; -import org.argeo.slc.core.test.context.ParentContextAware; +import org.argeo.slc.test.context.ContextAware; +import org.argeo.slc.test.context.ParentContextAware; public class ParentContextType extends DataType implements ParentContextAware { private MapArg values = null; diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java index 7aab47597..d8de25ab4 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java @@ -7,8 +7,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.ant.spring.SpringArg; import org.argeo.slc.ant.structure.SAwareTask; -import org.argeo.slc.core.structure.StructureRegistry; -import org.argeo.slc.core.test.TestResult; +import org.argeo.slc.structure.StructureRegistry; +import org.argeo.slc.test.TestResult; /** Ant tasks closing a given result. */ public class SlcCloseTestResultTask extends SAwareTask { diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcReportTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcReportTask.java index 75877625d..45d63f651 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcReportTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcReportTask.java @@ -1,10 +1,10 @@ package org.argeo.slc.ant.test; import org.argeo.slc.ant.structure.SAwareTask; -import org.argeo.slc.core.structure.StructureAware; -import org.argeo.slc.core.structure.StructureRegistry; -import org.argeo.slc.core.test.TestReport; -import org.argeo.slc.core.test.TestResult; +import org.argeo.slc.structure.StructureAware; +import org.argeo.slc.structure.StructureRegistry; +import org.argeo.slc.test.TestReport; +import org.argeo.slc.test.TestResult; /** Ant tasks generating a report. */ public class SlcReportTask extends SAwareTask { diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java index 66444f17e..66a416c6e 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java @@ -6,21 +6,21 @@ import org.apache.tools.ant.BuildException; import org.argeo.slc.ant.AntConstants; import org.argeo.slc.ant.spring.SpringArg; import org.argeo.slc.ant.structure.SAwareTask; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.structure.StructureAware; import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.core.test.ExecutableTestRun; import org.argeo.slc.core.test.SimpleResultPart; import org.argeo.slc.core.test.SimpleTestResult; import org.argeo.slc.core.test.SimpleTestRun; -import org.argeo.slc.core.test.TestData; -import org.argeo.slc.core.test.TestDefinition; -import org.argeo.slc.core.test.TestResult; -import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.core.test.TestStatus; -import org.argeo.slc.core.test.WritableTestRun; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.process.SlcExecution; import org.argeo.slc.spring.SpringUtils; +import org.argeo.slc.structure.StructureAware; +import org.argeo.slc.test.ExecutableTestRun; +import org.argeo.slc.test.TestData; +import org.argeo.slc.test.TestDefinition; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestStatus; +import org.argeo.slc.test.WritableTestRun; import org.springframework.beans.BeansException; /** Ant task wrapping a test run. */ diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java index bf6c0b603..5fdb49f03 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java +++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java @@ -6,7 +6,7 @@ import java.util.UUID; import org.argeo.slc.ant.AntConstants; import org.argeo.slc.ant.AntExecutionContext; import org.argeo.slc.ant.AntSlcApplication; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.process.SlcExecution; import org.argeo.slc.runtime.SlcExecutionOutput; import org.argeo.slc.unit.AbstractSpringTestCase; import org.springframework.core.io.FileSystemResource; diff --git a/runtime/org.argeo.slc.support.ant/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.support.ant/src/main/resources/META-INF/MANIFEST.MF index 3136e2af6..33d28843b 100644 --- a/runtime/org.argeo.slc.support.ant/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.support.ant/src/main/resources/META-INF/MANIFEST.MF @@ -6,57 +6,60 @@ Import-Package: junit.framework;version="3.8",org.apache.commons.io;ve ;version="1.2",org.apache.log4j.spi;version="1.2",org.apache.tools.an t;version="1.7",org.apache.tools.ant.helper;version="1.7",org.apache. tools.ant.types;version="1.7",org.apache.tools.ant.util;version="1.7" - ,org.argeo.slc.ant;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.deploy - ;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.spring;version="0.11.2.S - NAPSHOT",org.argeo.slc.ant.structure;version="0.11.2.SNAPSHOT",org.ar - geo.slc.ant.test;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.unit;ver - sion="0.11.2.SNAPSHOT",org.argeo.slc.core;version="0.11.2.SNAPSHOT",o - rg.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.argeo.slc.core. - deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;version=" - 0.11.2.SNAPSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHO - T",org.argeo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.ar - geo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.c - ontext;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;version="0.11. - 2.SNAPSHOT",org.argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.argeo - .slc.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;version="0.1 - 1.2.SNAPSHOT",org.springframework.beans;version="2.5.6.A",org.springf - ramework.beans.factory;version="2.5.6.A",org.springframework.beans.fa - ctory.config;version="2.5.6.A",org.springframework.beans.factory.supp - ort;version="2.5.6.A",org.springframework.beans.factory.xml;version=" - 2.5.6.A",org.springframework.context;version="2.5.6.A",org.springfram - ework.context.support;version="2.5.6.A",org.springframework.core.io;v - ersion="2.5.6.A",org.springframework.util;version="2.5.6.A" -Export-Package: org.argeo.slc.ant.deploy;uses:="org.argeo.slc.ant.stru - cture,org.argeo.slc.core.deploy,org.apache.tools.ant,org.argeo.slc.co - re,org.argeo.slc.ant.spring,org.apache.commons.logging,org.springfram - ework.context,org.argeo.slc.core.build";version="0.11.2.SNAPSHOT",org - .argeo.slc.ant.structure;uses:="org.apache.tools.ant,org.argeo.slc.co - re,org.argeo.slc.ant.spring,org.springframework.context,org.argeo.slc - .core.structure.tree,org.argeo.slc.core.structure";version="0.11.2.SN - APSHOT",org.argeo.slc.ant;uses:="org.argeo.slc.core.process,org.argeo - .slc.core,org.springframework.context.support,org.springframework.cor - e.io,org.apache.tools.ant.util,org.apache.tools.ant.helper,org.argeo. - slc.spring,org.springframework.beans.factory,org.argeo.slc.core.struc - ture.tree,org.apache.log4j.spi,org.apache.tools.ant,org.apache.common - s.logging,org.springframework.context,org.springframework.beans.facto - ry.support,org.argeo.slc.logging,org.apache.log4j,org.springframework - .beans.factory.config,org.springframework.beans.factory.xml,org.argeo - .slc.runtime,org.apache.commons.io,org.springframework.util,org.argeo - .slc.core.structure";version="0.11.2.SNAPSHOT",org.argeo.slc.ant.unit - ;uses:="org.argeo.slc.ant,org.argeo.slc.unit,org.springframework.core - .io,org.argeo.slc.core.process,org.argeo.slc.runtime,junit.framework, - org.springframework.context";version="0.11.2.SNAPSHOT",org.argeo.slc. - ant.test;uses:="org.argeo.slc.core.deploy,org.apache.tools.ant.types, - org.argeo.slc.core.test,org.apache.tools.ant,org.argeo.slc.core.proce - ss,org.argeo.slc.core,org.argeo.slc.ant.spring,org.argeo.slc.core.tes - t.context,org.apache.commons.logging,org.springframework.context,org. - argeo.slc.ant.structure,org.springframework.beans,org.argeo.slc.sprin - g,org.springframework.beans.factory,org.argeo.slc.core.structure.tree - ,org.argeo.slc.core.structure";version="0.11.2.SNAPSHOT",org.argeo.sl - c.ant.spring;uses:="org.apache.tools.ant.types,org.apache.tools.ant,o - rg.argeo.slc.core.process,org.argeo.slc.core,org.springframework.bean - s,org.apache.commons.logging,org.springframework.context,org.springfr - amework.beans.factory";version="0.11.2.SNAPSHOT" + ,org.argeo.slc;version="0.11.2.SNAPSHOT",org.argeo.slc.ant;version="0 + .11.2.SNAPSHOT",org.argeo.slc.ant.deploy;version="0.11.2.SNAPSHOT",or + g.argeo.slc.ant.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.st + ructure;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.test;version="0.1 + 1.2.SNAPSHOT",org.argeo.slc.ant.unit;version="0.11.2.SNAPSHOT",org.ar + geo.slc.build;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure; + version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version=" + 0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",or + g.argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",org.argeo.slc + .deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;version="0.11 + .2.SNAPSHOT",org.argeo.slc.process;version="0.11.2.SNAPSHOT",org.arge + o.slc.runtime;version="0.11.2.SNAPSHOT",org.argeo.slc.spring;version= + "0.11.2.SNAPSHOT",org.argeo.slc.structure;version="0.11.2.SNAPSHOT",o + rg.argeo.slc.test;version="0.11.2.SNAPSHOT",org.argeo.slc.test.contex + t;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;version="0.11.2.SNAPSH + OT",org.springframework.beans;version="2.5.6.A",org.springframework.b + eans.factory;version="2.5.6.A",org.springframework.beans.factory.conf + ig;version="2.5.6.A",org.springframework.beans.factory.support;versio + n="2.5.6.A",org.springframework.beans.factory.xml;version="2.5.6.A",o + rg.springframework.context;version="2.5.6.A",org.springframework.cont + ext.support;version="2.5.6.A",org.springframework.core.io;version="2. + 5.6.A",org.springframework.util;version="2.5.6.A" +Export-Package: org.argeo.slc.ant.deploy;uses:="org.argeo.slc,org.arge + o.slc.ant.structure,org.apache.tools.ant,org.argeo.slc.ant.spring,org + .argeo.slc.build,org.apache.commons.logging,org.springframework.conte + xt,org.argeo.slc.deploy";version="0.11.2.SNAPSHOT",org.argeo.slc.ant. + structure;uses:="org.argeo.slc,org.apache.tools.ant,org.argeo.slc.ant + .spring,org.springframework.context,org.argeo.slc.structure,org.argeo + .slc.core.structure.tree,org.argeo.slc.core.structure";version="0.11. + 2.SNAPSHOT",org.argeo.slc.ant;uses:="org.argeo.slc,org.springframewor + k.context.support,org.argeo.slc.process,org.springframework.core.io,o + rg.apache.tools.ant.util,org.apache.tools.ant.helper,org.argeo.slc.sp + ring,org.springframework.beans.factory,org.argeo.slc.core.structure.t + ree,org.apache.log4j.spi,org.apache.tools.ant,org.apache.commons.logg + ing,org.springframework.context,org.argeo.slc.structure,org.springfra + mework.beans.factory.support,org.argeo.slc.logging,org.apache.log4j,o + rg.springframework.beans.factory.config,org.springframework.beans.fac + tory.xml,org.argeo.slc.runtime,org.apache.commons.io,org.springframew + ork.util,org.argeo.slc.core.structure";version="0.11.2.SNAPSHOT",org. + argeo.slc.ant.unit;uses:="org.argeo.slc.ant,org.argeo.slc.unit,org.ar + geo.slc.process,org.springframework.core.io,org.argeo.slc.runtime,jun + it.framework,org.springframework.context";version="0.11.2.SNAPSHOT",o + rg.argeo.slc.ant.test;uses:="org.argeo.slc.test.context,org.argeo.slc + ,org.argeo.slc.test,org.apache.tools.ant.types,org.argeo.slc.core.tes + t,org.apache.tools.ant,org.argeo.slc.ant.spring,org.argeo.slc.core.te + st.context,org.apache.commons.logging,org.springframework.context,org + .argeo.slc.structure,org.argeo.slc.ant.structure,org.argeo.slc.proces + s,org.springframework.beans,org.argeo.slc.spring,org.springframework. + beans.factory,org.argeo.slc.core.structure.tree,org.argeo.slc.deploy" + ;version="0.11.2.SNAPSHOT",org.argeo.slc.ant.spring;uses:="org.argeo. + slc,org.apache.tools.ant.types,org.argeo.slc.process,org.apache.tools + .ant,org.springframework.beans,org.apache.commons.logging,org.springf + ramework.context,org.springframework.beans.factory";version="0.11.2.S + NAPSHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Support Ant Bundle-Description: SLC Distribution diff --git a/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 index 4cc334878..567f9030b 100644 --- a/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 @@ -2,7 +2,7 @@ package org.argeo.slc.castor.test.tree; import org.argeo.slc.core.test.SimpleResultPart; import org.argeo.slc.core.test.SlcTestUtils; -import org.argeo.slc.core.test.TestStatus; +import org.argeo.slc.test.TestStatus; import org.exolab.castor.mapping.AbstractFieldHandler; public class StatusFieldHandler extends AbstractFieldHandler { diff --git a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/process/FileSlcExecutionNotifier.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/process/FileSlcExecutionNotifier.java index 0b9f682b0..f7aa6840b 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/process/FileSlcExecutionNotifier.java +++ b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/process/FileSlcExecutionNotifier.java @@ -11,7 +11,10 @@ import java.util.Map; import javax.xml.transform.stream.StreamResult; import org.apache.commons.io.IOUtils; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionNotifier; +import org.argeo.slc.process.SlcExecutionStep; import org.springframework.oxm.Marshaller; public class FileSlcExecutionNotifier implements SlcExecutionNotifier { diff --git a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/test/tree/XsltReportGenerator.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/test/tree/XsltReportGenerator.java index 059c209f1..3bb7cd466 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/test/tree/XsltReportGenerator.java +++ b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/core/test/tree/XsltReportGenerator.java @@ -24,9 +24,9 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.test.TestResultListener; -import org.argeo.slc.core.test.TestResultPart; +import org.argeo.slc.SlcException; +import org.argeo.slc.test.TestResultListener; +import org.argeo.slc.test.TestResultPart; public class XsltReportGenerator implements TestResultListener { private Log log = LogFactory.getLog(getClass()); diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.support.castor/src/main/resources/META-INF/MANIFEST.MF index 8aaef36f4..d3048b78b 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.support.castor/src/main/resources/META-INF/MANIFEST.MF @@ -5,41 +5,42 @@ Import-Package: javax.xml.parsers;version="1.3",javax.xml.transform;ve rsion="1.3",javax.xml.transform.dom;version="1.3",javax.xml.transform .stream;version="1.3",junit.framework;version="3.8",org.apache.common s.io;version="1.4",org.apache.commons.logging;version="1.1",org.argeo - .slc.castor;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.msg;versio - n="0.11.2.SNAPSHOT",org.argeo.slc.castor.process;version="0.11.2.SNAP - SHOT",org.argeo.slc.castor.spring;version="0.11.2.SNAPSHOT",org.argeo - .slc.castor.structure;version="0.11.2.SNAPSHOT",org.argeo.slc.castor. - structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.test;ve - rsion="0.11.2.SNAPSHOT",org.argeo.slc.castor.test.tree;version="0.11. - 2.SNAPSHOT",org.argeo.slc.core;version="0.11.2.SNAPSHOT",org.argeo.sl - c.core.process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure - .tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11 - .2.SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",o - rg.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.exolab.castor.mapping - ;version="1.2",org.springframework.core.io;version="2.5.6.A",org.spri - ngframework.oxm;version="1.5.5.A",org.springframework.xml.transform;v - ersion="1.5.5.A",org.springframework.xml.validation;version="1.5.5.A" - ,org.springframework.xml.xsd;version="1.5.5.A",org.w3c.dom;version="1 - .3",org.xml.sax;version="1.3" -Export-Package: org.argeo.slc.core.test.tree;uses:="org.argeo.slc.core - .test,org.argeo.slc.core,org.w3c.dom,org.apache.commons.logging,org.s - pringframework.oxm,javax.xml.transform,javax.xml.transform.dom,org.sp - ringframework.core.io,javax.xml.parsers,org.apache.commons.io,javax.x - ml.transform.stream,org.springframework.xml.transform";version="0.11. - 2.SNAPSHOT",org.argeo.slc.castor.test.tree;uses:="org.argeo.slc.core. - test,org.exolab.castor.mapping";version="0.11.2.SNAPSHOT",org.argeo.s - lc.unit;uses:="org.xml.sax,org.springframework.xml.xsd,org.apache.com - mons.logging,junit.framework,org.springframework.xml.validation,javax - .xml.transform";version="0.11.2.SNAPSHOT",org.argeo.slc.castor.proces - s;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;uses:="org.arg - eo.slc.core,org.apache.commons.io,javax.xml.transform.stream,org.spri - ngframework.oxm,javax.xml.transform";version="0.11.2.SNAPSHOT",org.ar - geo.slc.castor.structure.tree;uses:="org.exolab.castor.mapping,org.ar - geo.slc.core.structure.tree";version="0.11.2.SNAPSHOT",org.argeo.slc. - castor.structure;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.msg;v - ersion="0.11.2.SNAPSHOT",org.argeo.slc.castor.test;version="0.11.2.SN - APSHOT",org.argeo.slc.castor.spring;version="0.11.2.SNAPSHOT",org.arg - eo.slc.castor;version="0.11.2.SNAPSHOT" + .slc;version="0.11.2.SNAPSHOT",org.argeo.slc.castor;version="0.11.2.S + NAPSHOT",org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org.argeo + .slc.castor.process;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.sp + ring;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure;version + ="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure.tree;version="0.11. + 2.SNAPSHOT",org.argeo.slc.castor.test;version="0.11.2.SNAPSHOT",org.a + rgeo.slc.castor.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.cor + e.process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree + ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SN + APSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.ar + geo.slc.process;version="0.11.2.SNAPSHOT",org.argeo.slc.test;version= + "0.11.2.SNAPSHOT",org.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.ex + olab.castor.mapping;version="1.2",org.springframework.core.io;version + ="2.5.6.A",org.springframework.oxm;version="1.5.5.A",org.springframew + ork.xml.transform;version="1.5.5.A",org.springframework.xml.validatio + n;version="1.5.5.A",org.springframework.xml.xsd;version="1.5.5.A",org + .w3c.dom;version="1.3",org.xml.sax;version="1.3" +Export-Package: org.argeo.slc.core.test.tree;uses:="org.argeo.slc,org. + argeo.slc.test,org.w3c.dom,org.apache.commons.logging,org.springframe + work.oxm,javax.xml.transform,javax.xml.transform.dom,org.springframew + ork.core.io,javax.xml.parsers,org.apache.commons.io,javax.xml.transfo + rm.stream,org.springframework.xml.transform";version="0.11.2.SNAPSHOT + ",org.argeo.slc.castor.test.tree;uses:="org.argeo.slc.test,org.argeo. + slc.core.test,org.exolab.castor.mapping";version="0.11.2.SNAPSHOT",or + g.argeo.slc.unit;uses:="org.xml.sax,org.springframework.xml.xsd,org.a + pache.commons.logging,junit.framework,org.springframework.xml.validat + ion,javax.xml.transform";version="0.11.2.SNAPSHOT",org.argeo.slc.cast + or.process;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;uses: + ="org.argeo.slc,org.argeo.slc.process,org.apache.commons.io,javax.xml + .transform.stream,org.springframework.oxm,javax.xml.transform";versio + n="0.11.2.SNAPSHOT",org.argeo.slc.castor.structure.tree;uses:="org.ex + olab.castor.mapping,org.argeo.slc.core.structure.tree";version="0.11. + 2.SNAPSHOT",org.argeo.slc.castor.structure;version="0.11.2.SNAPSHOT", + org.argeo.slc.castor.msg;version="0.11.2.SNAPSHOT",org.argeo.slc.cast + or.test;version="0.11.2.SNAPSHOT",org.argeo.slc.castor.spring;version + ="0.11.2.SNAPSHOT",org.argeo.slc.castor;version="0.11.2.SNAPSHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Support Castor Bundle-Description: Implementations of SLC Specs using Castor diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg/mapping.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg/mapping.xml index 2f54085c0..fafc89af0 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg/mapping.xml +++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg/mapping.xml @@ -76,7 +76,7 @@ ns-prefix="slc" /> + type="org.argeo.slc.process.SlcExecutionStep"> @@ -92,7 +92,7 @@ + type="org.argeo.slc.process.SlcExecution" /> diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process/mapping.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process/mapping.xml index 1b5b2ec95..d37f3f839 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process/mapping.xml +++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process/mapping.xml @@ -5,7 +5,7 @@ Process objects XML mapping - + @@ -16,7 +16,7 @@ + type="org.argeo.slc.process.SlcExecutionStep"> @@ -35,7 +35,7 @@ - + diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test/mapping.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test/mapping.xml index 5b6384ddd..520cfa346 100644 --- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test/mapping.xml +++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test/mapping.xml @@ -3,7 +3,7 @@ Test objects XML mapping - diff --git a/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java index efb4cf513..5c70382a6 100644 --- a/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java +++ b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java @@ -12,6 +12,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.msg.process.SlcExecutionRequest; import org.argeo.slc.msg.process.SlcExecutionStepsRequest; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.unit.AbstractSpringTestCase; import org.argeo.slc.unit.UnitXmlUtils; import org.argeo.slc.unit.process.SlcExecutionTestUtils; diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java b/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java index a6c387868..5cfde101e 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java +++ b/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/process/SlcExecutionDaoHibernate.java @@ -6,10 +6,10 @@ import java.util.List; import org.springframework.orm.hibernate3.HibernateCallback; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.SlcException; import org.argeo.slc.dao.process.SlcExecutionDao; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; import org.hibernate.HibernateException; import org.hibernate.Session; diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/test/TestRunDescriptorDaoHibernate.java b/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/test/TestRunDescriptorDaoHibernate.java index 49162d529..a0a4d9651 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/test/TestRunDescriptorDaoHibernate.java +++ b/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/test/TestRunDescriptorDaoHibernate.java @@ -2,8 +2,8 @@ package org.argeo.slc.hibernate.test; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -import org.argeo.slc.core.test.TestRunDescriptor; import org.argeo.slc.dao.test.TestRunDescriptorDao; +import org.argeo.slc.test.TestRunDescriptor; public class TestRunDescriptorDaoHibernate extends HibernateDaoSupport implements TestRunDescriptorDao { diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernate.java b/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernate.java index 9d40956bf..c0290965f 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernate.java +++ b/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernate.java @@ -6,14 +6,14 @@ import java.util.List; import java.util.Map; import java.util.SortedMap; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.structure.StructureElement; +import org.argeo.slc.SlcException; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestResult; import org.argeo.slc.core.test.tree.PartSubList; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.dao.test.tree.TreeTestResultDao; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.test.TestResult; import org.hibernate.HibernateException; import org.hibernate.Session; import org.springframework.orm.hibernate3.HibernateCallback; diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/unit/IndependentDbTestCase.java b/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/unit/IndependentDbTestCase.java index f9900a95d..4bddacb88 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/unit/IndependentDbTestCase.java +++ b/runtime/org.argeo.slc.support.hibernate/src/main/java/org/argeo/slc/hibernate/unit/IndependentDbTestCase.java @@ -6,7 +6,7 @@ import java.sql.SQLException; import javax.sql.DataSource; import org.apache.commons.io.IOUtils; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.argeo.slc.unit.AbstractSpringTestCase; import org.dbunit.DataSourceDatabaseTester; import org.dbunit.DatabaseUnitException; diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.support.hibernate/src/main/resources/META-INF/MANIFEST.MF index 3be9e0151..e48be8018 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/META-INF/MANIFEST.MF @@ -2,46 +2,46 @@ Manifest-Version: 1.0 Created-By: 1.5.0_16 (Sun Microsystems Inc.) Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Import-Package: javax.sql,org.apache.commons.io;version="1.4",org.arge - o.slc.core;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;versi - on="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;version="0.11. - 2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.arg - eo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.pro - cess;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;version="0.11.2 - .SNAPSHOT",org.argeo.slc.dao.test.tree;version="0.11.2.SNAPSHOT",org. - argeo.slc.hibernate.cache;version="0.11.2.SNAPSHOT",org.argeo.slc.hib - ernate.process;version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.spri - ng;version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.structure;versio - n="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.test;version="0.11.2.SNAP - SHOT",org.argeo.slc.hibernate.test.tree;version="0.11.2.SNAPSHOT",org - .argeo.slc.hibernate.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.sup - port.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;version=" - 0.11.2.SNAPSHOT",org.dbunit;version="2.2",org.dbunit.database;version - ="2.2",org.dbunit.dataset;version="2.2",org.dbunit.dataset.xml;versio - n="2.2",org.dbunit.operation;version="2.2",org.hibernate;version="3.2 - .6.ga",org.hibernate.cfg;version="3.2.6.ga",org.hibernate.tool.hbm2dd - l;version="3.2.6.ga",org.springframework.context;version="2.5.6.A",or - g.springframework.core.io;version="2.5.6.A",org.springframework.orm.h - ibernate3;version="2.5.6.A",org.springframework.orm.hibernate3.suppor - t;version="2.5.6.A" + o.slc;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;ver + sion="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSH + OT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.argeo. + slc.dao.process;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test;vers + ion="0.11.2.SNAPSHOT",org.argeo.slc.dao.test.tree;version="0.11.2.SNA + PSHOT",org.argeo.slc.hibernate.cache;version="0.11.2.SNAPSHOT",org.ar + geo.slc.hibernate.process;version="0.11.2.SNAPSHOT",org.argeo.slc.hib + ernate.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.struc + ture;version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.test;version=" + 0.11.2.SNAPSHOT",org.argeo.slc.hibernate.test.tree;version="0.11.2.SN + APSHOT",org.argeo.slc.hibernate.unit;version="0.11.2.SNAPSHOT",org.ar + geo.slc.process;version="0.11.2.SNAPSHOT",org.argeo.slc.support.deplo + y.db;version="0.11.2.SNAPSHOT",org.argeo.slc.test;version="0.11.2.SNA + PSHOT",org.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.dbunit;versio + n="2.2",org.dbunit.database;version="2.2",org.dbunit.dataset;version= + "2.2",org.dbunit.dataset.xml;version="2.2",org.dbunit.operation;versi + on="2.2",org.hibernate;version="3.2.6.ga",org.hibernate.cfg;version=" + 3.2.6.ga",org.hibernate.tool.hbm2ddl;version="3.2.6.ga",org.springfra + mework.context;version="2.5.6.A",org.springframework.core.io;version= + "2.5.6.A",org.springframework.orm.hibernate3;version="2.5.6.A",org.sp + ringframework.orm.hibernate3.support;version="2.5.6.A" Export-Package: org.argeo.slc.hibernate.spring;version="0.11.2.SNAPSHO T",org.argeo.slc.hibernate.test.tree;uses:="org.argeo.slc.dao.test.tr - ee,org.argeo.slc.core.test.tree,org.argeo.slc.core.test,org.hibernate - ,org.argeo.slc.core,org.springframework.orm.hibernate3.support,org.sp - ringframework.orm.hibernate3,org.argeo.slc.core.structure.tree";versi - on="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.structure;version="0.11. - 2.SNAPSHOT",org.argeo.slc.hibernate.cache;version="0.11.2.SNAPSHOT",o - rg.argeo.slc.hibernate.test;uses:="org.argeo.slc.core.test,org.argeo. - slc.dao.test,org.springframework.orm.hibernate3.support,org.springfra - mework.orm.hibernate3";version="0.11.2.SNAPSHOT",org.argeo.slc.hibern - ate.unit;uses:="org.hibernate.cfg,org.hibernate,org.dbunit.database,o - rg.argeo.slc.core,org.dbunit.dataset.xml,org.springframework.context, - org.dbunit,javax.sql,org.hibernate.tool.hbm2ddl,org.argeo.slc.support - .deploy.db,org.dbunit.dataset,org.argeo.slc.unit,org.springframework. - core.io,org.dbunit.operation,org.apache.commons.io,org.springframewor - k.orm.hibernate3";version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.p - rocess;uses:="org.hibernate,org.argeo.slc.core.process,org.argeo.slc. - core,org.springframework.orm.hibernate3.support,org.springframework.o - rm.hibernate3,org.argeo.slc.dao.process";version="0.11.2.SNAPSHOT" + ee,org.argeo.slc.test,org.argeo.slc,org.argeo.slc.core.test,org.hiber + nate,org.springframework.orm.hibernate3.support,org.argeo.slc.core.te + st.tree,org.springframework.orm.hibernate3,org.argeo.slc.core.structu + re.tree";version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.structure; + version="0.11.2.SNAPSHOT",org.argeo.slc.hibernate.cache;version="0.11 + .2.SNAPSHOT",org.argeo.slc.hibernate.test;uses:="org.argeo.slc.test,o + rg.argeo.slc.dao.test,org.springframework.orm.hibernate3.support,org. + springframework.orm.hibernate3";version="0.11.2.SNAPSHOT",org.argeo.s + lc.hibernate.unit;uses:="org.argeo.slc,org.hibernate.cfg,org.hibernat + e,org.dbunit.database,org.dbunit.dataset.xml,org.springframework.cont + ext,org.dbunit,javax.sql,org.hibernate.tool.hbm2ddl,org.argeo.slc.sup + port.deploy.db,org.dbunit.dataset,org.argeo.slc.unit,org.springframew + ork.core.io,org.dbunit.operation,org.apache.commons.io,org.springfram + ework.orm.hibernate3";version="0.11.2.SNAPSHOT",org.argeo.slc.hiberna + te.process;uses:="org.argeo.slc,org.argeo.slc.process,org.hibernate,o + rg.springframework.orm.hibernate3.support,org.springframework.orm.hib + ernate3,org.argeo.slc.dao.process";version="0.11.2.SNAPSHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Support Hibernate Bundle-Description: SLC Distribution diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml index 5a9702421..edc0f735a 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml +++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml @@ -2,7 +2,7 @@ - + @@ -17,7 +17,7 @@ + class="org.argeo.slc.process.SlcExecutionStep" /> - + diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml index f28c1264e..09d0a0dc0 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml +++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml @@ -2,7 +2,7 @@ - + diff --git a/runtime/org.argeo.slc.support.hibernate/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java b/runtime/org.argeo.slc.support.hibernate/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java index 28c7babcd..e54965d30 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java +++ b/runtime/org.argeo.slc.support.hibernate/src/test/java/org/argeo/slc/hibernate/process/SlcExecutionHibernateTest.java @@ -3,10 +3,10 @@ package org.argeo.slc.hibernate.process; import java.sql.SQLException; import java.util.List; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionStep; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.hibernate.unit.HibernateTestCase; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.unit.process.SlcExecutionTestUtils; import org.hibernate.HibernateException; import org.hibernate.Session; diff --git a/runtime/org.argeo.slc.support.hibernate/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java b/runtime/org.argeo.slc.support.hibernate/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java index 6bf0ba131..80eae834f 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java +++ b/runtime/org.argeo.slc.support.hibernate/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java @@ -6,10 +6,10 @@ import org.argeo.slc.core.structure.SimpleSElement; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.structure.tree.TreeSRegistry; import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.dao.test.tree.TreeTestResultDao; import org.argeo.slc.hibernate.unit.HibernateTestCase; +import org.argeo.slc.test.TestStatus; import org.argeo.slc.unit.test.tree.TreeTestResultTestUtils; import org.argeo.slc.unit.test.tree.UnitTestTreeUtil; import org.hibernate.HibernateException; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java index 5f9894014..6c9336854 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java @@ -6,7 +6,10 @@ import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.build.Distribution; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.InstalledExecutables; +import org.argeo.slc.deploy.TargetData; public class SimpleExecutables implements InstalledExecutables { private final static Log log = LogFactory.getLog(SimpleExecutables.class); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java index 2bab2e74c..f7e8e08dc 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.TreeMap; import org.argeo.slc.core.structure.tree.TreeSPath; +import org.argeo.slc.structure.StructureElement; /** * Basic implementation of StructureElement. diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java index c673faa65..611749f87 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.StringTokenizer; import java.util.Vector; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.structure.StructurePath; -import org.argeo.slc.core.structure.StructureRegistry; +import org.argeo.slc.SlcException; +import org.argeo.slc.structure.StructurePath; +import org.argeo.slc.structure.StructureRegistry; /** * Path for tree based StructureRegistry implementations. diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java index 36c85728f..5b0a54fdd 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java @@ -5,10 +5,10 @@ import java.util.Map; import java.util.TreeMap; import java.util.Vector; -import org.argeo.slc.core.UnsupportedException; +import org.argeo.slc.UnsupportedException; import org.argeo.slc.core.structure.SimpleSElement; -import org.argeo.slc.core.structure.StructureElement; -import org.argeo.slc.core.structure.StructureRegistry; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.structure.StructureRegistry; /** Tree based implementation of a structure registry. */ public class TreeSRegistry implements StructureRegistry { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java index 43a145a4e..b27e4ba7f 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java @@ -1,8 +1,8 @@ package org.argeo.slc.core.structure.tree; -import org.argeo.slc.core.structure.StructureAware; -import org.argeo.slc.core.structure.StructureElement; -import org.argeo.slc.core.structure.StructureRegistry; +import org.argeo.slc.structure.StructureAware; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.structure.StructureRegistry; public interface TreeSRelated extends StructureAware { public TreeSPath getBasePath(); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelatedHelper.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelatedHelper.java index acc829c36..8dc00784e 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelatedHelper.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelatedHelper.java @@ -1,8 +1,8 @@ package org.argeo.slc.core.structure.tree; import org.argeo.slc.core.structure.SimpleSElement; -import org.argeo.slc.core.structure.StructureElement; -import org.argeo.slc.core.structure.StructureRegistry; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.structure.StructureRegistry; /** * Provides default implementations of some methods of TreeSRelated. diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestData.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestData.java index e6be49632..bcde23aa6 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestData.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestData.java @@ -1,5 +1,7 @@ package org.argeo.slc.core.test; +import org.argeo.slc.test.TestData; + public class BasicTestData implements TestData { private Object expected; private Object reached; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java index 4d62ba39d..fd07cbe58 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/BasicTestDefinition.java @@ -1,9 +1,14 @@ package org.argeo.slc.core.test; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.argeo.slc.core.structure.tree.TreeSRelatedHelper; -import org.argeo.slc.core.test.context.ContextAware; import org.argeo.slc.core.test.context.ContextUtils; +import org.argeo.slc.test.TestData; +import org.argeo.slc.test.TestDefinition; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestRun; +import org.argeo.slc.test.TestStatus; +import org.argeo.slc.test.context.ContextAware; /** Understands basic test data and context aware test data. */ public class BasicTestDefinition extends TreeSRelatedHelper implements diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java index db5f22228..0581ff1a9 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleResultPart.java @@ -1,5 +1,10 @@ package org.argeo.slc.core.test; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestRun; +import org.argeo.slc.test.TestRunAware; +import org.argeo.slc.test.TestStatus; + /** *

* Basic implementation of a result part, implementing the standard three status diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java index 4dcc63bbf..4cd5eedcf 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java @@ -10,7 +10,10 @@ import java.util.Vector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestRun; /** * Basic implementation of a test result containing only a list of result parts. diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java index f48e21165..a81c109d3 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java @@ -2,10 +2,15 @@ package org.argeo.slc.core.test; import java.util.UUID; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionRelated; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionRelated; +import org.argeo.slc.process.SlcExecutionStep; +import org.argeo.slc.test.ExecutableTestRun; +import org.argeo.slc.test.TestData; +import org.argeo.slc.test.TestDefinition; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.WritableTestRun; /** * A basic bean implementation of a WritableTestRun, holding diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java index 9eeda4064..060bfba56 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java @@ -1,6 +1,7 @@ package org.argeo.slc.core.test; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; +import org.argeo.slc.test.TestStatus; public abstract class SlcTestUtils { public static String statusToString(Integer status) { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/TestDataUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/TestDataUtils.java index 66cae87c3..c05a5a544 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/TestDataUtils.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/TestDataUtils.java @@ -1,6 +1,8 @@ package org.argeo.slc.core.test; -import org.argeo.slc.core.UnsupportedException; +import org.argeo.slc.UnsupportedException; +import org.argeo.slc.test.TestData; +import org.argeo.slc.test.TestDataProvider; /** Utilities for dealing with test datas. */ public class TestDataUtils { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java index 3826a8710..ecaa7c347 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java @@ -6,14 +6,16 @@ import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.structure.StructureAware; -import org.argeo.slc.core.structure.StructureElement; -import org.argeo.slc.core.structure.StructureRegistry; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.structure.tree.TreeSRelated; import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestResult; -import org.argeo.slc.core.test.TestStatus; +import org.argeo.slc.structure.StructureAware; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.structure.StructureRegistry; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestStatus; +import org.argeo.slc.test.context.ContextAware; +import org.argeo.slc.test.context.ParentContextAware; public class ContextUtils { private final static Log log = LogFactory.getLog(ContextUtils.class); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/DefaultContextTestData.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/DefaultContextTestData.java index a39a91539..949360e1f 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/DefaultContextTestData.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/DefaultContextTestData.java @@ -1,8 +1,8 @@ package org.argeo.slc.core.test.context; -import org.argeo.slc.core.test.TestData; -import org.argeo.slc.core.test.TestDataProvider; import org.argeo.slc.core.test.TestDataUtils; +import org.argeo.slc.test.TestData; +import org.argeo.slc.test.TestDataProvider; public class DefaultContextTestData extends SimpleContextAware implements TestData, TestDataProvider { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java index c4fb5ab40..637ff0192 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java @@ -5,7 +5,9 @@ import java.util.TreeMap; import org.springframework.beans.factory.InitializingBean; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; +import org.argeo.slc.test.context.ContextAware; +import org.argeo.slc.test.context.ParentContextAware; public class SimpleContextAware implements ContextAware, InitializingBean { private ParentContextAware parentContext; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java index 76ea43f3c..46ab06344 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java @@ -4,6 +4,8 @@ import java.util.Collection; import java.util.List; import java.util.Vector; +import org.argeo.slc.test.context.ContextAware; +import org.argeo.slc.test.context.ParentContextAware; import org.springframework.beans.factory.InitializingBean; public class SimpleParentContextAware extends SimpleContextAware implements diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java index 3468bcb25..1f5e89342 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java @@ -6,14 +6,14 @@ import java.util.Vector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.structure.SimpleSElement; -import org.argeo.slc.core.structure.StructureAware; -import org.argeo.slc.core.structure.StructureElement; -import org.argeo.slc.core.structure.StructureElementProvider; -import org.argeo.slc.core.structure.StructureRegistry; import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.core.test.TestDefinition; -import org.argeo.slc.core.test.TestResult; -import org.argeo.slc.core.test.TestRun; +import org.argeo.slc.structure.StructureAware; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.structure.StructureElementProvider; +import org.argeo.slc.structure.StructureRegistry; +import org.argeo.slc.test.TestDefinition; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestRun; /** * Collection of test definitions propagating tree structure information to its diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java index 128da6abb..5cc3fd72b 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/PartSubList.java @@ -3,8 +3,8 @@ package org.argeo.slc.core.test.tree; import java.util.List; import java.util.Vector; -import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.core.test.TestStatus; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestStatus; /** * List of TestResultPart. It can be used to build complex diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java index 3e365afe0..b5d78a7da 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java @@ -9,16 +9,16 @@ import java.util.Vector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.structure.StructureAware; -import org.argeo.slc.core.structure.StructureElement; -import org.argeo.slc.core.structure.StructureRegistry; +import org.argeo.slc.SlcException; import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.core.test.TestResult; -import org.argeo.slc.core.test.TestResultListener; -import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.core.test.TestRun; -import org.argeo.slc.core.test.TestRunAware; +import org.argeo.slc.structure.StructureAware; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.structure.StructureRegistry; +import org.argeo.slc.test.TestResult; +import org.argeo.slc.test.TestResultListener; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestRun; +import org.argeo.slc.test.TestRunAware; /** * Complex implementation of a test result compatible with a tree based diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java index 535abe61b..3924760a3 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java @@ -3,9 +3,9 @@ package org.argeo.slc.core.test.tree; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.test.TestResultListener; -import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.core.test.TestStatus; +import org.argeo.slc.test.TestResultListener; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestStatus; /** * Listener logging tree-based test results to the underlying logging system. diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java index 70db08790..396d20dc3 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java @@ -3,11 +3,11 @@ package org.argeo.slc.dao.test.tree; import java.util.List; import java.util.Map; -import org.argeo.slc.core.structure.StructureElement; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.dao.test.TestResultDao; +import org.argeo.slc.structure.StructureElement; public interface TreeTestResultDao extends TestResultDao { /** Lists results containing this path */ diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultPersister.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultPersister.java index 73766ead6..0d2079ee1 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultPersister.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultPersister.java @@ -3,9 +3,9 @@ package org.argeo.slc.dao.test.tree; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.test.TestResultListener; -import org.argeo.slc.core.test.TestResultPart; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.test.TestResultListener; +import org.argeo.slc.test.TestResultPart; /** * Listener persisting tree-based results. diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/TableDiffPosition.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/TableDiffPosition.java index d8a3d785d..fc168d62d 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/TableDiffPosition.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/TableDiffPosition.java @@ -1,6 +1,6 @@ package org.argeo.slc.diff; -import org.argeo.slc.core.UnsupportedException; +import org.argeo.slc.UnsupportedException; /** * A diff position within a table structure such a CSV file or an SQL result diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/XPathDiffPosition.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/XPathDiffPosition.java index 0d2234240..5b66e49c3 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/XPathDiffPosition.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/XPathDiffPosition.java @@ -1,6 +1,6 @@ package org.argeo.slc.diff; -import org.argeo.slc.core.UnsupportedException; +import org.argeo.slc.UnsupportedException; /** A diff position within an Xml file. NOT YET IMPLEMENTED. */ public class XPathDiffPosition extends DiffPosition { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/logging/Log4jUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/logging/Log4jUtils.java index 6398e608e..a0a634b62 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/logging/Log4jUtils.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/logging/Log4jUtils.java @@ -7,7 +7,7 @@ import java.util.Properties; import org.apache.commons.io.IOUtils; import org.apache.log4j.LogManager; import org.apache.log4j.PropertyConfigurator; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.util.ResourceUtils; import org.springframework.util.SystemPropertyUtils; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java index 54b896cf3..db30121a0 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java @@ -1,6 +1,6 @@ package org.argeo.slc.msg.process; -import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.process.SlcExecution; public class SlcExecutionRequest { private SlcExecution slcExecution; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java index 7da2b43f5..c7cdc604d 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java @@ -3,7 +3,7 @@ package org.argeo.slc.msg.process; import java.util.List; import java.util.Vector; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.process.SlcExecutionStep; public class SlcExecutionStepsRequest { private String slcExecutionUuid; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java index 0bac8a821..8657617fa 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java @@ -1,7 +1,7 @@ package org.argeo.slc.msg.test.tree; -import org.argeo.slc.core.test.TestRunDescriptor; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.test.TestRunDescriptor; public class CreateTreeTestResultRequest { private TreeTestResult treeTestResult; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java index 0b4278f34..680e17d67 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java @@ -3,13 +3,13 @@ package org.argeo.slc.msg.test.tree; import java.util.Map; import java.util.SortedMap; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.structure.StructureElement; +import org.argeo.slc.SlcException; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestRunDescriptor; import org.argeo.slc.core.test.tree.PartSubList; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.structure.StructureElement; +import org.argeo.slc.test.TestRunDescriptor; public class ResultPartRequest { private String resultUuid; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/spring/SpringUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/spring/SpringUtils.java index 798b5648e..fbb1840dd 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/spring/SpringUtils.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/spring/SpringUtils.java @@ -6,7 +6,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.core.io.DefaultResourceLoader; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java index 6c6cffdce..32100b8b8 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java @@ -4,13 +4,13 @@ import java.io.File; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.DeployEnvironment; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.deploy.Deployment; -import org.argeo.slc.core.deploy.DeploymentData; -import org.argeo.slc.core.deploy.TargetData; +import org.argeo.slc.SlcException; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.DeployEnvironment; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.deploy.Deployment; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; public class HttpdApplicationDeployment implements Deployment { private static final Log log = LogFactory diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java index c162340ca..6e6f19ea3 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java @@ -4,8 +4,8 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.deploy.TargetData; +import org.argeo.slc.SlcException; +import org.argeo.slc.deploy.TargetData; public class HttpdApplicationTargetData implements TargetData { private HttpdServer webServer; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java index 586f263ae..08f9139b5 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java @@ -3,10 +3,10 @@ package org.argeo.slc.support.deploy; import java.io.IOException; import java.net.URL; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.DeploymentData; -import org.argeo.slc.core.deploy.TargetData; +import org.argeo.slc.SlcException; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; public class HttpdServer implements WebServer { private HttpdServerTargetData targetData; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java index 12036f5e2..2abcc6d0e 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java @@ -1,10 +1,10 @@ package org.argeo.slc.support.deploy; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.deploy.Deployment; -import org.argeo.slc.core.deploy.DeploymentData; -import org.argeo.slc.core.deploy.TargetData; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.deploy.Deployment; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; public class HttpdServerDeployment implements Deployment { private HttpdServerTargetData targetData; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java index 8af51ece8..668ee390e 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java @@ -1,6 +1,6 @@ package org.argeo.slc.support.deploy; -import org.argeo.slc.core.deploy.DeploymentData; +import org.argeo.slc.deploy.DeploymentData; public class HttpdServerDeploymentData implements DeploymentData { private String configFile; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java index 8d455965d..20b78591f 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java @@ -8,8 +8,8 @@ import java.util.Arrays; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.deploy.DeployedSystemManager; +import org.argeo.slc.SlcException; +import org.argeo.slc.deploy.DeployedSystemManager; public class HttpdServerManager implements DeployedSystemManager { private final static Log log = LogFactory.getLog(HttpdServerManager.class); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerTargetData.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerTargetData.java index 0e1b17195..e4f28ca3c 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerTargetData.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerTargetData.java @@ -1,7 +1,7 @@ package org.argeo.slc.support.deploy; -import org.argeo.slc.core.deploy.InstalledExecutables; -import org.argeo.slc.core.deploy.TargetData; +import org.argeo.slc.deploy.InstalledExecutables; +import org.argeo.slc.deploy.TargetData; public class HttpdServerTargetData implements TargetData { private String serverRoot; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/SimpleHttpdApplication.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/SimpleHttpdApplication.java index bbcf60dfb..a21b19174 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/SimpleHttpdApplication.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/SimpleHttpdApplication.java @@ -3,8 +3,8 @@ package org.argeo.slc.support.deploy; import java.io.File; import java.net.URL; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.DeploymentData; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.DeploymentData; public class SimpleHttpdApplication implements WebApplication { private HttpdApplicationTargetData targetData; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebApplication.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebApplication.java index ef167ba21..a42f4bd28 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebApplication.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebApplication.java @@ -3,7 +3,7 @@ package org.argeo.slc.support.deploy; import java.io.File; import java.net.URL; -import org.argeo.slc.core.deploy.DeployedSystem; +import org.argeo.slc.deploy.DeployedSystem; public interface WebApplication extends DeployedSystem { public URL getBaseUrl(); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebServer.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebServer.java index fc747bc94..8db954196 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebServer.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebServer.java @@ -2,7 +2,7 @@ package org.argeo.slc.support.deploy; import java.net.URL; -import org.argeo.slc.core.deploy.DeployedSystem; +import org.argeo.slc.deploy.DeployedSystem; public interface WebServer extends DeployedSystem { public URL getBaseUrl(); diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeployment.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeployment.java index 9df6a1d74..64eb3091c 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeployment.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeployment.java @@ -4,13 +4,13 @@ import java.sql.SQLException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.UnsupportedException; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.deploy.Deployment; -import org.argeo.slc.core.deploy.DeploymentData; -import org.argeo.slc.core.deploy.TargetData; +import org.argeo.slc.SlcException; +import org.argeo.slc.UnsupportedException; +import org.argeo.slc.build.Distribution; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.deploy.Deployment; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; import org.dbunit.DataSourceDatabaseTester; import org.dbunit.DatabaseUnitException; import org.dbunit.IDatabaseTester; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java index 3d328a0fb..73b271fc5 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java @@ -2,8 +2,8 @@ package org.argeo.slc.support.deploy.db; import java.io.InputStream; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.deploy.DeploymentData; +import org.argeo.slc.SlcException; +import org.argeo.slc.deploy.DeploymentData; import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.xml.FlatXmlDataSet; import org.springframework.core.io.Resource; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java index 5fe1d4a67..155db2699 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java @@ -2,7 +2,7 @@ package org.argeo.slc.support.deploy.db; import javax.sql.DataSource; -import org.argeo.slc.core.deploy.AbstractDeployedSystem; +import org.argeo.slc.deploy.AbstractDeployedSystem; public class SimpleJdbcDatabase extends AbstractDeployedSystem implements JdbcAware { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/AbstractSpringTestCase.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/AbstractSpringTestCase.java index a37c4a7ce..ee95e3eee 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/AbstractSpringTestCase.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/AbstractSpringTestCase.java @@ -4,7 +4,7 @@ import junit.framework.TestCase; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; +import org.argeo.slc.SlcException; import org.argeo.slc.spring.SpringUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java index 25f40c5f9..bbea1bb25 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java @@ -6,8 +6,8 @@ import static org.argeo.slc.unit.UnitUtils.assertDateSec; import java.util.UUID; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; public abstract class SlcExecutionTestUtils { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java index fedaa266a..cf4b0c1e4 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java @@ -2,21 +2,21 @@ package org.argeo.slc.unit.test.tree; import java.util.UUID; -import org.argeo.slc.core.build.Distribution; -import org.argeo.slc.core.deploy.DeployedSystem; -import org.argeo.slc.core.deploy.DeploymentData; -import org.argeo.slc.core.deploy.TargetData; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionStep; +import org.argeo.slc.build.Distribution; import org.argeo.slc.core.structure.SimpleSElement; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.structure.tree.TreeSRegistry; import org.argeo.slc.core.test.SimpleResultPart; import org.argeo.slc.core.test.SimpleTestRun; -import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.PartSubList; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.slc.deploy.DeploymentData; +import org.argeo.slc.deploy.TargetData; import org.argeo.slc.msg.test.tree.ResultPartRequest; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionStep; +import org.argeo.slc.test.TestStatus; import org.argeo.slc.unit.process.SlcExecutionTestUtils; public abstract class TreeTestResultTestUtils { diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java index 62b4f8226..91467f3ea 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java @@ -11,9 +11,9 @@ import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.structure.SimpleSElement; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; -import org.argeo.slc.core.test.TestResultPart; import org.argeo.slc.core.test.tree.PartSubList; import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.test.TestResultPart; /** Utilities for unit tests. */ public class UnitTestTreeUtil { diff --git a/runtime/org.argeo.slc.support.simple/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.support.simple/src/main/resources/META-INF/MANIFEST.MF index 66334ecd1..7a603c152 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.support.simple/src/main/resources/META-INF/MANIFEST.MF @@ -3,80 +3,85 @@ Created-By: 1.5.0_16 (Sun Microsystems Inc.) Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Import-Package: javax.sql,junit.framework;version="3.8",org.apache.com mons.io;version="1.4",org.apache.commons.logging;version="1.1",org.ap - ache.log4j;version="1.2",org.argeo.slc.core;version="0.11.2.SNAPSHOT" - ,org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.argeo.slc.cor - e.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.process;version - ="0.11.2.SNAPSHOT",org.argeo.slc.core.process.spring;version="0.11.2. - SNAPSHOT",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org. - argeo.slc.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc - .core.test;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context; - version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.1 - 1.2.SNAPSHOT",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT", - org.argeo.slc.dao.test;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.te - st.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.diff;version="0.11.2. - SNAPSHOT",org.argeo.slc.logging;version="0.11.2.SNAPSHOT",org.argeo.s - lc.msg.process;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree; - version="0.11.2.SNAPSHOT",org.argeo.slc.spring;version="0.11.2.SNAPSH - OT",org.argeo.slc.support.deploy;version="0.11.2.SNAPSHOT",org.argeo. - slc.support.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;ve - rsion="0.11.2.SNAPSHOT",org.argeo.slc.unit.process;version="0.11.2.SN - APSHOT",org.argeo.slc.unit.test.tree;version="0.11.2.SNAPSHOT",org.ar - geo.slc.xml;version="0.11.2.SNAPSHOT",org.argeo.slc.xml.spring;versio - n="0.11.2.SNAPSHOT",org.dbunit;version="2.2",org.dbunit.database;vers - ion="2.2",org.dbunit.dataset;version="2.2",org.dbunit.dataset.xml;ver - sion="2.2",org.dbunit.operation;version="2.2",org.springframework.bea - ns.factory;version="2.5.6.A",org.springframework.context;version="2.5 - .6.A",org.springframework.context.support;version="2.5.6.A",org.sprin - gframework.core.io;version="2.5.6.A",org.springframework.util;version - ="2.5.6.A" -Export-Package: org.argeo.slc.dao.test.tree;uses:="org.argeo.slc.core. - test.tree,org.argeo.slc.core.test,org.argeo.slc.dao.test,org.apache.c - ommons.logging,org.argeo.slc.core.structure.tree";version="0.11.2.SNA - PSHOT",org.argeo.slc.core.deploy;uses:="org.apache.commons.logging,or - g.argeo.slc.core.build";version="0.11.2.SNAPSHOT",org.argeo.slc.core. - test;uses:="org.argeo.slc.core.deploy,org.argeo.slc.core.process,org. - argeo.slc.core,org.argeo.slc.core.test.context,org.apache.commons.log - ging,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT",org - .argeo.slc.core.process.spring;version="0.11.2.SNAPSHOT",org.argeo.sl - c.msg.process;uses:="org.argeo.slc.core.process";version="0.11.2.SNAP - SHOT",org.argeo.slc.unit.process;uses:="org.argeo.slc.unit,org.argeo. - slc.core.process,junit.framework";version="0.11.2.SNAPSHOT",org.argeo - .slc.core.test.context;uses:="org.argeo.slc.core.test,org.argeo.slc.c - ore,org.apache.commons.logging,org.springframework.beans.factory,org. - argeo.slc.core.structure.tree,org.argeo.slc.core.structure";version=" - 0.11.2.SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",o - rg.argeo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc - .xml.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.support.deploy;us - es:="org.argeo.slc.core.deploy,org.argeo.slc.core,org.apache.commons. - logging,org.argeo.slc.core.build";version="0.11.2.SNAPSHOT",org.argeo - .slc.support.deploy.db;uses:="org.argeo.slc.core.deploy,org.dbunit.da - tabase,org.argeo.slc.core,org.dbunit.dataset.xml,org.apache.commons.l - ogging,org.argeo.slc.core.build,org.dbunit,javax.sql,org.dbunit.datas - et,org.springframework.core.io,org.dbunit.operation";version="0.11.2. - SNAPSHOT",org.argeo.slc.logging;uses:="org.apache.log4j,org.springfra - mework.core.io,org.argeo.slc.core,org.apache.commons.io,org.springfra - mework.util";version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;u - ses:="org.argeo.slc.core.test,org.argeo.slc.core,org.apache.commons.l - ogging,org.argeo.slc.core.structure.tree,org.argeo.slc.core.structure - ";version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;uses:="org.ar - geo.slc.core.test.tree,org.argeo.slc.core.test,org.argeo.slc.core,org - .argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT",org.argeo.s - lc.xml;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;uses:="org.argeo. - slc.core,org.apache.commons.logging,junit.framework,org.argeo.slc.spr - ing,org.springframework.context,org.springframework.context.support,o - rg.springframework.beans.factory";version="0.11.2.SNAPSHOT",org.argeo - .slc.unit.test.tree;uses:="org.argeo.slc.core.deploy,org.argeo.slc.co - re.test,org.argeo.slc.core.process,org.argeo.slc.unit.process,org.apa - che.commons.logging,org.argeo.slc.core.build,org.argeo.slc.core.test. - tree,org.argeo.slc.msg.test.tree,org.argeo.slc.unit,junit.framework,o - rg.argeo.slc.core.structure.tree,org.argeo.slc.core.structure";versio - n="0.11.2.SNAPSHOT",org.argeo.slc.diff;uses:="org.springframework.cor - e.io,org.argeo.slc.core";version="0.11.2.SNAPSHOT",org.argeo.slc.spri - ng;uses:="org.springframework.core.io,org.argeo.slc.core,org.apache.c - ommons.logging,org.springframework.beans.factory";version="0.11.2.SNA - PSHOT",org.argeo.slc.core.structure.tree;uses:="org.argeo.slc.core,or - g.argeo.slc.core.structure";version="0.11.2.SNAPSHOT",org.argeo.slc.c - ore.structure;version="0.11.2.SNAPSHOT" + ache.log4j;version="1.2",org.argeo.slc;version="0.11.2.SNAPSHOT",org. + argeo.slc.build;version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNA + PSHOT",org.argeo.slc.core.process.spring;version="0.11.2.SNAPSHOT",or + g.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.argeo.slc.co + re.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test;v + ersion="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;version="0.1 + 1.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2.SNAPSHOT + ",org.argeo.slc.core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.sl + c.dao.test;version="0.11.2.SNAPSHOT",org.argeo.slc.dao.test.tree;vers + ion="0.11.2.SNAPSHOT",org.argeo.slc.deploy;version="0.11.2.SNAPSHOT", + org.argeo.slc.diff;version="0.11.2.SNAPSHOT",org.argeo.slc.logging;ve + rsion="0.11.2.SNAPSHOT",org.argeo.slc.msg.process;version="0.11.2.SNA + PSHOT",org.argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.arge + o.slc.process;version="0.11.2.SNAPSHOT",org.argeo.slc.spring;version= + "0.11.2.SNAPSHOT",org.argeo.slc.structure;version="0.11.2.SNAPSHOT",o + rg.argeo.slc.support.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.s + upport.deploy.db;version="0.11.2.SNAPSHOT",org.argeo.slc.test;version + ="0.11.2.SNAPSHOT",org.argeo.slc.test.context;version="0.11.2.SNAPSHO + T",org.argeo.slc.unit;version="0.11.2.SNAPSHOT",org.argeo.slc.unit.pr + ocess;version="0.11.2.SNAPSHOT",org.argeo.slc.unit.test.tree;version= + "0.11.2.SNAPSHOT",org.argeo.slc.xml;version="0.11.2.SNAPSHOT",org.arg + eo.slc.xml.spring;version="0.11.2.SNAPSHOT",org.dbunit;version="2.2", + org.dbunit.database;version="2.2",org.dbunit.dataset;version="2.2",or + g.dbunit.dataset.xml;version="2.2",org.dbunit.operation;version="2.2" + ,org.springframework.beans.factory;version="2.5.6.A",org.springframew + ork.context;version="2.5.6.A",org.springframework.context.support;ver + sion="2.5.6.A",org.springframework.core.io;version="2.5.6.A",org.spri + ngframework.util;version="2.5.6.A" +Export-Package: org.argeo.slc.dao.test.tree;uses:="org.argeo.slc.test, + org.argeo.slc.core.test.tree,org.argeo.slc.core.test,org.argeo.slc.da + o.test,org.apache.commons.logging,org.argeo.slc.core.structure.tree"; + version="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;uses:="org.argeo. + slc.build,org.apache.commons.logging,org.argeo.slc.deploy";version="0 + .11.2.SNAPSHOT",org.argeo.slc.core.test;uses:="org.argeo.slc,org.arge + o.slc.test.context,org.argeo.slc.test,org.argeo.slc.process,org.argeo + .slc.core.test.context,org.apache.commons.logging,org.argeo.slc.core. + structure.tree,org.argeo.slc.deploy";version="0.11.2.SNAPSHOT",org.ar + geo.slc.core.process.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.m + sg.process;uses:="org.argeo.slc.process";version="0.11.2.SNAPSHOT",or + g.argeo.slc.unit.process;uses:="org.argeo.slc.process,org.argeo.slc.u + nit,junit.framework";version="0.11.2.SNAPSHOT",org.argeo.slc.core.tes + t.context;uses:="org.argeo.slc,org.argeo.slc.test.context,org.argeo.s + lc.test,org.argeo.slc.core.test,org.apache.commons.logging,org.spring + framework.beans.factory,org.argeo.slc.core.structure.tree,org.argeo.s + lc.structure";version="0.11.2.SNAPSHOT",org.argeo.slc.core.build;vers + ion="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2. + SNAPSHOT",org.argeo.slc.xml.spring;version="0.11.2.SNAPSHOT",org.arge + o.slc.support.deploy;uses:="org.argeo.slc,org.argeo.slc.build,org.apa + che.commons.logging,org.argeo.slc.deploy";version="0.11.2.SNAPSHOT",o + rg.argeo.slc.support.deploy.db;uses:="org.argeo.slc,org.dbunit.databa + se,org.dbunit.dataset.xml,org.argeo.slc.build,org.apache.commons.logg + ing,org.dbunit,javax.sql,org.dbunit.dataset,org.springframework.core. + io,org.dbunit.operation,org.argeo.slc.deploy";version="0.11.2.SNAPSHO + T",org.argeo.slc.logging;uses:="org.argeo.slc,org.apache.log4j,org.sp + ringframework.core.io,org.apache.commons.io,org.springframework.util" + ;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.tree;uses:="org.ar + geo.slc,org.argeo.slc.test,org.apache.commons.logging,org.argeo.slc.c + ore.structure.tree,org.argeo.slc.structure,org.argeo.slc.core.structu + re";version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;uses:="org. + argeo.slc,org.argeo.slc.test,org.argeo.slc.core.test.tree,org.argeo.s + lc.core.test,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPS + HOT",org.argeo.slc.xml;version="0.11.2.SNAPSHOT",org.argeo.slc.unit;u + ses:="org.argeo.slc,org.apache.commons.logging,junit.framework,org.ar + geo.slc.spring,org.springframework.context,org.springframework.contex + t.support,org.springframework.beans.factory";version="0.11.2.SNAPSHOT + ",org.argeo.slc.unit.test.tree;uses:="org.argeo.slc.test,org.argeo.sl + c.core.test,org.argeo.slc.unit.process,org.argeo.slc.build,org.apache + .commons.logging,org.argeo.slc.structure,org.argeo.slc.core.test.tree + ,org.argeo.slc.msg.test.tree,org.argeo.slc.unit,org.argeo.slc.process + ,junit.framework,org.argeo.slc.core.structure.tree,org.argeo.slc.core + .structure,org.argeo.slc.deploy";version="0.11.2.SNAPSHOT",org.argeo. + slc.diff;uses:="org.argeo.slc,org.springframework.core.io";version="0 + .11.2.SNAPSHOT",org.argeo.slc.spring;uses:="org.argeo.slc,org.springf + ramework.core.io,org.apache.commons.logging,org.springframework.beans + .factory";version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree + ;uses:="org.argeo.slc,org.argeo.slc.structure,org.argeo.slc.core.stru + cture";version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure;uses:=" + org.argeo.slc.structure";version="0.11.2.SNAPSHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Support Simple Bundle-Description: Basic implementations of SLC Specifications diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/test/context/ContextTest.java b/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/test/context/ContextTest.java index 6d53ef7e3..1568e4f6d 100644 --- a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/test/context/ContextTest.java +++ b/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/test/context/ContextTest.java @@ -3,8 +3,9 @@ package org.argeo.slc.core.test.context; import java.util.List; import org.argeo.slc.core.test.SimpleTestResult; -import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.core.test.TestStatus; +import org.argeo.slc.test.TestResultPart; +import org.argeo.slc.test.TestStatus; +import org.argeo.slc.test.context.ContextAware; import org.argeo.slc.unit.AbstractSpringTestCase; public class ContextTest extends AbstractSpringTestCase { diff --git a/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/process/WebServiceSlcExecutionNotifier.java b/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/process/WebServiceSlcExecutionNotifier.java index 21bcf978a..330e52ad6 100644 --- a/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/process/WebServiceSlcExecutionNotifier.java +++ b/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/process/WebServiceSlcExecutionNotifier.java @@ -4,12 +4,12 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.process.SlcExecution; -import org.argeo.slc.core.process.SlcExecutionNotifier; -import org.argeo.slc.core.process.SlcExecutionStep; import org.argeo.slc.msg.process.SlcExecutionRequest; import org.argeo.slc.msg.process.SlcExecutionStatusRequest; import org.argeo.slc.msg.process.SlcExecutionStepsRequest; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.process.SlcExecutionNotifier; +import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.ws.client.WebServiceUtils; import org.springframework.ws.client.WebServiceIOException; import org.springframework.ws.client.core.WebServiceTemplate; diff --git a/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/test/tree/WebServiceTreeTestResultNotifier.java b/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/test/tree/WebServiceTreeTestResultNotifier.java index eba0b1517..74b623fc8 100644 --- a/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/test/tree/WebServiceTreeTestResultNotifier.java +++ b/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/test/tree/WebServiceTreeTestResultNotifier.java @@ -2,12 +2,12 @@ package org.argeo.slc.ws.test.tree; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.test.TestResultListener; -import org.argeo.slc.core.test.TestResultPart; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; import org.argeo.slc.msg.test.tree.ResultPartRequest; +import org.argeo.slc.test.TestResultListener; +import org.argeo.slc.test.TestResultPart; import org.argeo.slc.ws.client.WebServiceUtils; import org.springframework.ws.client.WebServiceIOException; import org.springframework.ws.client.core.WebServiceTemplate; diff --git a/runtime/org.argeo.slc.support.ws.client/src/main/resources/META-INF/MANIFEST.MF b/runtime/org.argeo.slc.support.ws.client/src/main/resources/META-INF/MANIFEST.MF index 5a28c5a96..6c5e3c27d 100644 --- a/runtime/org.argeo.slc.support.ws.client/src/main/resources/META-INF/MANIFEST.MF +++ b/runtime/org.argeo.slc.support.ws.client/src/main/resources/META-INF/MANIFEST.MF @@ -3,22 +3,22 @@ Created-By: 1.5.0_16 (Sun Microsystems Inc.) Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Import-Package: javax.xml.namespace;version="1.3",javax.xml.transform; version="1.3",javax.xml.transform.dom;version="1.3",org.apache.common - s.logging;version="1.1",org.argeo.slc.core.process;version="0.11.2.SN - APSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPSHOT",org.argeo.s - lc.core.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.process - ;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11. - 2.SNAPSHOT",org.argeo.slc.ws.client;version="0.11.2.SNAPSHOT",org.arg - eo.slc.ws.client.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.pr - ocess;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0 - .11.2.SNAPSHOT",org.springframework.oxm;version="1.5.5.A",org.springf - ramework.ws;version="1.5.5.A",org.springframework.ws.client;version=" - 1.5.5.A",org.springframework.ws.client.core;version="1.5.5.A",org.spr - ingframework.ws.client.support.interceptor;version="1.5.5.A",org.spri - ngframework.ws.context;version="1.5.5.A",org.springframework.ws.soap; - version="1.5.5.A",org.springframework.ws.soap.client;version="1.5.5.A - ",org.springframework.xml.transform;version="1.5.5.A",org.springframe - work.xml.validation;version="1.5.5.A",org.w3c.dom;version="1.3",org.x - ml.sax;version="1.3" + s.logging;version="1.1",org.argeo.slc.core.test.tree;version="0.11.2. + SNAPSHOT",org.argeo.slc.msg.process;version="0.11.2.SNAPSHOT",org.arg + eo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.process; + version="0.11.2.SNAPSHOT",org.argeo.slc.test;version="0.11.2.SNAPSHOT + ",org.argeo.slc.ws.client;version="0.11.2.SNAPSHOT",org.argeo.slc.ws. + client.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;vers + ion="0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;version="0.11.2.SNAP + SHOT",org.springframework.oxm;version="1.5.5.A",org.springframework.w + s;version="1.5.5.A",org.springframework.ws.client;version="1.5.5.A",o + rg.springframework.ws.client.core;version="1.5.5.A",org.springframewo + rk.ws.client.support.interceptor;version="1.5.5.A",org.springframewor + k.ws.context;version="1.5.5.A",org.springframework.ws.soap;version="1 + .5.5.A",org.springframework.ws.soap.client;version="1.5.5.A",org.spri + ngframework.xml.transform;version="1.5.5.A",org.springframework.xml.v + alidation;version="1.5.5.A",org.w3c.dom;version="1.3",org.xml.sax;ver + sion="1.3" Export-Package: org.argeo.slc.ws.client.spring;version="0.11.2.SNAPSHO T",org.argeo.slc.ws.client;uses:="org.springframework.ws.context,org. springframework.ws.client.core,org.xml.sax,org.springframework.ws.soa @@ -27,15 +27,15 @@ Export-Package: org.argeo.slc.ws.client.spring;version="0.11.2.SNAPSHO ork.ws.client.support.interceptor,javax.xml.transform,javax.xml.trans form.dom,org.springframework.ws.soap,org.springframework.ws,org.sprin gframework.xml.validation,org.springframework.xml.transform";version= - "0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;uses:="org.argeo.slc.cor - e.test.tree,org.springframework.ws.client.core,org.argeo.slc.msg.test - .tree,org.argeo.slc.core.test,org.argeo.slc.ws.client,org.springframe - work.ws.soap.client,org.springframework.ws.client,org.apache.commons. - logging";version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;uses:="or - g.springframework.ws.client.core,org.argeo.slc.ws.client,org.springfr - amework.ws.soap.client,org.argeo.slc.core.process,org.springframework - .ws.client,org.argeo.slc.msg.process,org.apache.commons.logging";vers - ion="0.11.2.SNAPSHOT" + "0.11.2.SNAPSHOT",org.argeo.slc.ws.test.tree;uses:="org.argeo.slc.tes + t,org.argeo.slc.core.test.tree,org.springframework.ws.client.core,org + .argeo.slc.msg.test.tree,org.argeo.slc.ws.client,org.springframework. + ws.soap.client,org.springframework.ws.client,org.apache.commons.loggi + ng";version="0.11.2.SNAPSHOT",org.argeo.slc.ws.process;uses:="org.spr + ingframework.ws.client.core,org.argeo.slc.process,org.argeo.slc.ws.cl + ient,org.springframework.ws.soap.client,org.springframework.ws.client + ,org.argeo.slc.msg.process,org.apache.commons.logging";version="0.11. + 2.SNAPSHOT" Bundle-Version: 0.11.2.SNAPSHOT Bundle-Name: Argeo SLC Support Web Services Client Bundle-Description: SLC Distribution diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF index 0e25c273d..54dffb64e 100644 --- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF +++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF @@ -2,10 +2,9 @@ Manifest-Version: 1.0 Export-Package: org.argeo.slc.jemmytest.uiparts;uses:="javax.swing.tex t,org.argeo.slc.detached.ui,javax.swing,org.netbeans.jemmy,org.netbea ns.jemmy.operators,org.argeo.slc.detached";version="0.11.2.SNAPSHOT", - org.argeo.slc.jemmytest;uses:="org.argeo.slc.detached";version="0.11. - 2.SNAPSHOT",org.argeo.slc.jemmytest.steps;uses:="org.argeo.slc.jemmyt - est.uiparts,org.argeo.slc.detached.ui,org.argeo.slc.detached";version - ="0.11.2.SNAPSHOT" + org.argeo.slc.jemmytest.steps;uses:="org.argeo.slc.jemmytest.uiparts, + org.argeo.slc.detached.ui,org.argeo.slc.detached";version="0.11.2.SNA + PSHOT" Tool: Bnd-0.0.255 Bundle-Name: SLC Sandbox JemmyTest Created-By: 1.6.0 (Sun Microsystems Inc.) @@ -17,11 +16,10 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: SLC Distribution Import-Package: javax.swing,javax.swing.text,org.argeo.slc.detached;ve rsion="0.11.2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2.SNA - PSHOT",org.argeo.slc.jemmytest;version="0.11.2.SNAPSHOT",org.argeo.sl - c.jemmytest.steps;version="0.11.2.SNAPSHOT",org.argeo.slc.jemmytest.u - iparts;version="0.11.2.SNAPSHOT",org.netbeans.jemmy,org.netbeans.jemm - y.operators,org.springframework.beans.factory.config;version="2.5.6.A - " + PSHOT",org.argeo.slc.jemmytest.steps;version="0.11.2.SNAPSHOT",org.ar + geo.slc.jemmytest.uiparts;version="0.11.2.SNAPSHOT",org.netbeans.jemm + y,org.netbeans.jemmy.operators,org.springframework.beans.factory.conf + ig;version="2.5.6.A" Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest Bundle-DocURL: http://www.argeo.org Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) -- 2.39.2