Remove sandbox from package name
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@567579 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java
index 983dcd6..a84cc95 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin;
+package org.apache.felix.scrplugin;
import java.io.File;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
index 2b8957b..e38859c 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin;
+package org.apache.felix.scrplugin;
import java.io.File;
import java.util.ArrayList;
@@ -25,21 +25,24 @@
import java.util.List;
import java.util.Map;
-import org.apache.felix.sandbox.scrplugin.om.Component;
-import org.apache.felix.sandbox.scrplugin.om.Components;
-import org.apache.felix.sandbox.scrplugin.om.Implementation;
-import org.apache.felix.sandbox.scrplugin.om.Interface;
-import org.apache.felix.sandbox.scrplugin.om.metatype.AttributeDefinition;
-import org.apache.felix.sandbox.scrplugin.om.metatype.Designate;
-import org.apache.felix.sandbox.scrplugin.om.metatype.MTObject;
-import org.apache.felix.sandbox.scrplugin.om.metatype.MetaData;
-import org.apache.felix.sandbox.scrplugin.om.metatype.OCD;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescriptorManager;
-import org.apache.felix.sandbox.scrplugin.tags.JavaField;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
-import org.apache.felix.sandbox.scrplugin.xml.ComponentDescriptorIO;
-import org.apache.felix.sandbox.scrplugin.xml.MetaTypeIO;
+import org.apache.felix.scrplugin.om.Component;
+import org.apache.felix.scrplugin.om.Components;
+import org.apache.felix.scrplugin.om.Implementation;
+import org.apache.felix.scrplugin.om.Interface;
+import org.apache.felix.scrplugin.om.Property;
+import org.apache.felix.scrplugin.om.Reference;
+import org.apache.felix.scrplugin.om.Service;
+import org.apache.felix.scrplugin.om.metatype.AttributeDefinition;
+import org.apache.felix.scrplugin.om.metatype.Designate;
+import org.apache.felix.scrplugin.om.metatype.MTObject;
+import org.apache.felix.scrplugin.om.metatype.MetaData;
+import org.apache.felix.scrplugin.om.metatype.OCD;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaClassDescriptorManager;
+import org.apache.felix.scrplugin.tags.JavaField;
+import org.apache.felix.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.xml.ComponentDescriptorIO;
+import org.apache.felix.scrplugin.xml.MetaTypeIO;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -336,7 +339,7 @@
return false;
}
- org.apache.felix.sandbox.scrplugin.om.Service service = new org.apache.felix.sandbox.scrplugin.om.Service();
+ final Service service = new Service();
component.setService(service);
boolean serviceFactory = false;
for (int i=0; i < services.length; i++) {
@@ -380,7 +383,7 @@
}
if (!StringUtils.isEmpty(name)) {
- org.apache.felix.sandbox.scrplugin.om.Property prop = new org.apache.felix.sandbox.scrplugin.om.Property(property);
+ final Property prop = new Property(property);
prop.setName(name);
prop.setType(property.getNamedParameter(Constants.PROPERTY_TYPE));
final String value = property.getNamedParameter(Constants.PROPERTY_VALUE);
@@ -483,7 +486,7 @@
}
if (!StringUtils.isEmpty(name)) {
- org.apache.felix.sandbox.scrplugin.om.Reference ref = new org.apache.felix.sandbox.scrplugin.om.Reference(reference);
+ final Reference ref = new Reference(reference);
ref.setName(name);
ref.setInterfacename(type);
ref.setCardinality(reference.getNamedParameter(Constants.REFERENCE_CARDINALITY));
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
index 5362f9d..3d7c23b 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om;
+package org.apache.felix.scrplugin.om;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.JavaTag;
/**
* The <code>AbstractObject</code>
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
index 25c651e..1956778 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om;
+package org.apache.felix.scrplugin.om;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaMethod;
-import org.apache.felix.sandbox.scrplugin.tags.JavaParameter;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaMethod;
+import org.apache.felix.scrplugin.tags.JavaParameter;
+import org.apache.felix.scrplugin.tags.JavaTag;
import org.apache.maven.plugin.MojoExecutionException;
/**
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
index 9c4a59e..b3db488 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om;
+package org.apache.felix.scrplugin.om;
import java.util.ArrayList;
import java.util.List;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
index c809b41..37e78b8 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om;
+package org.apache.felix.scrplugin.om;
/**
* <code>Implementation</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
index bfd3726..eb798e8 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om;
+package org.apache.felix.scrplugin.om;
import java.util.List;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaTag;
import org.apache.maven.plugin.MojoExecutionException;
/**
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
index 7fad9cb..c4e104d 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om;
+package org.apache.felix.scrplugin.om;
import java.util.List;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.JavaTag;
/**
* <code>Property.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
index d072f81..3ae5e26 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om;
+package org.apache.felix.scrplugin.om;
import java.util.List;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaMethod;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaMethod;
+import org.apache.felix.scrplugin.tags.JavaTag;
import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.plexus.util.StringUtils;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
index 74e1679..5167265 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om;
+package org.apache.felix.scrplugin.om;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
index 5d29d40..954b5d6 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om.metatype;
+package org.apache.felix.scrplugin.om.metatype;
import java.util.Map;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
index 1e164b7..d558065 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om.metatype;
+package org.apache.felix.scrplugin.om.metatype;
public class Designate {
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
index eaad5e1..7d99b39 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om.metatype;
+package org.apache.felix.scrplugin.om.metatype;
public class MTObject {
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
index 47115c8..e1084e1 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om.metatype;
+package org.apache.felix.scrplugin.om.metatype;
import java.util.List;
import java.util.ArrayList;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
index ee5e86f..50dd6c7 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.om.metatype;
+package org.apache.felix.scrplugin.om.metatype;
import java.util.ArrayList;
import java.util.List;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
index 6f942cf..e3b00ce 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags;
+package org.apache.felix.scrplugin.tags;
import org.apache.maven.plugin.MojoExecutionException;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java
index 34c99fc..2d8a748 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags;
+package org.apache.felix.scrplugin.tags;
import java.io.File;
import java.io.FileOutputStream;
@@ -34,12 +34,12 @@
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.apache.felix.sandbox.scrplugin.Constants;
-import org.apache.felix.sandbox.scrplugin.om.Component;
-import org.apache.felix.sandbox.scrplugin.om.Components;
-import org.apache.felix.sandbox.scrplugin.tags.cl.ClassLoaderJavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.qdox.QDoxJavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.xml.ComponentDescriptorIO;
+import org.apache.felix.scrplugin.Constants;
+import org.apache.felix.scrplugin.om.Component;
+import org.apache.felix.scrplugin.om.Components;
+import org.apache.felix.scrplugin.tags.cl.ClassLoaderJavaClassDescription;
+import org.apache.felix.scrplugin.tags.qdox.QDoxJavaClassDescription;
+import org.apache.felix.scrplugin.xml.ComponentDescriptorIO;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.MojoExecutionException;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
index 4137f06..2fc9769 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags;
+package org.apache.felix.scrplugin.tags;
/**
* <code>JavaField.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
index 6b65177..f21770f 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags;
+package org.apache.felix.scrplugin.tags;
/**
* <code>JavaMethod.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
index dbd14a7..02cf536 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags;
+package org.apache.felix.scrplugin.tags;
/**
* <code>JavaParameter.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
index 34bfa30..fb8503d 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags;
+package org.apache.felix.scrplugin.tags;
import java.util.Map;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
index 2ebab7b..794befe 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.cl;
+package org.apache.felix.scrplugin.tags.cl;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -24,14 +24,14 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.felix.sandbox.scrplugin.Constants;
-import org.apache.felix.sandbox.scrplugin.om.Component;
-import org.apache.felix.sandbox.scrplugin.om.Reference;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescriptorManager;
-import org.apache.felix.sandbox.scrplugin.tags.JavaField;
-import org.apache.felix.sandbox.scrplugin.tags.JavaMethod;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.Constants;
+import org.apache.felix.scrplugin.om.Component;
+import org.apache.felix.scrplugin.om.Reference;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaClassDescriptorManager;
+import org.apache.felix.scrplugin.tags.JavaField;
+import org.apache.felix.scrplugin.tags.JavaMethod;
+import org.apache.felix.scrplugin.tags.JavaTag;
import org.apache.maven.plugin.MojoExecutionException;
/**
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
index 4280736..31092e6 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.cl;
+package org.apache.felix.scrplugin.tags.cl;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.apache.felix.sandbox.scrplugin.tags.JavaMethod;
-import org.apache.felix.sandbox.scrplugin.tags.JavaParameter;
+import org.apache.felix.scrplugin.tags.JavaMethod;
+import org.apache.felix.scrplugin.tags.JavaParameter;
/**
* <code>ClassLoaderJavaMethod.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
index 7b4fdfa..369f995 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.cl;
+package org.apache.felix.scrplugin.tags.cl;
-import org.apache.felix.sandbox.scrplugin.tags.JavaParameter;
+import org.apache.felix.scrplugin.tags.JavaParameter;
/**
* <code>ClassLoaderJavaParameter.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
index 4b1a798..3fed074 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.cl;
+package org.apache.felix.scrplugin.tags.cl;
import java.util.HashMap;
import java.util.Map;
-import org.apache.felix.sandbox.scrplugin.Constants;
-import org.apache.felix.sandbox.scrplugin.om.Reference;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaField;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.Constants;
+import org.apache.felix.scrplugin.om.Reference;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaField;
+import org.apache.felix.scrplugin.tags.JavaTag;
/**
* <code>ClassLoaderJavaTag.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
index 7cfd8a4..cf569c9 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.qdox;
+package org.apache.felix.scrplugin.tags.qdox;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescriptorManager;
-import org.apache.felix.sandbox.scrplugin.tags.JavaField;
-import org.apache.felix.sandbox.scrplugin.tags.JavaMethod;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaClassDescriptorManager;
+import org.apache.felix.scrplugin.tags.JavaField;
+import org.apache.felix.scrplugin.tags.JavaMethod;
+import org.apache.felix.scrplugin.tags.JavaTag;
import org.apache.maven.plugin.MojoExecutionException;
import com.thoughtworks.qdox.model.DocletTag;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
index ad083b1..55090e9 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.qdox;
+package org.apache.felix.scrplugin.tags.qdox;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaField;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaField;
+import org.apache.felix.scrplugin.tags.JavaTag;
import com.thoughtworks.qdox.model.DocletTag;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
index 9485381..2c6f16c 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.qdox;
+package org.apache.felix.scrplugin.tags.qdox;
-import org.apache.felix.sandbox.scrplugin.tags.JavaMethod;
-import org.apache.felix.sandbox.scrplugin.tags.JavaParameter;
+import org.apache.felix.scrplugin.tags.JavaMethod;
+import org.apache.felix.scrplugin.tags.JavaParameter;
/**
* <code>QDoxJavaMethod.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
index e355dc7..9603b6a 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.qdox;
+package org.apache.felix.scrplugin.tags.qdox;
-import org.apache.felix.sandbox.scrplugin.tags.JavaParameter;
+import org.apache.felix.scrplugin.tags.JavaParameter;
/**
* <code>QDoxJavaParameter.java</code>...
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
index 20f08bb..144719e 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.tags.qdox;
+package org.apache.felix.scrplugin.tags.qdox;
import java.util.Map;
-import org.apache.felix.sandbox.scrplugin.tags.JavaClassDescription;
-import org.apache.felix.sandbox.scrplugin.tags.JavaField;
-import org.apache.felix.sandbox.scrplugin.tags.JavaTag;
+import org.apache.felix.scrplugin.tags.JavaClassDescription;
+import org.apache.felix.scrplugin.tags.JavaField;
+import org.apache.felix.scrplugin.tags.JavaTag;
import com.thoughtworks.qdox.model.DocletTag;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
index 113292d..61ca81d 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.xml;
+package org.apache.felix.scrplugin.xml;
import java.io.File;
import java.io.FileReader;
@@ -35,13 +35,13 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.felix.sandbox.scrplugin.om.Component;
-import org.apache.felix.sandbox.scrplugin.om.Components;
-import org.apache.felix.sandbox.scrplugin.om.Implementation;
-import org.apache.felix.sandbox.scrplugin.om.Interface;
-import org.apache.felix.sandbox.scrplugin.om.Property;
-import org.apache.felix.sandbox.scrplugin.om.Reference;
-import org.apache.felix.sandbox.scrplugin.om.Service;
+import org.apache.felix.scrplugin.om.Component;
+import org.apache.felix.scrplugin.om.Components;
+import org.apache.felix.scrplugin.om.Implementation;
+import org.apache.felix.scrplugin.om.Interface;
+import org.apache.felix.scrplugin.om.Property;
+import org.apache.felix.scrplugin.om.Reference;
+import org.apache.felix.scrplugin.om.Service;
import org.apache.maven.plugin.MojoExecutionException;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
diff --git a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
index 02bb4e7..c033b94 100644
--- a/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
+++ b/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.scrplugin.xml;
+package org.apache.felix.scrplugin.xml;
import java.io.File;
import java.io.FileWriter;
@@ -32,11 +32,11 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.felix.sandbox.scrplugin.om.metatype.AttributeDefinition;
-import org.apache.felix.sandbox.scrplugin.om.metatype.Designate;
-import org.apache.felix.sandbox.scrplugin.om.metatype.MTObject;
-import org.apache.felix.sandbox.scrplugin.om.metatype.MetaData;
-import org.apache.felix.sandbox.scrplugin.om.metatype.OCD;
+import org.apache.felix.scrplugin.om.metatype.AttributeDefinition;
+import org.apache.felix.scrplugin.om.metatype.Designate;
+import org.apache.felix.scrplugin.om.metatype.MTObject;
+import org.apache.felix.scrplugin.om.metatype.MetaData;
+import org.apache.felix.scrplugin.om.metatype.OCD;
import org.apache.maven.plugin.MojoExecutionException;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;