From 09c9e5093fe1353aaac344ac8a8caf2e1dcc0778 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 11 Mar 2024 09:00:15 +0100 Subject: [PATCH] Refactor Argeo API --- Makefile | 2 +- .../.classpath | 0 .../.gitignore | 0 .../.project | 2 +- .../META-INF/.gitignore | 0 .../bnd.bnd | 0 .../build.properties | 0 .../org/argeo/api}/slc/BasicNameVersion.java | 2 +- .../argeo/api}/slc/CategoryNameVersion.java | 2 +- .../src/org/argeo/api}/slc/Condition.java | 2 +- .../api}/slc/DefaultCategoryNameVersion.java | 2 +- .../org/argeo/api}/slc/DefaultNameVersion.java | 2 +- .../org/argeo/api}/slc/ManifestConstants.java | 2 +- .../src/org/argeo/api}/slc/ModuleSet.java | 2 +- .../src/org/argeo/api}/slc/NameVersion.java | 2 +- .../src/org/argeo/api}/slc/SlcConstants.java | 2 +- .../src/org/argeo/api}/slc/SlcException.java | 2 +- .../src/org/argeo/api}/slc/SlcNames.java | 2 +- .../src/org/argeo/api}/slc/SlcTypes.java | 2 +- .../src/org/argeo/api}/slc/StreamReadable.java | 2 +- .../argeo/api}/slc/UnsupportedException.java | 2 +- .../org/argeo/api}/slc/WellKnownConstants.java | 2 +- .../argeo/api}/slc/attachment/Attachment.java | 2 +- .../slc/attachment/AttachmentsEnabled.java | 2 +- .../slc/attachment/AttachmentsStorage.java | 2 +- .../org/argeo/api}/slc/build/Distribution.java | 2 +- .../src/org/argeo/api}/slc/build/License.java | 2 +- .../api}/slc/build/ModularDistribution.java | 6 +++--- .../src/org/argeo/api}/slc/build/package.html | 0 .../api}/slc/deploy/DeployEnvironment.java | 2 +- .../argeo/api}/slc/deploy/DeployedSystem.java | 4 ++-- .../api}/slc/deploy/DeployedSystemManager.java | 2 +- .../org/argeo/api}/slc/deploy/Deployment.java | 4 ++-- .../argeo/api/slc/deploy/DeploymentData.java | 5 +++++ .../argeo/api}/slc/deploy/DynamicRuntime.java | 6 +++--- .../api}/slc/deploy/InstalledExecutables.java | 2 +- .../api}/slc/deploy/ModularDeployedSystem.java | 2 +- .../src/org/argeo/api}/slc/deploy/Module.java | 4 ++-- .../api}/slc/deploy/ModuleDescriptor.java | 4 ++-- .../argeo/api}/slc/deploy/ModulesManager.java | 4 ++-- .../org/argeo/api/slc/deploy/TargetData.java | 5 +++++ .../api}/slc/deploy/VersioningDriver.java | 2 +- .../src/org/argeo/api}/slc/deploy/package.html | 0 .../slc/execution/AbstractExecutionValue.java | 2 +- .../slc/execution/AbstractSpecAttribute.java | 2 +- .../api}/slc/execution/ExecutionContext.java | 2 +- .../api}/slc/execution/ExecutionFlow.java | 2 +- .../slc/execution/ExecutionFlowDescriptor.java | 2 +- .../ExecutionFlowDescriptorConverter.java | 2 +- .../api}/slc/execution/ExecutionModule.java | 2 +- .../execution/ExecutionModuleDescriptor.java | 6 +++--- .../execution/ExecutionModulesListener.java | 4 ++-- .../slc/execution/ExecutionModulesManager.java | 4 ++-- .../api}/slc/execution/ExecutionProcess.java | 2 +- .../api}/slc/execution/ExecutionResources.java | 2 +- .../api}/slc/execution/ExecutionSpec.java | 2 +- .../slc/execution/ExecutionSpecAttribute.java | 2 +- .../api}/slc/execution/ExecutionStack.java | 2 +- .../slc/execution/ExecutionStackLevel.java | 2 +- .../api}/slc/execution/ExecutionStep.java | 2 +- .../execution/FlowConfigurationException.java | 4 ++-- .../argeo/api}/slc/execution/RealizedFlow.java | 6 +++--- .../api}/slc/execution/RefSpecAttribute.java | 2 +- .../org/argeo/api}/slc/execution/RefValue.java | 2 +- .../api}/slc/execution/RefValueChoice.java | 2 +- .../org/argeo/api}/slc/execution/SlcAgent.java | 2 +- .../argeo/api}/slc/execution/SlcAgentCli.java | 2 +- .../src/org/argeo/api}/slc/package.html | 0 .../api}/slc/primitive/PrimitiveAccessor.java | 2 +- .../slc/primitive/PrimitiveSpecAttribute.java | 6 +++--- .../api}/slc/primitive/PrimitiveUtils.java | 2 +- .../api}/slc/primitive/PrimitiveValue.java | 4 ++-- .../argeo/api}/slc/test/ExecutableTestRun.java | 2 +- .../test/IncompatibleTestDataException.java | 4 ++-- .../src/org/argeo/api}/slc/test/TestData.java | 2 +- .../argeo/api}/slc/test/TestDataProvider.java | 2 +- .../argeo/api}/slc/test/TestDefinition.java | 2 +- .../org/argeo/api}/slc/test/TestResult.java | 2 +- .../api}/slc/test/TestResultListener.java | 2 +- .../argeo/api}/slc/test/TestResultPart.java | 2 +- .../src/org/argeo/api}/slc/test/TestRun.java | 4 ++-- .../org/argeo/api}/slc/test/TestRunAware.java | 2 +- .../org/argeo/api}/slc/test/TestStatus.java | 2 +- .../argeo/api}/slc/test/WritableTestRun.java | 4 ++-- .../api}/slc/test/context/ContextAware.java | 2 +- .../slc/test/context/ParentContextAware.java | 2 +- .../argeo/api}/slc/test/context/package.html | 0 .../src/org/argeo/api}/slc/test/package.html | 0 .../org/argeo/slc/deploy/DeploymentData.java | 5 ----- .../src/org/argeo/slc/deploy/TargetData.java | 5 ----- org.argeo.slc.runtime/bnd.bnd | 2 +- .../slc/cms/deploy/CmsDeployedSystem.java | 2 +- .../slc/cms/deploy/CmsDeploymentData.java | 2 +- .../argeo/slc/cms/deploy/CmsTargetData.java | 2 +- .../cms/deploy/osgi/OsgiCmsDeployedSystem.java | 8 ++++---- .../slc/cms/deploy/osgi/OsgiCmsDeployment.java | 12 ++++++------ .../slc/cms/distribution/A2Distribution.java | 10 +++++----- .../cms/distribution/A2ModuleDistribution.java | 2 +- .../AbstractExecutionModulesManager.java | 10 +++++----- .../org/argeo/slc/runtime/DefaultAgent.java | 14 +++++++------- .../org/argeo/slc/runtime/DefaultAgentCli.java | 18 +++++++++--------- .../slc/runtime/DefaultExecutionFlow.java | 10 +++++----- .../slc/runtime/DefaultExecutionSpec.java | 8 ++++---- .../slc/runtime/DefaultExecutionStack.java | 8 ++++---- .../org/argeo/slc/runtime/DefaultProcess.java | 6 +++--- .../org/argeo/slc/runtime/ExecutionThread.java | 10 +++++----- .../slc/runtime/InstantiationManager.java | 12 ++++++------ .../org/argeo/slc/runtime/ProcessThread.java | 10 +++++----- .../argeo/slc/runtime/ProcessThreadGroup.java | 4 ++-- .../slc/runtime/tasks/CloseTestResult.java | 2 +- .../src/org/argeo/slc/runtime/tasks/Echo.java | 2 +- .../src/org/argeo/slc/runtime/tasks/If.java | 2 +- .../argeo/slc/runtime/tasks/JvmProcess.java | 2 +- .../argeo/slc/runtime/tasks/SystemCall.java | 10 +++++----- .../argeo/slc/runtime/test/BasicTestData.java | 2 +- .../slc/runtime/test/BasicTestDefinition.java | 16 ++++++++-------- .../argeo/slc/runtime/test/ContextUtils.java | 8 ++++---- .../slc/runtime/test/SimpleResultPart.java | 8 ++++---- .../slc/runtime/test/SimpleTestResult.java | 8 ++++---- .../argeo/slc/runtime/test/SimpleTestRun.java | 12 ++++++------ .../argeo/slc/runtime/test/SlcTestUtils.java | 4 ++-- .../argeo/slc/runtime/test/TestDataUtils.java | 6 +++--- 122 files changed, 224 insertions(+), 224 deletions(-) rename {org.argeo.slc.api => org.argeo.api.slc}/.classpath (100%) rename {org.argeo.slc.api => org.argeo.api.slc}/.gitignore (100%) rename {org.argeo.slc.api => org.argeo.api.slc}/.project (95%) rename {org.argeo.slc.api => org.argeo.api.slc}/META-INF/.gitignore (100%) rename {org.argeo.slc.api => org.argeo.api.slc}/bnd.bnd (100%) rename {org.argeo.slc.api => org.argeo.api.slc}/build.properties (100%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/BasicNameVersion.java (96%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/CategoryNameVersion.java (96%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/Condition.java (88%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/DefaultCategoryNameVersion.java (96%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/DefaultNameVersion.java (98%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/ManifestConstants.java (96%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/ModuleSet.java (84%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/NameVersion.java (95%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/SlcConstants.java (91%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/SlcException.java (93%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/SlcNames.java (99%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/SlcTypes.java (99%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/StreamReadable.java (79%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/UnsupportedException.java (98%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/WellKnownConstants.java (94%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/attachment/Attachment.java (80%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/attachment/AttachmentsEnabled.java (70%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/attachment/AttachmentsStorage.java (89%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/build/Distribution.java (73%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/build/License.java (83%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/build/ModularDistribution.java (80%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/build/package.html (100%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/DeployEnvironment.java (83%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/DeployedSystem.java (82%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/DeployedSystemManager.java (77%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/Deployment.java (74%) create mode 100644 org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeploymentData.java rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/DynamicRuntime.java (73%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/InstalledExecutables.java (76%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/ModularDeployedSystem.java (85%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/Module.java (80%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/ModuleDescriptor.java (93%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/ModulesManager.java (89%) create mode 100644 org.argeo.api.slc/src/org/argeo/api/slc/deploy/TargetData.java rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/VersioningDriver.java (92%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/deploy/package.html (100%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/AbstractExecutionValue.java (85%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/AbstractSpecAttribute.java (97%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionContext.java (92%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionFlow.java (95%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionFlowDescriptor.java (98%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionFlowDescriptorConverter.java (92%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionModule.java (85%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionModuleDescriptor.java (94%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionModulesListener.java (84%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionModulesManager.java (95%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionProcess.java (98%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionResources.java (96%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionSpec.java (95%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionSpecAttribute.java (98%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionStack.java (93%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionStackLevel.java (86%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/ExecutionStep.java (94%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/FlowConfigurationException.java (78%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/RealizedFlow.java (93%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/RefSpecAttribute.java (97%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/RefValue.java (94%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/RefValueChoice.java (94%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/SlcAgent.java (97%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/execution/SlcAgentCli.java (87%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/package.html (100%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/primitive/PrimitiveAccessor.java (94%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/primitive/PrimitiveSpecAttribute.java (87%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/primitive/PrimitiveUtils.java (98%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/primitive/PrimitiveValue.java (86%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/ExecutableTestRun.java (73%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/IncompatibleTestDataException.java (87%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestData.java (76%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestDataProvider.java (74%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestDefinition.java (85%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestResult.java (95%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestResultListener.java (91%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestResultPart.java (91%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestRun.java (86%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestRunAware.java (84%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/TestStatus.java (97%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/WritableTestRun.java (81%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/context/ContextAware.java (90%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/context/ParentContextAware.java (80%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/context/package.html (100%) rename {org.argeo.slc.api/src/org/argeo => org.argeo.api.slc/src/org/argeo/api}/slc/test/package.html (100%) delete mode 100644 org.argeo.slc.api/src/org/argeo/slc/deploy/DeploymentData.java delete mode 100644 org.argeo.slc.api/src/org/argeo/slc/deploy/TargetData.java diff --git a/Makefile b/Makefile index d400f9449..562eba3be 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ uninstall: osgi-uninstall A2_CATEGORY = org.argeo.slc BUNDLES = \ -org.argeo.slc.api \ +org.argeo.api.slc \ org.argeo.slc.runtime \ org.argeo.slc.cms \ org.argeo.rt.cms \ diff --git a/org.argeo.slc.api/.classpath b/org.argeo.api.slc/.classpath similarity index 100% rename from org.argeo.slc.api/.classpath rename to org.argeo.api.slc/.classpath diff --git a/org.argeo.slc.api/.gitignore b/org.argeo.api.slc/.gitignore similarity index 100% rename from org.argeo.slc.api/.gitignore rename to org.argeo.api.slc/.gitignore diff --git a/org.argeo.slc.api/.project b/org.argeo.api.slc/.project similarity index 95% rename from org.argeo.slc.api/.project rename to org.argeo.api.slc/.project index 301fef6e1..e8b4199d9 100644 --- a/org.argeo.slc.api/.project +++ b/org.argeo.api.slc/.project @@ -1,6 +1,6 @@ - org.argeo.slc.api + org.argeo.api.slc diff --git a/org.argeo.slc.api/META-INF/.gitignore b/org.argeo.api.slc/META-INF/.gitignore similarity index 100% rename from org.argeo.slc.api/META-INF/.gitignore rename to org.argeo.api.slc/META-INF/.gitignore diff --git a/org.argeo.slc.api/bnd.bnd b/org.argeo.api.slc/bnd.bnd similarity index 100% rename from org.argeo.slc.api/bnd.bnd rename to org.argeo.api.slc/bnd.bnd diff --git a/org.argeo.slc.api/build.properties b/org.argeo.api.slc/build.properties similarity index 100% rename from org.argeo.slc.api/build.properties rename to org.argeo.api.slc/build.properties diff --git a/org.argeo.slc.api/src/org/argeo/slc/BasicNameVersion.java b/org.argeo.api.slc/src/org/argeo/api/slc/BasicNameVersion.java similarity index 96% rename from org.argeo.slc.api/src/org/argeo/slc/BasicNameVersion.java rename to org.argeo.api.slc/src/org/argeo/api/slc/BasicNameVersion.java index 61ed5eb12..47bd2d4d7 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/BasicNameVersion.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/BasicNameVersion.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; import java.io.Serializable; diff --git a/org.argeo.slc.api/src/org/argeo/slc/CategoryNameVersion.java b/org.argeo.api.slc/src/org/argeo/api/slc/CategoryNameVersion.java similarity index 96% rename from org.argeo.slc.api/src/org/argeo/slc/CategoryNameVersion.java rename to org.argeo.api.slc/src/org/argeo/api/slc/CategoryNameVersion.java index b335996dd..afb812103 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/CategoryNameVersion.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/CategoryNameVersion.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** * Adds a dimension to {@link NameVersion} by adding an arbitrary category (e.g. diff --git a/org.argeo.slc.api/src/org/argeo/slc/Condition.java b/org.argeo.api.slc/src/org/argeo/api/slc/Condition.java similarity index 88% rename from org.argeo.slc.api/src/org/argeo/slc/Condition.java rename to org.argeo.api.slc/src/org/argeo/api/slc/Condition.java index f476961f0..f028b58fc 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/Condition.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/Condition.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** Binary check on an arbitrary object. */ public interface Condition { diff --git a/org.argeo.slc.api/src/org/argeo/slc/DefaultCategoryNameVersion.java b/org.argeo.api.slc/src/org/argeo/api/slc/DefaultCategoryNameVersion.java similarity index 96% rename from org.argeo.slc.api/src/org/argeo/slc/DefaultCategoryNameVersion.java rename to org.argeo.api.slc/src/org/argeo/api/slc/DefaultCategoryNameVersion.java index 6506599a9..1303e43fc 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/DefaultCategoryNameVersion.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/DefaultCategoryNameVersion.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** Canonical implementation of {@link CategoryNameVersion} */ public class DefaultCategoryNameVersion extends DefaultNameVersion implements CategoryNameVersion { diff --git a/org.argeo.slc.api/src/org/argeo/slc/DefaultNameVersion.java b/org.argeo.api.slc/src/org/argeo/api/slc/DefaultNameVersion.java similarity index 98% rename from org.argeo.slc.api/src/org/argeo/slc/DefaultNameVersion.java rename to org.argeo.api.slc/src/org/argeo/api/slc/DefaultNameVersion.java index 61cc66e2a..7ae25cb51 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/DefaultNameVersion.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/DefaultNameVersion.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** Canonical implementation of {@link NameVersion} */ diff --git a/org.argeo.slc.api/src/org/argeo/slc/ManifestConstants.java b/org.argeo.api.slc/src/org/argeo/api/slc/ManifestConstants.java similarity index 96% rename from org.argeo.slc.api/src/org/argeo/slc/ManifestConstants.java rename to org.argeo.api.slc/src/org/argeo/api/slc/ManifestConstants.java index 4f43cdab1..8aa781554 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/ManifestConstants.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/ManifestConstants.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; public enum ManifestConstants { // OSGi diff --git a/org.argeo.slc.api/src/org/argeo/slc/ModuleSet.java b/org.argeo.api.slc/src/org/argeo/api/slc/ModuleSet.java similarity index 84% rename from org.argeo.slc.api/src/org/argeo/slc/ModuleSet.java rename to org.argeo.api.slc/src/org/argeo/api/slc/ModuleSet.java index fd125a244..1a544dfe6 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/ModuleSet.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/ModuleSet.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; import java.util.Iterator; diff --git a/org.argeo.slc.api/src/org/argeo/slc/NameVersion.java b/org.argeo.api.slc/src/org/argeo/api/slc/NameVersion.java similarity index 95% rename from org.argeo.slc.api/src/org/argeo/slc/NameVersion.java rename to org.argeo.api.slc/src/org/argeo/api/slc/NameVersion.java index 45ce5835d..0101d594a 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/NameVersion.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/NameVersion.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** * Abstraction of a name / version pair, typically used as coordinates for a diff --git a/org.argeo.slc.api/src/org/argeo/slc/SlcConstants.java b/org.argeo.api.slc/src/org/argeo/api/slc/SlcConstants.java similarity index 91% rename from org.argeo.slc.api/src/org/argeo/slc/SlcConstants.java rename to org.argeo.api.slc/src/org/argeo/api/slc/SlcConstants.java index 7da9708f3..d20a5e761 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/SlcConstants.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/SlcConstants.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** Constants useful across all SLC components */ public interface SlcConstants { diff --git a/org.argeo.slc.api/src/org/argeo/slc/SlcException.java b/org.argeo.api.slc/src/org/argeo/api/slc/SlcException.java similarity index 93% rename from org.argeo.slc.api/src/org/argeo/slc/SlcException.java rename to org.argeo.api.slc/src/org/argeo/api/slc/SlcException.java index d2e5e2b0b..8ced2acad 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/SlcException.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/SlcException.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** Basis for all SLC exceptions. This is an unchecked exception. */ public class SlcException extends RuntimeException { diff --git a/org.argeo.slc.api/src/org/argeo/slc/SlcNames.java b/org.argeo.api.slc/src/org/argeo/api/slc/SlcNames.java similarity index 99% rename from org.argeo.slc.api/src/org/argeo/slc/SlcNames.java rename to org.argeo.api.slc/src/org/argeo/api/slc/SlcNames.java index 557d4792d..4ece0535f 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/SlcNames.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/SlcNames.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** JCR names used by SLC */ public interface SlcNames { diff --git a/org.argeo.slc.api/src/org/argeo/slc/SlcTypes.java b/org.argeo.api.slc/src/org/argeo/api/slc/SlcTypes.java similarity index 99% rename from org.argeo.slc.api/src/org/argeo/slc/SlcTypes.java rename to org.argeo.api.slc/src/org/argeo/api/slc/SlcTypes.java index e0b86e6a6..effd3f3a0 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/SlcTypes.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/SlcTypes.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** JCR node types used by SLC */ public interface SlcTypes { diff --git a/org.argeo.slc.api/src/org/argeo/slc/StreamReadable.java b/org.argeo.api.slc/src/org/argeo/api/slc/StreamReadable.java similarity index 79% rename from org.argeo.slc.api/src/org/argeo/slc/StreamReadable.java rename to org.argeo.api.slc/src/org/argeo/api/slc/StreamReadable.java index f1bef22fd..fdda17e33 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/StreamReadable.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/StreamReadable.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; import java.io.InputStream; diff --git a/org.argeo.slc.api/src/org/argeo/slc/UnsupportedException.java b/org.argeo.api.slc/src/org/argeo/api/slc/UnsupportedException.java similarity index 98% rename from org.argeo.slc.api/src/org/argeo/slc/UnsupportedException.java rename to org.argeo.api.slc/src/org/argeo/api/slc/UnsupportedException.java index aa050e30d..3a7c766c8 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/UnsupportedException.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/UnsupportedException.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** Exception for unsupported features or actions. */ public class UnsupportedException extends SlcException { diff --git a/org.argeo.slc.api/src/org/argeo/slc/WellKnownConstants.java b/org.argeo.api.slc/src/org/argeo/api/slc/WellKnownConstants.java similarity index 94% rename from org.argeo.slc.api/src/org/argeo/slc/WellKnownConstants.java rename to org.argeo.api.slc/src/org/argeo/api/slc/WellKnownConstants.java index f0ce61445..034c16d9f 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/WellKnownConstants.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/WellKnownConstants.java @@ -1,4 +1,4 @@ -package org.argeo.slc; +package org.argeo.api.slc; /** * Centralises constant values related to software systems, which are well diff --git a/org.argeo.slc.api/src/org/argeo/slc/attachment/Attachment.java b/org.argeo.api.slc/src/org/argeo/api/slc/attachment/Attachment.java similarity index 80% rename from org.argeo.slc.api/src/org/argeo/slc/attachment/Attachment.java rename to org.argeo.api.slc/src/org/argeo/api/slc/attachment/Attachment.java index 65732511e..1a61bc63a 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/attachment/Attachment.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/attachment/Attachment.java @@ -1,4 +1,4 @@ -package org.argeo.slc.attachment; +package org.argeo.api.slc.attachment; public interface Attachment { public String getUuid(); diff --git a/org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsEnabled.java b/org.argeo.api.slc/src/org/argeo/api/slc/attachment/AttachmentsEnabled.java similarity index 70% rename from org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsEnabled.java rename to org.argeo.api.slc/src/org/argeo/api/slc/attachment/AttachmentsEnabled.java index 0b44e5b9e..45478a2ac 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsEnabled.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/attachment/AttachmentsEnabled.java @@ -1,4 +1,4 @@ -package org.argeo.slc.attachment; +package org.argeo.api.slc.attachment; public interface AttachmentsEnabled { public void addAttachment(Attachment attachment); diff --git a/org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsStorage.java b/org.argeo.api.slc/src/org/argeo/api/slc/attachment/AttachmentsStorage.java similarity index 89% rename from org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsStorage.java rename to org.argeo.api.slc/src/org/argeo/api/slc/attachment/AttachmentsStorage.java index 48cd0e650..735a44db0 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/attachment/AttachmentsStorage.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/attachment/AttachmentsStorage.java @@ -1,4 +1,4 @@ -package org.argeo.slc.attachment; +package org.argeo.api.slc.attachment; import java.io.InputStream; import java.io.OutputStream; diff --git a/org.argeo.slc.api/src/org/argeo/slc/build/Distribution.java b/org.argeo.api.slc/src/org/argeo/api/slc/build/Distribution.java similarity index 73% rename from org.argeo.slc.api/src/org/argeo/slc/build/Distribution.java rename to org.argeo.api.slc/src/org/argeo/api/slc/build/Distribution.java index b438a8f9a..b6e9f39e5 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/build/Distribution.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/build/Distribution.java @@ -1,4 +1,4 @@ -package org.argeo.slc.build; +package org.argeo.api.slc.build; /** A packaged software component */ public interface Distribution { diff --git a/org.argeo.slc.api/src/org/argeo/slc/build/License.java b/org.argeo.api.slc/src/org/argeo/api/slc/build/License.java similarity index 83% rename from org.argeo.slc.api/src/org/argeo/slc/build/License.java rename to org.argeo.api.slc/src/org/argeo/api/slc/build/License.java index d115f450b..4bbb8ecb5 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/build/License.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/build/License.java @@ -1,4 +1,4 @@ -package org.argeo.slc.build; +package org.argeo.api.slc.build; /** A software license */ public interface License { diff --git a/org.argeo.slc.api/src/org/argeo/slc/build/ModularDistribution.java b/org.argeo.api.slc/src/org/argeo/api/slc/build/ModularDistribution.java similarity index 80% rename from org.argeo.slc.api/src/org/argeo/slc/build/ModularDistribution.java rename to org.argeo.api.slc/src/org/argeo/api/slc/build/ModularDistribution.java index 3c7f625c1..73f194a70 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/build/ModularDistribution.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/build/ModularDistribution.java @@ -1,7 +1,7 @@ -package org.argeo.slc.build; +package org.argeo.api.slc.build; -import org.argeo.slc.ModuleSet; -import org.argeo.slc.NameVersion; +import org.argeo.api.slc.ModuleSet; +import org.argeo.api.slc.NameVersion; /** * A distribution of modules, that is components that can be identified by a diff --git a/org.argeo.slc.api/src/org/argeo/slc/build/package.html b/org.argeo.api.slc/src/org/argeo/api/slc/build/package.html similarity index 100% rename from org.argeo.slc.api/src/org/argeo/slc/build/package.html rename to org.argeo.api.slc/src/org/argeo/api/slc/build/package.html diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/DeployEnvironment.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployEnvironment.java similarity index 83% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/DeployEnvironment.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployEnvironment.java index dd4736929..2f40f3db6 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/DeployEnvironment.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployEnvironment.java @@ -1,4 +1,4 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; import java.io.File; import java.util.Map; diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/DeployedSystem.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployedSystem.java similarity index 82% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/DeployedSystem.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployedSystem.java index be28154fe..7c264cc29 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/DeployedSystem.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployedSystem.java @@ -1,6 +1,6 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; -import org.argeo.slc.build.Distribution; +import org.argeo.api.slc.build.Distribution; /** An instance of a software system. */ public interface DeployedSystem extends TargetData { diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/DeployedSystemManager.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployedSystemManager.java similarity index 77% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/DeployedSystemManager.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployedSystemManager.java index 411bcb6b9..a142ae535 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/DeployedSystemManager.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeployedSystemManager.java @@ -1,4 +1,4 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; public interface DeployedSystemManager { public void setDeployedSystem(T deployedSystem); diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/Deployment.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/Deployment.java similarity index 74% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/Deployment.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/Deployment.java index 74be42ab0..8efca64f9 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/Deployment.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/Deployment.java @@ -1,6 +1,6 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; -import org.argeo.slc.build.Distribution; +import org.argeo.api.slc.build.Distribution; public interface Deployment extends Runnable{ public DeployedSystem getDeployedSystem(); diff --git a/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeploymentData.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeploymentData.java new file mode 100644 index 000000000..9fcaf76f5 --- /dev/null +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DeploymentData.java @@ -0,0 +1,5 @@ +package org.argeo.api.slc.deploy; + +public interface DeploymentData { + +} diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/DynamicRuntime.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DynamicRuntime.java similarity index 73% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/DynamicRuntime.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/DynamicRuntime.java index ed29ce280..5e5adc19b 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/DynamicRuntime.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/DynamicRuntime.java @@ -1,7 +1,7 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; -import org.argeo.slc.NameVersion; -import org.argeo.slc.build.Distribution; +import org.argeo.api.slc.NameVersion; +import org.argeo.api.slc.build.Distribution; public interface DynamicRuntime extends ModularDeployedSystem { diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/InstalledExecutables.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/InstalledExecutables.java similarity index 76% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/InstalledExecutables.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/InstalledExecutables.java index 2d65a716c..bf416b916 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/InstalledExecutables.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/InstalledExecutables.java @@ -1,4 +1,4 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; public interface InstalledExecutables extends DeployedSystem { public String getExecutablePath(String key); diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/ModularDeployedSystem.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModularDeployedSystem.java similarity index 85% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/ModularDeployedSystem.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModularDeployedSystem.java index 18fd4fe6d..7bca5af8d 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/ModularDeployedSystem.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModularDeployedSystem.java @@ -1,4 +1,4 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; import java.util.List; diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/Module.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/Module.java similarity index 80% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/Module.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/Module.java index 10973c999..0be609c71 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/Module.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/Module.java @@ -1,6 +1,6 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; -import org.argeo.slc.NameVersion; +import org.argeo.api.slc.NameVersion; /** * Represents a deployed module of a broader deployed system. A module is diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/ModuleDescriptor.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModuleDescriptor.java similarity index 93% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/ModuleDescriptor.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModuleDescriptor.java index f1d664283..74e0c090e 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/ModuleDescriptor.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModuleDescriptor.java @@ -1,10 +1,10 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.argeo.slc.DefaultNameVersion; +import org.argeo.api.slc.DefaultNameVersion; /** The description of a versioned module. */ public class ModuleDescriptor extends DefaultNameVersion implements Serializable { diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/ModulesManager.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModulesManager.java similarity index 89% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/ModulesManager.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModulesManager.java index 1288592d6..5654acb6c 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/ModulesManager.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/ModulesManager.java @@ -1,8 +1,8 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; import java.util.List; -import org.argeo.slc.NameVersion; +import org.argeo.api.slc.NameVersion; /** Provides access to deployed modules */ public interface ModulesManager { diff --git a/org.argeo.api.slc/src/org/argeo/api/slc/deploy/TargetData.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/TargetData.java new file mode 100644 index 000000000..7ae0243b3 --- /dev/null +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/TargetData.java @@ -0,0 +1,5 @@ +package org.argeo.api.slc.deploy; + +public interface TargetData { + +} diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/VersioningDriver.java b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/VersioningDriver.java similarity index 92% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/VersioningDriver.java rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/VersioningDriver.java index dba57970c..42ed9f047 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/VersioningDriver.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/VersioningDriver.java @@ -1,4 +1,4 @@ -package org.argeo.slc.deploy; +package org.argeo.api.slc.deploy; import java.io.File; import java.io.OutputStream; diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/package.html b/org.argeo.api.slc/src/org/argeo/api/slc/deploy/package.html similarity index 100% rename from org.argeo.slc.api/src/org/argeo/slc/deploy/package.html rename to org.argeo.api.slc/src/org/argeo/api/slc/deploy/package.html diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/AbstractExecutionValue.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/AbstractExecutionValue.java similarity index 85% rename from org.argeo.slc.api/src/org/argeo/slc/execution/AbstractExecutionValue.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/AbstractExecutionValue.java index 7f6362601..c16ca3774 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/AbstractExecutionValue.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/AbstractExecutionValue.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.io.Serializable; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/AbstractSpecAttribute.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/AbstractSpecAttribute.java similarity index 97% rename from org.argeo.slc.api/src/org/argeo/slc/execution/AbstractSpecAttribute.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/AbstractSpecAttribute.java index d720db61e..c48baa397 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/AbstractSpecAttribute.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/AbstractSpecAttribute.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.io.Serializable; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionContext.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionContext.java similarity index 92% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionContext.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionContext.java index 46c448f41..201f6e2ae 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionContext.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionContext.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; /** Variables or references attached to an execution (typically thread bounded).*/ public interface ExecutionContext { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlow.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlow.java similarity index 95% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlow.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlow.java index 7dd3a74af..c3de07b78 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlow.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlow.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.util.Iterator; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlowDescriptor.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlowDescriptor.java similarity index 98% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlowDescriptor.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlowDescriptor.java index d38bb8524..9c31f4010 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlowDescriptor.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlowDescriptor.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.io.Serializable; import java.util.HashMap; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlowDescriptorConverter.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlowDescriptorConverter.java similarity index 92% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlowDescriptorConverter.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlowDescriptorConverter.java index 13ff63876..dfedc844a 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionFlowDescriptorConverter.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionFlowDescriptorConverter.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.util.Map; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModule.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModule.java similarity index 85% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModule.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModule.java index 11021f60e..8f8c8fdfd 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModule.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModule.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; @Deprecated public interface ExecutionModule { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModuleDescriptor.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModuleDescriptor.java similarity index 94% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModuleDescriptor.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModuleDescriptor.java index cad6efb81..bc6a3ddf9 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModuleDescriptor.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModuleDescriptor.java @@ -1,11 +1,11 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.argeo.slc.SlcException; -import org.argeo.slc.deploy.ModuleDescriptor; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.deploy.ModuleDescriptor; /** Describes the information required to launch a flow */ public class ExecutionModuleDescriptor extends ModuleDescriptor { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModulesListener.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModulesListener.java similarity index 84% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModulesListener.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModulesListener.java index aa0b16df4..d2ff928ba 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModulesListener.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModulesListener.java @@ -1,6 +1,6 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; -import org.argeo.slc.deploy.ModuleDescriptor; +import org.argeo.api.slc.deploy.ModuleDescriptor; /** Listen to events on execution modules. */ public interface ExecutionModulesListener { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModulesManager.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModulesManager.java similarity index 95% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModulesManager.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModulesManager.java index 1cedd12a2..42b8e4db1 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionModulesManager.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionModulesManager.java @@ -1,8 +1,8 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.util.List; -import org.argeo.slc.deploy.ModulesManager; +import org.argeo.api.slc.deploy.ModulesManager; /** Provides access to the execution modules */ public interface ExecutionModulesManager extends ModulesManager { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionProcess.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionProcess.java similarity index 98% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionProcess.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionProcess.java index d894e1c23..68f8d221e 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionProcess.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionProcess.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.util.List; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionResources.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionResources.java similarity index 96% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionResources.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionResources.java index 9ddbca988..6026912ef 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionResources.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionResources.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.io.File; import java.nio.file.Path; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionSpec.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionSpec.java similarity index 95% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionSpec.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionSpec.java index 0037b6d67..079c63b2c 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionSpec.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionSpec.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.util.Map; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionSpecAttribute.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionSpecAttribute.java similarity index 98% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionSpecAttribute.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionSpecAttribute.java index 39f87d9a1..0ca92bfc2 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionSpecAttribute.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionSpecAttribute.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; /** * Possible attribute of an execution flow. diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStack.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStack.java similarity index 93% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStack.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStack.java index 0a15e33b5..468a04a48 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStack.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStack.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; /** Deal with nested level of executions using different variables. */ public interface ExecutionStack { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStackLevel.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStackLevel.java similarity index 86% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStackLevel.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStackLevel.java index 790404b58..5fb875ed7 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStackLevel.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStackLevel.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.util.Map; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStep.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStep.java similarity index 94% rename from org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStep.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStep.java index 47c69180d..b536fe1ad 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/ExecutionStep.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/ExecutionStep.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.io.Serializable; import java.util.Date; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/FlowConfigurationException.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/FlowConfigurationException.java similarity index 78% rename from org.argeo.slc.api/src/org/argeo/slc/execution/FlowConfigurationException.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/FlowConfigurationException.java index d476483aa..ddc95d64a 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/FlowConfigurationException.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/FlowConfigurationException.java @@ -1,6 +1,6 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; -import org.argeo.slc.SlcException; +import org.argeo.api.slc.SlcException; /** The stack trace of such exceptions does not need to be displayed */ public class FlowConfigurationException extends SlcException { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/RealizedFlow.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/RealizedFlow.java similarity index 93% rename from org.argeo.slc.api/src/org/argeo/slc/execution/RealizedFlow.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/RealizedFlow.java index c1290a958..202a1a422 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/RealizedFlow.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/RealizedFlow.java @@ -1,11 +1,11 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.argeo.slc.DefaultNameVersion; -import org.argeo.slc.NameVersion; +import org.argeo.api.slc.DefaultNameVersion; +import org.argeo.api.slc.NameVersion; /** A fully configured execution flow, ready to be executed. */ public class RealizedFlow implements Serializable { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/RefSpecAttribute.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/RefSpecAttribute.java similarity index 97% rename from org.argeo.slc.api/src/org/argeo/slc/execution/RefSpecAttribute.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/RefSpecAttribute.java index b9bded031..8096504cb 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/RefSpecAttribute.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/RefSpecAttribute.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.util.List; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/RefValue.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/RefValue.java similarity index 94% rename from org.argeo.slc.api/src/org/argeo/slc/execution/RefValue.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/RefValue.java index 02be2a6ba..69109ce56 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/RefValue.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/RefValue.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; /** Reference value to be used by an execution */ public class RefValue extends AbstractExecutionValue { diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/RefValueChoice.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/RefValueChoice.java similarity index 94% rename from org.argeo.slc.api/src/org/argeo/slc/execution/RefValueChoice.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/RefValueChoice.java index c4c403e6e..5d98a2417 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/RefValueChoice.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/RefValueChoice.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.io.Serializable; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/SlcAgent.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/SlcAgent.java similarity index 97% rename from org.argeo.slc.api/src/org/argeo/slc/execution/SlcAgent.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/SlcAgent.java index 039724f50..ff7161b38 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/SlcAgent.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/SlcAgent.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; import java.net.URI; import java.util.List; diff --git a/org.argeo.slc.api/src/org/argeo/slc/execution/SlcAgentCli.java b/org.argeo.api.slc/src/org/argeo/api/slc/execution/SlcAgentCli.java similarity index 87% rename from org.argeo.slc.api/src/org/argeo/slc/execution/SlcAgentCli.java rename to org.argeo.api.slc/src/org/argeo/api/slc/execution/SlcAgentCli.java index 497d1104d..e128dd79e 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/execution/SlcAgentCli.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/execution/SlcAgentCli.java @@ -1,4 +1,4 @@ -package org.argeo.slc.execution; +package org.argeo.api.slc.execution; /** * Interpret a command line and run it in the underlying agent, with the proper diff --git a/org.argeo.slc.api/src/org/argeo/slc/package.html b/org.argeo.api.slc/src/org/argeo/api/slc/package.html similarity index 100% rename from org.argeo.slc.api/src/org/argeo/slc/package.html rename to org.argeo.api.slc/src/org/argeo/api/slc/package.html diff --git a/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveAccessor.java b/org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveAccessor.java similarity index 94% rename from org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveAccessor.java rename to org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveAccessor.java index b3f87ba1a..9b8880f71 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveAccessor.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveAccessor.java @@ -1,4 +1,4 @@ -package org.argeo.slc.primitive; +package org.argeo.api.slc.primitive; /** Abstraction of access to primitive values */ public interface PrimitiveAccessor { diff --git a/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveSpecAttribute.java b/org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveSpecAttribute.java similarity index 87% rename from org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveSpecAttribute.java rename to org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveSpecAttribute.java index cc3ee6722..404b5f86f 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveSpecAttribute.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveSpecAttribute.java @@ -1,7 +1,7 @@ -package org.argeo.slc.primitive; +package org.argeo.api.slc.primitive; -import org.argeo.slc.SlcException; -import org.argeo.slc.execution.AbstractSpecAttribute; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.execution.AbstractSpecAttribute; /** * A spec attribute wrapping a primitive value. diff --git a/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveUtils.java b/org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveUtils.java similarity index 98% rename from org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveUtils.java rename to org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveUtils.java index 679e808e9..bc8445d16 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveUtils.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveUtils.java @@ -1,4 +1,4 @@ -package org.argeo.slc.primitive; +package org.argeo.api.slc.primitive; /** Converts to and from primitive types. */ public class PrimitiveUtils { diff --git a/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveValue.java b/org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveValue.java similarity index 86% rename from org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveValue.java rename to org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveValue.java index 0c2bf23fe..136eaf7a1 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/primitive/PrimitiveValue.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/primitive/PrimitiveValue.java @@ -1,6 +1,6 @@ -package org.argeo.slc.primitive; +package org.argeo.api.slc.primitive; -import org.argeo.slc.execution.AbstractExecutionValue; +import org.argeo.api.slc.execution.AbstractExecutionValue; /** Primitive value to be used by an execution. */ public class PrimitiveValue extends AbstractExecutionValue implements diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/ExecutableTestRun.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/ExecutableTestRun.java similarity index 73% rename from org.argeo.slc.api/src/org/argeo/slc/test/ExecutableTestRun.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/ExecutableTestRun.java index f18196a49..49f8098e6 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/ExecutableTestRun.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/ExecutableTestRun.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; /** A test run that can be executed */ diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/IncompatibleTestDataException.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/IncompatibleTestDataException.java similarity index 87% rename from org.argeo.slc.api/src/org/argeo/slc/test/IncompatibleTestDataException.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/IncompatibleTestDataException.java index de5d900af..fdced669d 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/IncompatibleTestDataException.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/IncompatibleTestDataException.java @@ -1,6 +1,6 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; -import org.argeo.slc.SlcException; +import org.argeo.api.slc.SlcException; /** * Exception to throw when a test definition cannot interpret the provided test diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestData.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestData.java similarity index 76% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestData.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestData.java index 47973adee..9be3253e8 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestData.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestData.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; /** * Any data required by a test in order to run: configuration, expected, diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestDataProvider.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestDataProvider.java similarity index 74% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestDataProvider.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestDataProvider.java index 754a3df00..4a8202f91 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestDataProvider.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestDataProvider.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; public interface TestDataProvider { public T getTestData(Class clss, String key); diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestDefinition.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestDefinition.java similarity index 85% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestDefinition.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestDefinition.java index c7bfeac71..729201ac7 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestDefinition.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestDefinition.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; /** * The programmatic definition of a test, which will be associated with diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestResult.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestResult.java similarity index 95% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestResult.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestResult.java index 767b28613..76e9b7efa 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestResult.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestResult.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; import java.util.Date; import java.util.Map; diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestResultListener.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestResultListener.java similarity index 91% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestResultListener.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestResultListener.java index c2ad8ed66..5bce3cf0a 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestResultListener.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestResultListener.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; /** Listener to the operations on a test result. */ public interface TestResultListener { diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestResultPart.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestResultPart.java similarity index 91% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestResultPart.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestResultPart.java index ec984f9cc..f8d25779a 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestResultPart.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestResultPart.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; /** * Part of a test result. diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestRun.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestRun.java similarity index 86% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestRun.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestRun.java index a3e8aeb5a..f0d3b98ad 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestRun.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestRun.java @@ -1,6 +1,6 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; -import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.api.slc.deploy.DeployedSystem; /** The actual run of a test */ public interface TestRun { diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestRunAware.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestRunAware.java similarity index 84% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestRunAware.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestRunAware.java index 54585597b..77479f4cb 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestRunAware.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestRunAware.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; /** Allows a test run to notify other objects. */ public interface TestRunAware { diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/TestStatus.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestStatus.java similarity index 97% rename from org.argeo.slc.api/src/org/argeo/slc/test/TestStatus.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/TestStatus.java index a5e10d365..763c5b4dc 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/TestStatus.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/TestStatus.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; /** * Simple statuses. Ordering of the flags can be relied upon in aggregation: if diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/WritableTestRun.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/WritableTestRun.java similarity index 81% rename from org.argeo.slc.api/src/org/argeo/slc/test/WritableTestRun.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/WritableTestRun.java index 1a2ab237a..b4bc8a38f 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/WritableTestRun.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/WritableTestRun.java @@ -1,6 +1,6 @@ -package org.argeo.slc.test; +package org.argeo.api.slc.test; -import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.api.slc.deploy.DeployedSystem; /** Test run whose various components can be externally set. */ public interface WritableTestRun extends ExecutableTestRun { diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/context/ContextAware.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/context/ContextAware.java similarity index 90% rename from org.argeo.slc.api/src/org/argeo/slc/test/context/ContextAware.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/context/ContextAware.java index d2cd86f74..44eeb38a8 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/context/ContextAware.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/context/ContextAware.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test.context; +package org.argeo.api.slc.test.context; import java.util.Map; diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/context/ParentContextAware.java b/org.argeo.api.slc/src/org/argeo/api/slc/test/context/ParentContextAware.java similarity index 80% rename from org.argeo.slc.api/src/org/argeo/slc/test/context/ParentContextAware.java rename to org.argeo.api.slc/src/org/argeo/api/slc/test/context/ParentContextAware.java index b4044f7ca..21397267a 100644 --- a/org.argeo.slc.api/src/org/argeo/slc/test/context/ParentContextAware.java +++ b/org.argeo.api.slc/src/org/argeo/api/slc/test/context/ParentContextAware.java @@ -1,4 +1,4 @@ -package org.argeo.slc.test.context; +package org.argeo.api.slc.test.context; import java.util.Collection; diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/context/package.html b/org.argeo.api.slc/src/org/argeo/api/slc/test/context/package.html similarity index 100% rename from org.argeo.slc.api/src/org/argeo/slc/test/context/package.html rename to org.argeo.api.slc/src/org/argeo/api/slc/test/context/package.html diff --git a/org.argeo.slc.api/src/org/argeo/slc/test/package.html b/org.argeo.api.slc/src/org/argeo/api/slc/test/package.html similarity index 100% rename from org.argeo.slc.api/src/org/argeo/slc/test/package.html rename to org.argeo.api.slc/src/org/argeo/api/slc/test/package.html diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/DeploymentData.java b/org.argeo.slc.api/src/org/argeo/slc/deploy/DeploymentData.java deleted file mode 100644 index 18e63f829..000000000 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/DeploymentData.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.argeo.slc.deploy; - -public interface DeploymentData { - -} diff --git a/org.argeo.slc.api/src/org/argeo/slc/deploy/TargetData.java b/org.argeo.slc.api/src/org/argeo/slc/deploy/TargetData.java deleted file mode 100644 index f1c7e7d13..000000000 --- a/org.argeo.slc.api/src/org/argeo/slc/deploy/TargetData.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.argeo.slc.deploy; - -public interface TargetData { - -} diff --git a/org.argeo.slc.runtime/bnd.bnd b/org.argeo.slc.runtime/bnd.bnd index 263e792e0..971fb5031 100644 --- a/org.argeo.slc.runtime/bnd.bnd +++ b/org.argeo.slc.runtime/bnd.bnd @@ -1,6 +1,6 @@ Bundle-Activator: org.argeo.slc.internal.runtime.osgi.SlcInitActivator Import-Package: \ -org.argeo.slc.deploy,\ +org.argeo.api.slc.deploy,\ org.apache.commons.exec.*;resolution:=optional,\ * \ No newline at end of file diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java index feec64f18..ad33f4a50 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeployedSystem.java @@ -1,6 +1,6 @@ package org.argeo.slc.cms.deploy; -import org.argeo.slc.deploy.DeployedSystem; +import org.argeo.api.slc.deploy.DeployedSystem; public interface CmsDeployedSystem extends DeployedSystem { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java index 17cecd829..844c9e7a0 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsDeploymentData.java @@ -2,7 +2,7 @@ package org.argeo.slc.cms.deploy; import java.util.List; -import org.argeo.slc.deploy.DeploymentData; +import org.argeo.api.slc.deploy.DeploymentData; public interface CmsDeploymentData extends DeploymentData { List getModulesToActivate(int startLevel); diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsTargetData.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsTargetData.java index 8e8d147ce..eee2f8b79 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsTargetData.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/CmsTargetData.java @@ -2,7 +2,7 @@ package org.argeo.slc.cms.deploy; import java.nio.file.Path; -import org.argeo.slc.deploy.TargetData; +import org.argeo.api.slc.deploy.TargetData; public interface CmsTargetData extends TargetData { Path getInstanceData(); diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java index 25d57b897..6417e8639 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployedSystem.java @@ -1,12 +1,12 @@ package org.argeo.slc.cms.deploy.osgi; -import org.argeo.slc.build.Distribution; -import org.argeo.slc.build.ModularDistribution; +import org.argeo.api.slc.build.Distribution; +import org.argeo.api.slc.build.ModularDistribution; +import org.argeo.api.slc.deploy.DeploymentData; +import org.argeo.api.slc.deploy.TargetData; import org.argeo.slc.cms.deploy.CmsDeployedSystem; import org.argeo.slc.cms.deploy.CmsDeploymentData; import org.argeo.slc.cms.deploy.CmsTargetData; -import org.argeo.slc.deploy.DeploymentData; -import org.argeo.slc.deploy.TargetData; import org.osgi.framework.BundleContext; /** A deployed OSGi-based Argeo CMS system. */ diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java index f6e55caef..38974a013 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java @@ -16,18 +16,18 @@ import org.argeo.api.a2.A2Source; import org.argeo.api.a2.FsA2Source; import org.argeo.api.init.InitConstants; import org.argeo.api.init.RuntimeContext; +import org.argeo.api.slc.WellKnownConstants; +import org.argeo.api.slc.build.Distribution; +import org.argeo.api.slc.deploy.DeployedSystem; +import org.argeo.api.slc.deploy.Deployment; +import org.argeo.api.slc.deploy.DeploymentData; +import org.argeo.api.slc.deploy.TargetData; import org.argeo.init.osgi.OsgiRuntimeContext; -import org.argeo.slc.WellKnownConstants; -import org.argeo.slc.build.Distribution; import org.argeo.slc.cms.deploy.CmsDeployedSystem; import org.argeo.slc.cms.deploy.CmsDeploymentData; import org.argeo.slc.cms.deploy.CmsTargetData; import org.argeo.slc.cms.deploy.SimpleCmsDeploymentData; import org.argeo.slc.cms.distribution.A2Distribution; -import org.argeo.slc.deploy.DeployedSystem; -import org.argeo.slc.deploy.Deployment; -import org.argeo.slc.deploy.DeploymentData; -import org.argeo.slc.deploy.TargetData; /** The process of deploying an OSGi based Argeo CMS system. */ public class OsgiCmsDeployment implements Deployment { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2Distribution.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2Distribution.java index 435d2d6f5..f0401af53 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2Distribution.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2Distribution.java @@ -9,11 +9,11 @@ import org.argeo.api.a2.A2Component; import org.argeo.api.a2.A2Contribution; import org.argeo.api.a2.A2Module; import org.argeo.api.a2.A2Source; -import org.argeo.slc.CategoryNameVersion; -import org.argeo.slc.DefaultCategoryNameVersion; -import org.argeo.slc.NameVersion; -import org.argeo.slc.build.Distribution; -import org.argeo.slc.build.ModularDistribution; +import org.argeo.api.slc.CategoryNameVersion; +import org.argeo.api.slc.DefaultCategoryNameVersion; +import org.argeo.api.slc.NameVersion; +import org.argeo.api.slc.build.Distribution; +import org.argeo.api.slc.build.ModularDistribution; public class A2Distribution implements ModularDistribution { private List a2Sources = new ArrayList<>(); diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java b/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java index 9e90bce8f..2a56628f1 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cms/distribution/A2ModuleDistribution.java @@ -1,7 +1,7 @@ package org.argeo.slc.cms.distribution; import org.argeo.api.a2.A2Module; -import org.argeo.slc.build.Distribution; +import org.argeo.api.slc.build.Distribution; public class A2ModuleDistribution implements Distribution { private A2Module a2Module; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/AbstractExecutionModulesManager.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/AbstractExecutionModulesManager.java index 149665cdf..257e53d35 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/AbstractExecutionModulesManager.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/AbstractExecutionModulesManager.java @@ -2,11 +2,11 @@ package org.argeo.slc.runtime; import java.util.Map; -import org.argeo.slc.execution.ExecutionContext; -import org.argeo.slc.execution.ExecutionFlow; -import org.argeo.slc.execution.ExecutionFlowDescriptorConverter; -import org.argeo.slc.execution.ExecutionModulesManager; -import org.argeo.slc.execution.RealizedFlow; +import org.argeo.api.slc.execution.ExecutionContext; +import org.argeo.api.slc.execution.ExecutionFlow; +import org.argeo.api.slc.execution.ExecutionFlowDescriptorConverter; +import org.argeo.api.slc.execution.ExecutionModulesManager; +import org.argeo.api.slc.execution.RealizedFlow; /** Provides the base feature of an execution module manager. */ public abstract class AbstractExecutionModulesManager implements diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgent.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgent.java index 31b5396cf..1a9dd78ff 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgent.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgent.java @@ -11,13 +11,13 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.argeo.slc.DefaultNameVersion; -import org.argeo.slc.NameVersion; -import org.argeo.slc.SlcException; -import org.argeo.slc.execution.ExecutionModuleDescriptor; -import org.argeo.slc.execution.ExecutionModulesManager; -import org.argeo.slc.execution.ExecutionProcess; -import org.argeo.slc.execution.SlcAgent; +import org.argeo.api.slc.DefaultNameVersion; +import org.argeo.api.slc.NameVersion; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.execution.ExecutionModuleDescriptor; +import org.argeo.api.slc.execution.ExecutionModulesManager; +import org.argeo.api.slc.execution.ExecutionProcess; +import org.argeo.api.slc.execution.SlcAgent; /** Implements the base methods of an SLC agent. */ public class DefaultAgent implements SlcAgent { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgentCli.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgentCli.java index dbe1d7f6e..97d4c616e 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgentCli.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgentCli.java @@ -8,15 +8,15 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.argeo.slc.DefaultNameVersion; -import org.argeo.slc.NameVersion; -import org.argeo.slc.SlcException; -import org.argeo.slc.execution.ExecutionFlowDescriptor; -import org.argeo.slc.execution.ExecutionModuleDescriptor; -import org.argeo.slc.execution.ExecutionSpec; -import org.argeo.slc.execution.ExecutionSpecAttribute; -import org.argeo.slc.execution.SlcAgent; -import org.argeo.slc.execution.SlcAgentCli; +import org.argeo.api.slc.DefaultNameVersion; +import org.argeo.api.slc.NameVersion; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.execution.ExecutionFlowDescriptor; +import org.argeo.api.slc.execution.ExecutionModuleDescriptor; +import org.argeo.api.slc.execution.ExecutionSpec; +import org.argeo.api.slc.execution.ExecutionSpecAttribute; +import org.argeo.api.slc.execution.SlcAgent; +import org.argeo.api.slc.execution.SlcAgentCli; /** * Authenticates thread and executes synchronously a command line execution. diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java index 9e31306ad..07d044b77 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java @@ -10,11 +10,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.argeo.slc.SlcException; -import org.argeo.slc.execution.ExecutionContext; -import org.argeo.slc.execution.ExecutionFlow; -import org.argeo.slc.execution.ExecutionSpec; -import org.argeo.slc.execution.ExecutionSpecAttribute; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.execution.ExecutionContext; +import org.argeo.api.slc.execution.ExecutionFlow; +import org.argeo.api.slc.execution.ExecutionSpec; +import org.argeo.api.slc.execution.ExecutionSpecAttribute; /** Default implementation of an execution flow. */ public class DefaultExecutionFlow implements ExecutionFlow { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionSpec.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionSpec.java index 16790a4dc..d0b2b42d6 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionSpec.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionSpec.java @@ -6,10 +6,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.argeo.slc.execution.ExecutionSpec; -import org.argeo.slc.execution.ExecutionSpecAttribute; -import org.argeo.slc.execution.RefSpecAttribute; -import org.argeo.slc.execution.RefValueChoice; +import org.argeo.api.slc.execution.ExecutionSpec; +import org.argeo.api.slc.execution.ExecutionSpecAttribute; +import org.argeo.api.slc.execution.RefSpecAttribute; +import org.argeo.api.slc.execution.RefValueChoice; /** Spring based implementation of execution specifications. */ public class DefaultExecutionSpec implements ExecutionSpec, Serializable { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java index b30d51788..fd0f1f76f 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java @@ -5,10 +5,10 @@ import java.util.Map; import java.util.Stack; import java.util.UUID; -import org.argeo.slc.SlcException; -import org.argeo.slc.execution.ExecutionFlow; -import org.argeo.slc.execution.ExecutionSpecAttribute; -import org.argeo.slc.execution.ExecutionStack; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.execution.ExecutionFlow; +import org.argeo.api.slc.execution.ExecutionSpecAttribute; +import org.argeo.api.slc.execution.ExecutionStack; /** Canonical implementation of an execution stack. */ public class DefaultExecutionStack implements ExecutionStack { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultProcess.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultProcess.java index 9e98685dd..7e43dd13c 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultProcess.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultProcess.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.argeo.slc.execution.ExecutionProcess; -import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.execution.RealizedFlow; +import org.argeo.api.slc.execution.ExecutionProcess; +import org.argeo.api.slc.execution.ExecutionStep; +import org.argeo.api.slc.execution.RealizedFlow; /** Canonical implementation of an {@link ExecutionProcess} as a bean. */ public class DefaultProcess implements ExecutionProcess { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ExecutionThread.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ExecutionThread.java index 7e0e73778..9e2f06819 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ExecutionThread.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ExecutionThread.java @@ -12,11 +12,11 @@ import java.util.List; import javax.security.auth.Subject; -import org.argeo.slc.execution.ExecutionFlowDescriptor; -import org.argeo.slc.execution.ExecutionModulesManager; -import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.execution.FlowConfigurationException; -import org.argeo.slc.execution.RealizedFlow; +import org.argeo.api.slc.execution.ExecutionFlowDescriptor; +import org.argeo.api.slc.execution.ExecutionModulesManager; +import org.argeo.api.slc.execution.ExecutionStep; +import org.argeo.api.slc.execution.FlowConfigurationException; +import org.argeo.api.slc.execution.RealizedFlow; /** Thread of a single execution */ public class ExecutionThread extends Thread { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/InstantiationManager.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/InstantiationManager.java index 2e29438e3..911e95aaa 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/InstantiationManager.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/InstantiationManager.java @@ -3,12 +3,12 @@ package org.argeo.slc.runtime; import java.lang.System.Logger.Level; import java.util.Stack; -import org.argeo.slc.SlcException; -import org.argeo.slc.execution.ExecutionFlow; -import org.argeo.slc.execution.ExecutionSpecAttribute; -import org.argeo.slc.execution.RefSpecAttribute; -import org.argeo.slc.primitive.PrimitiveSpecAttribute; -import org.argeo.slc.primitive.PrimitiveUtils; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.execution.ExecutionFlow; +import org.argeo.api.slc.execution.ExecutionSpecAttribute; +import org.argeo.api.slc.execution.RefSpecAttribute; +import org.argeo.api.slc.primitive.PrimitiveSpecAttribute; +import org.argeo.api.slc.primitive.PrimitiveUtils; /** Manage parameters that need to be set during the instantiation of a flow */ public class InstantiationManager { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java index 1bbf9d128..8df7caa8e 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java @@ -13,11 +13,11 @@ import java.util.Set; import javax.security.auth.Subject; -import org.argeo.slc.SlcException; -import org.argeo.slc.execution.ExecutionModulesManager; -import org.argeo.slc.execution.ExecutionProcess; -import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.execution.RealizedFlow; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.execution.ExecutionModulesManager; +import org.argeo.api.slc.execution.ExecutionProcess; +import org.argeo.api.slc.execution.ExecutionStep; +import org.argeo.api.slc.execution.RealizedFlow; /** * Main thread coordinating an {@link ExecutionProcess}, launching parallel or diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThreadGroup.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThreadGroup.java index 79f38d77b..b1792ba45 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThreadGroup.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThreadGroup.java @@ -3,8 +3,8 @@ package org.argeo.slc.runtime; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; -import org.argeo.slc.execution.ExecutionProcess; -import org.argeo.slc.execution.ExecutionStep; +import org.argeo.api.slc.execution.ExecutionProcess; +import org.argeo.api.slc.execution.ExecutionStep; /** The thread group attached to a given {@link SlcExecution}. */ public class ProcessThreadGroup extends ThreadGroup { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/CloseTestResult.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/CloseTestResult.java index 2bb48b8fa..aa12d78a1 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/CloseTestResult.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/CloseTestResult.java @@ -1,6 +1,6 @@ package org.argeo.slc.runtime.tasks; -import org.argeo.slc.test.TestResult; +import org.argeo.api.slc.test.TestResult; public class CloseTestResult implements Runnable { private TestResult testResult; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/Echo.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/Echo.java index 6695313a3..290f2160f 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/Echo.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/Echo.java @@ -7,7 +7,7 @@ import java.lang.System.Logger.Level; import java.nio.file.Path; import org.apache.commons.io.FileUtils; -import org.argeo.slc.SlcException; +import org.argeo.api.slc.SlcException; public class Echo implements Runnable { private final static Logger defaultLogger = System.getLogger(Echo.class.getName()); diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/If.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/If.java index 08eb804cc..0a634cf1a 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/If.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/If.java @@ -1,6 +1,6 @@ package org.argeo.slc.runtime.tasks; -import org.argeo.slc.SlcException; +import org.argeo.api.slc.SlcException; /** Conditional execution */ public class If implements Runnable { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/JvmProcess.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/JvmProcess.java index c89f2b814..36f357e5f 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/JvmProcess.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/JvmProcess.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Properties; import org.apache.commons.io.IOUtils; -import org.argeo.slc.SlcException; +import org.argeo.api.slc.SlcException; /** A Java Virtual Machine process. */ public class JvmProcess extends SystemCall { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java index d421cd2f2..07c67c3a1 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java @@ -39,12 +39,12 @@ import org.apache.commons.exec.PumpStreamHandler; import org.apache.commons.exec.ShutdownHookProcessDestroyer; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.argeo.slc.SlcException; -import org.argeo.slc.UnsupportedException; -import org.argeo.slc.execution.ExecutionResources; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.UnsupportedException; +import org.argeo.api.slc.execution.ExecutionResources; +import org.argeo.api.slc.test.TestResult; +import org.argeo.api.slc.test.TestStatus; import org.argeo.slc.runtime.test.SimpleResultPart; -import org.argeo.slc.test.TestResult; -import org.argeo.slc.test.TestStatus; /** Execute an OS specific system call. */ public class SystemCall implements Runnable { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/BasicTestData.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/BasicTestData.java index ec6261d68..8c570243a 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/BasicTestData.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/BasicTestData.java @@ -1,6 +1,6 @@ package org.argeo.slc.runtime.test; -import org.argeo.slc.test.TestData; +import org.argeo.api.slc.test.TestData; public class BasicTestData implements TestData { private Object expected; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/BasicTestDefinition.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/BasicTestDefinition.java index 3bc49f611..fae387306 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/BasicTestDefinition.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/BasicTestDefinition.java @@ -1,13 +1,13 @@ package org.argeo.slc.runtime.test; -import org.argeo.slc.SlcException; -import org.argeo.slc.test.IncompatibleTestDataException; -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; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.test.IncompatibleTestDataException; +import org.argeo.api.slc.test.TestData; +import org.argeo.api.slc.test.TestDefinition; +import org.argeo.api.slc.test.TestResult; +import org.argeo.api.slc.test.TestRun; +import org.argeo.api.slc.test.TestStatus; +import org.argeo.api.slc.test.context.ContextAware; /** Understands basic test data and context aware test data. */ public class BasicTestDefinition implements TestDefinition { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java index 96ce5e1bf..f3c52fad4 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java @@ -3,10 +3,10 @@ package org.argeo.slc.runtime.test; import java.util.Map; import java.util.TreeMap; -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; +import org.argeo.api.slc.test.TestResult; +import org.argeo.api.slc.test.TestStatus; +import org.argeo.api.slc.test.context.ContextAware; +import org.argeo.api.slc.test.context.ParentContextAware; /** Utilities for comparing and synchronising contexts. */ public class ContextUtils { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleResultPart.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleResultPart.java index 7ba746463..f77fa9f39 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleResultPart.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleResultPart.java @@ -2,10 +2,10 @@ package org.argeo.slc.runtime.test; import java.io.Serializable; -import org.argeo.slc.test.TestResultPart; -import org.argeo.slc.test.TestRun; -import org.argeo.slc.test.TestRunAware; -import org.argeo.slc.test.TestStatus; +import org.argeo.api.slc.test.TestResultPart; +import org.argeo.api.slc.test.TestRun; +import org.argeo.api.slc.test.TestRunAware; +import org.argeo.api.slc.test.TestStatus; /** *

diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestResult.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestResult.java index 88f0a24b0..649e5d390 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestResult.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestResult.java @@ -7,10 +7,10 @@ import java.util.TreeMap; import java.util.UUID; import java.util.Vector; -import org.argeo.slc.SlcException; -import org.argeo.slc.test.TestResult; -import org.argeo.slc.test.TestResultPart; -import org.argeo.slc.test.TestRun; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.test.TestResult; +import org.argeo.api.slc.test.TestResultPart; +import org.argeo.api.slc.test.TestRun; /** * Basic implementation of a test result containing only a list of result parts. diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestRun.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestRun.java index bc0145295..44737931d 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestRun.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestRun.java @@ -2,12 +2,12 @@ package org.argeo.slc.runtime.test; import java.util.UUID; -import org.argeo.slc.deploy.DeployedSystem; -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; +import org.argeo.api.slc.deploy.DeployedSystem; +import org.argeo.api.slc.test.ExecutableTestRun; +import org.argeo.api.slc.test.TestData; +import org.argeo.api.slc.test.TestDefinition; +import org.argeo.api.slc.test.TestResult; +import org.argeo.api.slc.test.WritableTestRun; /** * A basic bean implementation of a WritableTestRun, holding diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SlcTestUtils.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SlcTestUtils.java index 5275d0f54..87409d42c 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SlcTestUtils.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SlcTestUtils.java @@ -1,7 +1,7 @@ package org.argeo.slc.runtime.test; -import org.argeo.slc.SlcException; -import org.argeo.slc.test.TestStatus; +import org.argeo.api.slc.SlcException; +import org.argeo.api.slc.test.TestStatus; public abstract class SlcTestUtils { public static String statusToString(Integer status) { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/TestDataUtils.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/TestDataUtils.java index 872f1a5ab..e5d8c7b2f 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/TestDataUtils.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/TestDataUtils.java @@ -1,8 +1,8 @@ package org.argeo.slc.runtime.test; -import org.argeo.slc.UnsupportedException; -import org.argeo.slc.test.TestData; -import org.argeo.slc.test.TestDataProvider; +import org.argeo.api.slc.UnsupportedException; +import org.argeo.api.slc.test.TestData; +import org.argeo.api.slc.test.TestDataProvider; /** Utilities for dealing with test datas. */ public class TestDataUtils { -- 2.30.2