From: Mathieu Baudier Date: Wed, 31 Oct 2012 07:49:17 +0000 (+0000) Subject: Remove legacy components X-Git-Tag: argeo-slc-2.1.7~573 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=86420d80b15dced00fbf542d11583647c9085642;p=gpl%2Fargeo-slc.git 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 a4d396638..8806a741c 100644 --- 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 { private String uuid; - private String slcExecutionUuid; - private String slcExecutionStepUuid; + // private String slcExecutionUuid; + // private String slcExecutionStepUuid; private DeployedSystem deployedSystem; private TestData testData; @@ -92,19 +92,19 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun { this.uuid = uuid; } - public String getSlcExecutionUuid() { - return slcExecutionUuid; - } - - public void setSlcExecutionUuid(String slcExecutionUuid) { - this.slcExecutionUuid = slcExecutionUuid; - } - - public String getSlcExecutionStepUuid() { - return slcExecutionStepUuid; - } - - public void setSlcExecutionStepUuid(String slcExecutionStepUuid) { - this.slcExecutionStepUuid = slcExecutionStepUuid; - } + // public String getSlcExecutionUuid() { + // return slcExecutionUuid; + // } + // + // public void setSlcExecutionUuid(String slcExecutionUuid) { + // this.slcExecutionUuid = slcExecutionUuid; + // } + // + // public String getSlcExecutionStepUuid() { + // return slcExecutionStepUuid; + // } + // + // public void setSlcExecutionStepUuid(String slcExecutionStepUuid) { + // this.slcExecutionStepUuid = slcExecutionStepUuid; + // } } 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 index 0a1e3a664..000000000 --- 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 { - public void execute(SlcExecution slcExecution, Properties properties, - Map references, - SlcExecutionOutput 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 index 2d7d9d2a4..000000000 --- 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 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 index ea38aaf36..000000000 --- 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 { - /** 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 index 99f7c9bf4..000000000 --- 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 { - public void executeScript(String runtime, String script, String targets, - Properties properties, Map references, - SlcExecutionOutput 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 index 25aca6e98..000000000 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestReport.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.test; - -/** - * A report that can be generated based on a given test result. This - * interface may change in the future. - * @deprecated - */ -public interface TestReport { - /** Performs the actions necessary to generate a report. */ - public void generateTestReport(TestResult result); -} 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 235f868fa..454b8f1e4 100644 --- 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 @@ */ package org.argeo.slc.test; +/** Allows a test run to notify other objects. */ public interface TestRunAware { /** Notifies the current test run. */ public void notifyTestRun(TestRun testRun); 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 index e912e1c85..000000000 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/TestRunDescriptor.java +++ /dev/null @@ -1,101 +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.test; - -import java.io.Serializable; - -import org.argeo.slc.deploy.DeployedSystem; -import org.argeo.slc.process.SlcExecutionRelated; - -public class TestRunDescriptor implements Serializable { - private static final long serialVersionUID = -6488010128523489018L; - private String testRunUuid; - private String slcExecutionUuid; - private String slcExecutionStepUuid; - private String testResultUuid; - private String deployedSytemId; - - public TestRunDescriptor() { - - } - - public TestRunDescriptor(TestRun testRun) { - testRunUuid = testRun.getUuid(); - - if (testRun.getTestResult() != null) - testResultUuid = testRun. getTestResult().getUuid(); - - if (testRun.getDeployedSystem() != null) - deployedSytemId = testRun. getDeployedSystem() - .getDeployedSystemId(); - - if (testRun instanceof SlcExecutionRelated) { - slcExecutionUuid = ((SlcExecutionRelated) testRun) - .getSlcExecutionUuid(); - slcExecutionStepUuid = ((SlcExecutionRelated) testRun) - .getSlcExecutionStepUuid(); - } - } - - public String getTestRunUuid() { - return testRunUuid; - } - - public void setTestRunUuid(String testRunUuid) { - this.testRunUuid = testRunUuid; - } - - public String getSlcExecutionUuid() { - return slcExecutionUuid; - } - - public void setSlcExecutionUuid(String slcExecutionUuid) { - this.slcExecutionUuid = slcExecutionUuid; - } - - public String getSlcExecutionStepUuid() { - return slcExecutionStepUuid; - } - - public void setSlcExecutionStepUuid(String slcExecutionStepUuid) { - this.slcExecutionStepUuid = slcExecutionStepUuid; - } - - public String getTestResultUuid() { - return testResultUuid; - } - - public void setTestResultUuid(String testResultUuid) { - this.testResultUuid = testResultUuid; - } - - public String getDeployedSytemId() { - return deployedSytemId; - } - - public void setDeployedSytemId(String deploymentId) { - this.deployedSytemId = deploymentId; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof TestRunDescriptor) { - return getTestRunUuid().equals( - ((TestRunDescriptor) obj).getTestRunUuid()); - } - return false; - } -}