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 (file)
index 0000000..c24d6ec
--- /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 (file)
index bef859f..0000000
--- 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 45cee40e2e98eab4f996c6c6a0dda1638e930ae2..ff90b95b78e122a99037a13a0ed589e18d097e31 100644 (file)
--- 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 bd6c63034a8ca28395b4eb2d7c0ef434149d11e4..f82ceffbaf9092b6b80efdfda6ad266338e48389 100644 (file)
--- 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;