Remove legacy components

git-svn-id: https://svn.argeo.org/slc/trunk@5681 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
index a4d396638a973d595c5f429b2d4b7400dbf51538..8806a741ce9cc3a111d67f45a8534395eccc70bd 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
@@ -31,8 +31,8 @@ import org.argeo.slc.test.WritableTestRun;
 public class SimpleTestRun implements WritableTestRun, ExecutableTestRun {\r
        private String uuid;\r
 \r
-       private String slcExecutionUuid;\r
-       private String slcExecutionStepUuid;\r
+       // private String slcExecutionUuid;\r
+       // private String slcExecutionStepUuid;\r
 \r
        private DeployedSystem deployedSystem;\r
        private TestData testData;\r
@@ -92,19 +92,19 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun {
                this.uuid = uuid;\r
        }\r
 \r
-       public String getSlcExecutionUuid() {\r
-               return slcExecutionUuid;\r
-       }\r
-\r
-       public void setSlcExecutionUuid(String slcExecutionUuid) {\r
-               this.slcExecutionUuid = slcExecutionUuid;\r
-       }\r
-\r
-       public String getSlcExecutionStepUuid() {\r
-               return slcExecutionStepUuid;\r
-       }\r
-\r
-       public void setSlcExecutionStepUuid(String slcExecutionStepUuid) {\r
-               this.slcExecutionStepUuid = slcExecutionStepUuid;\r
-       }\r
+       // public String getSlcExecutionUuid() {\r
+       // return slcExecutionUuid;\r
+       // }\r
+       //\r
+       // public void setSlcExecutionUuid(String slcExecutionUuid) {\r
+       // this.slcExecutionUuid = slcExecutionUuid;\r
+       // }\r
+       //\r
+       // public String getSlcExecutionStepUuid() {\r
+       // return slcExecutionStepUuid;\r
+       // }\r
+       //\r
+       // public void setSlcExecutionStepUuid(String slcExecutionStepUuid) {\r
+       // this.slcExecutionStepUuid = slcExecutionStepUuid;\r
+       // }\r
 }\r

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcApplication.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcApplication.java
deleted file mode 100644 (file)
index 0a1e3a6..0000000
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcApplication.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Mathieu Baudier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.runtime;
-
-import java.util.Map;
-import java.util.Properties;
-
-import org.argeo.slc.process.SlcExecution;
-
-/** Will be removed soon */
-@Deprecated
-public interface SlcApplication<T extends SlcExecutionContext> {
-       public void execute(SlcExecution slcExecution, Properties properties,
-                       Map<String, Object> references,
-                       SlcExecutionOutput<T> executionOutput);
-}

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java
deleted file mode 100644 (file)
index 2d7d9d2..0000000
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionContext.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Mathieu Baudier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.runtime;
-
-import org.argeo.slc.process.SlcExecution;
-
-/** Provides access to the object used during the execution */
-@Deprecated
-public interface SlcExecutionContext {
-       public <T> T getBean(String name);
-
-       public SlcExecution getSlcExecution();
-}

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionOutput.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionOutput.java
deleted file mode 100644 (file)
index ea38aaf..0000000
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcExecutionOutput.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Mathieu Baudier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.runtime;
-
-@Deprecated
-public interface SlcExecutionOutput<T extends SlcExecutionContext> {
-       /** Called after the execution, before the resources are freed. */
-       public void postExecution(T executionContext);
-}

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcRuntime.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcRuntime.java
deleted file mode 100644 (file)
index 99f7c9b..0000000
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/runtime/SlcRuntime.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Mathieu Baudier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.runtime;
-
-import java.util.Map;
-import java.util.Properties;
-
-import org.argeo.slc.runtime.SlcExecutionContext;
-import org.argeo.slc.runtime.SlcExecutionOutput;
-
-@Deprecated
-public interface SlcRuntime<T extends SlcExecutionContext> {
-       public void executeScript(String runtime, String script, String targets,
-                       Properties properties, Map<String, Object> references,
-                       SlcExecutionOutput<T> executionOutput);
-}

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestReport.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestReport.java
deleted file mode 100644 (file)
index 25aca6e..0000000
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestReport.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*\r
- * Copyright (C) 2007-2012 Mathieu Baudier\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.argeo.slc.test;\r
-\r
-/** \r
- * A report that can be generated based on a given test result. <b>This\r
- * interface may change in the future.</b>\r
- * @deprecated\r
- */\r
-public interface TestReport {\r
-       /** Performs the actions necessary to generate a report. */\r
-       public void generateTestReport(TestResult result);\r
-}\r

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunAware.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunAware.java
index 235f868fa14f9b790d687cebf4e868ce2eb32a5b..454b8f1e44d1fc30669452aa48653f93b38c9a8f 100644 (file)
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunAware.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunAware.java
@@ -15,6 +15,7 @@
  */\r
 package org.argeo.slc.test;\r
 \r
+/** Allows a test run to notify other objects. */\r
 public interface TestRunAware {\r
        /** Notifies the current test run. */\r
        public void notifyTestRun(TestRun testRun);\r

diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java
deleted file mode 100644 (file)
index e912e1c..0000000
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*\r
- * Copyright (C) 2007-2012 Mathieu Baudier\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.argeo.slc.test;\r
-\r
-import java.io.Serializable;\r
-\r
-import org.argeo.slc.deploy.DeployedSystem;\r
-import org.argeo.slc.process.SlcExecutionRelated;\r
-\r
-public class TestRunDescriptor implements Serializable {\r
-       private static final long serialVersionUID = -6488010128523489018L;\r
-       private String testRunUuid;\r
-       private String slcExecutionUuid;\r
-       private String slcExecutionStepUuid;\r
-       private String testResultUuid;\r
-       private String deployedSytemId;\r
-\r
-       public TestRunDescriptor() {\r
-\r
-       }\r
-\r
-       public TestRunDescriptor(TestRun testRun) {\r
-               testRunUuid = testRun.getUuid();\r
-\r
-               if (testRun.getTestResult() != null)\r
-                       testResultUuid = testRun.<TestResult> getTestResult().getUuid();\r
-\r
-               if (testRun.getDeployedSystem() != null)\r
-                       deployedSytemId = testRun.<DeployedSystem> getDeployedSystem()\r
-                                       .getDeployedSystemId();\r
-\r
-               if (testRun instanceof SlcExecutionRelated) {\r
-                       slcExecutionUuid = ((SlcExecutionRelated) testRun)\r
-                                       .getSlcExecutionUuid();\r
-                       slcExecutionStepUuid = ((SlcExecutionRelated) testRun)\r
-                                       .getSlcExecutionStepUuid();\r
-               }\r
-       }\r
-\r
-       public String getTestRunUuid() {\r
-               return testRunUuid;\r
-       }\r
-\r
-       public void setTestRunUuid(String testRunUuid) {\r
-               this.testRunUuid = testRunUuid;\r
-       }\r
-\r
-       public String getSlcExecutionUuid() {\r
-               return slcExecutionUuid;\r
-       }\r
-\r
-       public void setSlcExecutionUuid(String slcExecutionUuid) {\r
-               this.slcExecutionUuid = slcExecutionUuid;\r
-       }\r
-\r
-       public String getSlcExecutionStepUuid() {\r
-               return slcExecutionStepUuid;\r
-       }\r
-\r
-       public void setSlcExecutionStepUuid(String slcExecutionStepUuid) {\r
-               this.slcExecutionStepUuid = slcExecutionStepUuid;\r
-       }\r
-\r
-       public String getTestResultUuid() {\r
-               return testResultUuid;\r
-       }\r
-\r
-       public void setTestResultUuid(String testResultUuid) {\r
-               this.testResultUuid = testResultUuid;\r
-       }\r
-\r
-       public String getDeployedSytemId() {\r
-               return deployedSytemId;\r
-       }\r
-\r
-       public void setDeployedSytemId(String deploymentId) {\r
-               this.deployedSytemId = deploymentId;\r
-       }\r
-\r
-       @Override\r
-       public boolean equals(Object obj) {\r
-               if (obj instanceof TestRunDescriptor) {\r
-                       return getTestRunUuid().equals(\r
-                                       ((TestRunDescriptor) obj).getTestRunUuid());\r
-               }\r
-               return false;\r
-       }\r
-}\r