From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 27 Jun 2009 20:50:31 +0000 (+0000)
Subject: Move resource distribution
X-Git-Tag: argeo-slc-2.1.7~1734
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=inline;h=51f357dd0caf8896edb5058b2411d85fb9a0c733;p=gpl%2Fargeo-slc.git

Move resource distribution

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/build/ResourceDistribution.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/build/ResourceDistribution.java
new file mode 100644
index 000000000..c24d6ec6c
--- /dev/null
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/build/ResourceDistribution.java
@@ -0,0 +1,28 @@
+package org.argeo.slc.core.build;
+
+import org.argeo.slc.build.Distribution;
+import org.springframework.core.io.Resource;
+
+public class ResourceDistribution implements Distribution {
+	private Resource location;
+
+	public ResourceDistribution() {
+	}
+
+	public ResourceDistribution(Resource location) {
+		this.location = location;
+	}
+
+	public String getDistributionId() {
+		return location.toString();
+	}
+
+	public Resource getLocation() {
+		return location;
+	}
+
+	public void setLocation(Resource location) {
+		this.location = location;
+	}
+
+}
diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/ResourceDistribution.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/ResourceDistribution.java
deleted file mode 100644
index bef859fcc..000000000
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/ResourceDistribution.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.argeo.slc.core.deploy;
-
-import org.argeo.slc.build.Distribution;
-import org.springframework.core.io.Resource;
-
-public class ResourceDistribution implements Distribution {
-	private Resource location;
-
-	public ResourceDistribution() {
-	}
-
-	public ResourceDistribution(Resource location) {
-		this.location = location;
-	}
-
-	public String getDistributionId() {
-		return location.toString();
-	}
-
-	public Resource getLocation() {
-		return location;
-	}
-
-	public void setLocation(Resource location) {
-		this.location = location;
-	}
-
-}
diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
index 45cee40e2..ff90b95b7 100644
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java
@@ -1,7 +1,7 @@
 package org.argeo.slc.osgi;
 
 import org.argeo.slc.build.Distribution;
-import org.argeo.slc.core.deploy.ResourceDistribution;
+import org.argeo.slc.core.build.ResourceDistribution;
 import org.argeo.slc.deploy.DeploymentData;
 import org.argeo.slc.deploy.Module;
 import org.argeo.slc.deploy.TargetData;
diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java
index bd6c63034..f82ceffba 100644
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiRuntime.java
@@ -6,7 +6,7 @@ import java.util.UUID;
 
 import org.argeo.slc.UnsupportedException;
 import org.argeo.slc.build.Distribution;
-import org.argeo.slc.core.deploy.ResourceDistribution;
+import org.argeo.slc.core.build.ResourceDistribution;
 import org.argeo.slc.deploy.DeploymentData;
 import org.argeo.slc.deploy.ModularDeployedSystem;
 import org.argeo.slc.deploy.TargetData;