Refactored the package naming for bundleplugin.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@539972 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
rename to bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
index a827dc6..a20704e 100644
--- a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
import java.io.File;
import java.io.FilenameFilter;
diff --git a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleInfo.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleInfo.java
rename to bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
index 02429fb..26538a4 100644
--- a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleInfo.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
import java.util.Collection;
import java.util.HashMap;
diff --git a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
rename to bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index c0f69cd..12eccf3 100644
--- a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
import java.io.*;
import java.lang.reflect.*;
diff --git a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java
rename to bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
index 2e1a530..e4e6e3d 100644
--- a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/PackageVersionAnalyzer.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java
similarity index 97%
rename from bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/PackageVersionAnalyzer.java
rename to bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java
index ae91a53..f600b7c 100644
--- a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/PackageVersionAnalyzer.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
import java.io.IOException;
import java.util.Iterator;
diff --git a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
similarity index 95%
rename from bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java
rename to bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
index d0a83be..f19810b 100644
--- a/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
import org.apache.maven.plugin.MojoExecutionException;
diff --git a/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/AbstractBundlePluginTest.java b/bundleplugin/src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
similarity index 96%
rename from bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/AbstractBundlePluginTest.java
rename to bundleplugin/src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
index 1641878..cf74b38 100644
--- a/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/AbstractBundlePluginTest.java
+++ b/bundleplugin/src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
@@ -1,4 +1,4 @@
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPluginTest.java b/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java
similarity index 97%
rename from bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPluginTest.java
rename to bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java
index 7e13c20..fc79766 100644
--- a/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPluginTest.java
+++ b/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java
@@ -1,4 +1,4 @@
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.felix.bundleplugin.BundleAllPlugin;
import java.io.File;
import java.util.Collections;
import java.util.Map;
diff --git a/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java b/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
similarity index 98%
rename from bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java
rename to bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
index f157e3e..524079e 100644
--- a/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java
+++ b/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
@@ -1,4 +1,4 @@
-package org.apache.felix.tools.maven2.bundleplugin;
+package org.apache.felix.bundleplugin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.felix.bundleplugin.PackageVersionAnalyzer;
import java.io.File;
import java.io.IOException;
import java.util.List;