From 1b452a434924d7628c7b2eace3c5df8e62cdea1c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 13 Jul 2010 09:28:17 +0000 Subject: [PATCH] Rename packages in OSGi boot git-svn-id: https://svn.argeo.org/commons/trunk@3668 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- osgi/runtime/org.argeo.osgi.boot/pom.xml | 2 +- .../org/argeo/{slc/osgiboot => osgi/boot}/Activator.java | 2 +- .../org/argeo/{slc/osgiboot => osgi/boot}/Launcher.java | 2 +- .../org/argeo/{slc/osgiboot => osgi/boot}/OsgiBoot.java | 8 ++++---- .../argeo/{slc/osgiboot => osgi/boot}/OsgiBootUtils.java | 2 +- .../boot}/internal/springutil/AntPathMatcher.java | 2 +- .../boot}/internal/springutil/CollectionUtils.java | 2 +- .../boot}/internal/springutil/ObjectUtils.java | 2 +- .../boot}/internal/springutil/PathMatcher.java | 2 +- .../boot}/internal/springutil/StringUtils.java | 2 +- .../boot}/internal/springutil/SystemPropertyUtils.java | 2 +- .../org/argeo/slc/osgiboot/OsgiBootNoRuntimeTest.java | 2 +- .../java/org/argeo/slc/osgiboot/OsgiBootRuntimeTest.java | 1 + 13 files changed, 16 insertions(+), 15 deletions(-) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/Activator.java (97%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/Launcher.java (99%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/OsgiBoot.java (99%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/OsgiBootUtils.java (95%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/internal/springutil/AntPathMatcher.java (96%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/internal/springutil/CollectionUtils.java (96%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/internal/springutil/ObjectUtils.java (96%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/internal/springutil/PathMatcher.java (96%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/internal/springutil/StringUtils.java (97%) rename osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/{slc/osgiboot => osgi/boot}/internal/springutil/SystemPropertyUtils.java (95%) diff --git a/osgi/runtime/org.argeo.osgi.boot/pom.xml b/osgi/runtime/org.argeo.osgi.boot/pom.xml index c324ee78e..cb16149c7 100644 --- a/osgi/runtime/org.argeo.osgi.boot/pom.xml +++ b/osgi/runtime/org.argeo.osgi.boot/pom.xml @@ -37,7 +37,7 @@ ${version.maven-bundle-plugin} - org.argeo.slc.osgiboot.Activator + org.argeo.osgi.boot.Activator diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Activator.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java similarity index 97% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Activator.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java index 74b3482e6..9eecf6cbd 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Activator.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Activator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot; +package org.argeo.osgi.boot; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Launcher.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java similarity index 99% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Launcher.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java index cd7b723b8..98d7503e3 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/Launcher.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/Launcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot; +package org.argeo.osgi.boot; import java.io.FileInputStream; import java.io.IOException; diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java similarity index 99% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java index ccaa17cf4..af28c8aba 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBoot.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot; +package org.argeo.osgi.boot; import java.io.BufferedReader; import java.io.File; @@ -29,9 +29,9 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.argeo.slc.osgiboot.internal.springutil.AntPathMatcher; -import org.argeo.slc.osgiboot.internal.springutil.PathMatcher; -import org.argeo.slc.osgiboot.internal.springutil.SystemPropertyUtils; +import org.argeo.osgi.boot.internal.springutil.AntPathMatcher; +import org.argeo.osgi.boot.internal.springutil.PathMatcher; +import org.argeo.osgi.boot.internal.springutil.SystemPropertyUtils; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBootUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java similarity index 95% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBootUtils.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java index 8c690cf57..a9067a213 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/OsgiBootUtils.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/OsgiBootUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot; +package org.argeo.osgi.boot; public class OsgiBootUtils { diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/AntPathMatcher.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java similarity index 96% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/AntPathMatcher.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java index c426e1f64..0b9ad1a23 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/AntPathMatcher.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/AntPathMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot.internal.springutil; +package org.argeo.osgi.boot.internal.springutil; /** * PathMatcher implementation for Ant-style path patterns. diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/CollectionUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java similarity index 96% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/CollectionUtils.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java index 61a611a69..ad0154293 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/CollectionUtils.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot.internal.springutil; +package org.argeo.osgi.boot.internal.springutil; import java.util.Arrays; import java.util.Collection; diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/ObjectUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java similarity index 96% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/ObjectUtils.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java index 5d6e98726..223b2a1c1 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/ObjectUtils.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot.internal.springutil; +package org.argeo.osgi.boot.internal.springutil; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/PathMatcher.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java similarity index 96% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/PathMatcher.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java index 1d8d31bfa..d7a23221b 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/PathMatcher.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/PathMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot.internal.springutil; +package org.argeo.osgi.boot.internal.springutil; /** * Strategy interface for String-based path matching. diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/StringUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java similarity index 97% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/StringUtils.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java index 39b033ff1..262659044 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/StringUtils.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/StringUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot.internal.springutil; +package org.argeo.osgi.boot.internal.springutil; import java.util.ArrayList; import java.util.Arrays; diff --git a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/SystemPropertyUtils.java b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java similarity index 95% rename from osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/SystemPropertyUtils.java rename to osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java index 8b1113c2e..f81adc25b 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/slc/osgiboot/internal/springutil/SystemPropertyUtils.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/main/java/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.argeo.slc.osgiboot.internal.springutil; +package org.argeo.osgi.boot.internal.springutil; /** * Helper class for resolving placeholders in texts. Usually applied to file paths. diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/slc/osgiboot/OsgiBootNoRuntimeTest.java b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/slc/osgiboot/OsgiBootNoRuntimeTest.java index fd2678b29..77f74d346 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/slc/osgiboot/OsgiBootNoRuntimeTest.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/slc/osgiboot/OsgiBootNoRuntimeTest.java @@ -21,7 +21,7 @@ import java.util.List; import junit.framework.TestCase; -import org.argeo.slc.osgiboot.OsgiBoot; +import org.argeo.osgi.boot.OsgiBoot; public class OsgiBootNoRuntimeTest extends TestCase { public final static String BUNDLES = "src/test/bundles/some;in=*;ex=excluded," diff --git a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/slc/osgiboot/OsgiBootRuntimeTest.java b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/slc/osgiboot/OsgiBootRuntimeTest.java index d7386cb91..b717c3ac4 100644 --- a/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/slc/osgiboot/OsgiBootRuntimeTest.java +++ b/osgi/runtime/org.argeo.osgi.boot/src/test/java/org/argeo/slc/osgiboot/OsgiBootRuntimeTest.java @@ -22,6 +22,7 @@ import java.util.TreeMap; import junit.framework.TestCase; +import org.argeo.osgi.boot.OsgiBoot; import org.eclipse.core.runtime.adaptor.EclipseStarter; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -- 2.30.2