From: Mathieu Baudier Date: Wed, 4 Jun 2008 14:57:06 +0000 (+0000) Subject: Restructure deployment X-Git-Tag: argeo-slc-2.1.7~2854 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=9d1440433733a6e3a6977ee8ee423837415b22d6;p=gpl%2Fargeo-slc.git Restructure deployment git-svn-id: https://svn.argeo.org/slc/trunk@1187 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ExampleDeployedSystem.java b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ExampleDeployedSystem.java index a5dbf64e4..c45801760 100644 --- a/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ExampleDeployedSystem.java +++ b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ExampleDeployedSystem.java @@ -2,6 +2,8 @@ package org.argeo.slc.example; import org.argeo.slc.core.build.Distribution; import org.argeo.slc.core.deploy.DeployedSystem; +import org.argeo.slc.core.deploy.DeploymentData; +import org.argeo.slc.core.deploy.TargetData; import org.argeo.slc.example.appli.ExampleAppli; /** Example deployed sytem. */ @@ -35,4 +37,14 @@ public class ExampleDeployedSystem implements DeployedSystem { return null; } + public DeploymentData getDeploymentData() { + // TODO Auto-generated method stub + return null; + } + + public TargetData getTargetData() { + // TODO Auto-generated method stub + return null; + } + } diff --git a/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ExampleTask.java b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ExampleTask.java index 1af3c1838..f856b15fd 100644 --- a/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ExampleTask.java +++ b/org.argeo.slc.example/src/main/java/org/argeo/slc/example/ExampleTask.java @@ -4,7 +4,6 @@ import org.argeo.slc.core.structure.SimpleSElement; import org.argeo.slc.core.structure.StructureAware; import org.argeo.slc.core.structure.StructureElement; import org.argeo.slc.core.structure.StructureElementProvider; -import org.argeo.slc.core.structure.StructurePath; import org.argeo.slc.core.structure.StructureRegistry; import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.test.SimpleResultPart; diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java index 78c4ecd36..3a15d0e44 100644 --- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java +++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java @@ -4,19 +4,16 @@ import java.io.File; import junit.framework.TestCase; -import org.springframework.context.ApplicationContext; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tools.ant.Project; - import org.argeo.slc.ant.AntRegistryUtil; import org.argeo.slc.ant.SlcProjectHelper; -import org.argeo.slc.core.test.NumericTRId; import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.dao.test.TestResultDao; import org.argeo.slc.unit.test.tree.UnitTestTreeUtil; +import org.springframework.context.ApplicationContext; public class ContextIntegrationTest extends TestCase { private static Log log = LogFactory.getLog(ContextIntegrationTest.class); diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java index bd070b882..c072a21be 100644 --- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java +++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java @@ -4,19 +4,16 @@ import java.io.File; import junit.framework.TestCase; -import org.springframework.context.ApplicationContext; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tools.ant.Project; - import org.argeo.slc.ant.AntRegistryUtil; import org.argeo.slc.ant.SlcProjectHelper; -import org.argeo.slc.core.test.NumericTRId; import org.argeo.slc.core.test.TestStatus; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.dao.test.TestResultDao; import org.argeo.slc.unit.test.tree.UnitTestTreeUtil; +import org.springframework.context.ApplicationContext; /** High level tests for SLC Ant. */ public class ExampleIntegrationTest extends TestCase {