You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2007/08/20 09:33:22 UTC
svn commit: r567579 - in
/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix: sandbox/
scrplugin/ scrplugin/om/ scrplugin/om/metatype/ scrplugin/tags/
scrplugin/tags/cl/ scrplugin/tags/qdox/ scrplugin/xml/
Author: cziegeler
Date: Mon Aug 20 00:33:20 2007
New Revision: 567579
URL: http://svn.apache.org/viewvc?rev=567579&view=rev
Log:
Remove sandbox from package name
Removed:
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/
Modified:
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java Mon Aug 20 00:33:20 2007
@@ -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));
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java Mon Aug 20 00:33:20 2007
@@ -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>
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java Mon Aug 20 00:33:20 2007
@@ -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;
/**
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java Mon Aug 20 00:33:20 2007
@@ -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;
/**
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java Mon Aug 20 00:33:20 2007
@@ -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 {
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java Mon Aug 20 00:33:20 2007
@@ -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 {
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptorManager.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java Mon Aug 20 00:33:20 2007
@@ -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;
/**
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java Mon Aug 20 00:33:20 2007
@@ -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>...
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java Mon Aug 20 00:33:20 2007
@@ -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;
Modified: felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
URL: http://svn.apache.org/viewvc/felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java?rev=567579&r1=567578&r2=567579&view=diff
==============================================================================
--- felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java (original)
+++ felix/trunk/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java Mon Aug 20 00:33:20 2007
@@ -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;