commit e9bc26ffd8e88f3cb13edb632380e8c07a5fd587
author Carsten Ziegeler <cziegeler@apache.org> Tue Aug 11 11:47:36 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Tue Aug 11 11:47:36 2015 +0000
tree 6e6b5c96aa6c5611f3eb6a923f94e99344ccf76d
parent 1f7f4308d4cd6447ccdd5ae4d97911897d2a98ee

Move scr tooling to tools

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1695273 13f79535-47bb-0310-9956-ffa450edef68

tools/scrplugin/annotations/changelog.txt

diff --git a/scrplugin/annotations/changelog.txt b/tools/scrplugin/annotations/changelog.txt
similarity index 100%
rename from scrplugin/annotations/changelog.txt
rename to tools/scrplugin/annotations/changelog.txt

tools/scrplugin/annotations/pom.xml

diff --git a/scrplugin/annotations/pom.xml b/tools/scrplugin/annotations/pom.xml
similarity index 100%
rename from scrplugin/annotations/pom.xml
rename to tools/scrplugin/annotations/pom.xml

tools/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES

diff --git a/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES b/tools/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 100%
rename from scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES
rename to tools/scrplugin/annotations/src/main/appended-resources/META-INF/DEPENDENCIES

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicyOption.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicyOption.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicyOption.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicyOption.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicyOption.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java

tools/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java

diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java b/tools/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java
similarity index 100%
rename from scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java
rename to tools/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java

tools/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor

diff --git a/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor b/tools/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
similarity index 100%
rename from scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
rename to tools/scrplugin/annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor

tools/scrplugin/bnd-scr-plugin/changelog.txt

diff --git a/scrplugin/bnd-scr-plugin/changelog.txt b/tools/scrplugin/bnd-scr-plugin/changelog.txt
similarity index 100%
rename from scrplugin/bnd-scr-plugin/changelog.txt
rename to tools/scrplugin/bnd-scr-plugin/changelog.txt

tools/scrplugin/bnd-scr-plugin/pom.xml

diff --git a/scrplugin/bnd-scr-plugin/pom.xml b/tools/scrplugin/bnd-scr-plugin/pom.xml
similarity index 100%
rename from scrplugin/bnd-scr-plugin/pom.xml
rename to tools/scrplugin/bnd-scr-plugin/pom.xml

tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES

diff --git a/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES b/tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 100%
rename from scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES
rename to tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES

tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/LICENSE

diff --git a/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/LICENSE b/tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/LICENSE
rename to tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/LICENSE

tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/NOTICE

diff --git a/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/NOTICE b/tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/NOTICE
rename to tools/scrplugin/bnd-scr-plugin/src/main/appended-resources/META-INF/NOTICE

tools/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/BndLog.java

diff --git a/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/BndLog.java b/tools/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/BndLog.java
similarity index 100%
rename from scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/BndLog.java
rename to tools/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/BndLog.java

tools/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java

diff --git a/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java b/tools/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
similarity index 100%
rename from scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
rename to tools/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java

tools/scrplugin/ds-annotations/changelog.txt

diff --git a/scrplugin/ds-annotations/changelog.txt b/tools/scrplugin/ds-annotations/changelog.txt
similarity index 100%
rename from scrplugin/ds-annotations/changelog.txt
rename to tools/scrplugin/ds-annotations/changelog.txt

tools/scrplugin/ds-annotations/pom.xml

diff --git a/scrplugin/ds-annotations/pom.xml b/tools/scrplugin/ds-annotations/pom.xml
similarity index 100%
rename from scrplugin/ds-annotations/pom.xml
rename to tools/scrplugin/ds-annotations/pom.xml

tools/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES

diff --git a/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES b/tools/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 100%
rename from scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES
rename to tools/scrplugin/ds-annotations/src/main/appended-resources/META-INF/DEPENDENCIES

tools/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java

diff --git a/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java b/tools/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java
similarity index 100%
rename from scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java
rename to tools/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java

tools/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor

diff --git a/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor b/tools/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
similarity index 100%
rename from scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor
rename to tools/scrplugin/ds-annotations/src/main/resources/META-INF/services/org.apache.felix.scrplugin.annotations.AnnotationProcessor

tools/scrplugin/generator/changelog.txt

diff --git a/scrplugin/generator/changelog.txt b/tools/scrplugin/generator/changelog.txt
similarity index 100%
rename from scrplugin/generator/changelog.txt
rename to tools/scrplugin/generator/changelog.txt

tools/scrplugin/generator/pom.xml

diff --git a/scrplugin/generator/pom.xml b/tools/scrplugin/generator/pom.xml
similarity index 100%
rename from scrplugin/generator/pom.xml
rename to tools/scrplugin/generator/pom.xml

tools/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES

diff --git a/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES b/tools/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 100%
rename from scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES
rename to tools/scrplugin/generator/src/main/appended-resources/META-INF/DEPENDENCIES

tools/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE

diff --git a/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE b/tools/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from scrplugin/generator/src/main/appended-resources/META-INF/LICENSE
rename to tools/scrplugin/generator/src/main/appended-resources/META-INF/LICENSE

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Options.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Options.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Options.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Options.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Options.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Project.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Project.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Project.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Project.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Project.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Result.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Result.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Result.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Result.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Result.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Source.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Source.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Source.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Source.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Source.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SpecVersion.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SpecVersion.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SpecVersion.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SpecVersion.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SpecVersion.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/AnnotationProcessor.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/AnnotationProcessor.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/AnnotationProcessor.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/AnnotationProcessor.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/AnnotationProcessor.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ClassAnnotation.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ClassAnnotation.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ClassAnnotation.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ClassAnnotation.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ClassAnnotation.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/FieldAnnotation.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/FieldAnnotation.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/FieldAnnotation.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/FieldAnnotation.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/FieldAnnotation.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/MethodAnnotation.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/MethodAnnotation.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/MethodAnnotation.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/MethodAnnotation.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/MethodAnnotation.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedAnnotation.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedAnnotation.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedAnnotation.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedAnnotation.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedAnnotation.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedClass.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedClass.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedClass.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedClass.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/annotations/ScannedClass.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/AbstractDescription.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/AbstractDescription.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/AbstractDescription.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/AbstractDescription.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/AbstractDescription.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ClassDescription.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ClassDescription.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ClassDescription.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ClassDescription.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ClassDescription.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentConfigurationPolicy.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentConfigurationPolicy.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentConfigurationPolicy.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentConfigurationPolicy.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentConfigurationPolicy.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyDescription.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyDescription.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyDescription.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyDescription.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyDescription.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyUnbounded.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyUnbounded.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyUnbounded.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyUnbounded.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyUnbounded.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceCardinality.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceCardinality.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceCardinality.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceCardinality.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceCardinality.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceDescription.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceDescription.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceDescription.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceDescription.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceDescription.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicy.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicy.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicy.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicy.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicy.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicyOption.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicyOption.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicyOption.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicyOption.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferencePolicyOption.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceStrategy.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceStrategy.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceStrategy.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceStrategy.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ReferenceStrategy.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ServiceDescription.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ServiceDescription.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ServiceDescription.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ServiceDescription.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/ServiceDescription.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/AnnotationProcessorManager.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/AnnotationProcessorManager.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/AnnotationProcessorManager.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/AnnotationProcessorManager.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/AnnotationProcessorManager.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassModifier.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassModifier.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassModifier.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassModifier.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassModifier.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainer.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainer.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainer.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainer.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainer.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainerUtil.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainerUtil.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainerUtil.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainerUtil.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ComponentContainerUtil.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/DescriptionContainer.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/DescriptionContainer.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/DescriptionContainer.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/DescriptionContainer.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/DescriptionContainer.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeAttributeDefinition.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeAttributeDefinition.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeAttributeDefinition.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeAttributeDefinition.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeAttributeDefinition.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeContainer.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeContainer.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeContainer.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeContainer.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/MetatypeContainer.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java

tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java

diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java b/tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
similarity index 100%
rename from scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
rename to tools/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java

tools/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SCRDescriptorGeneratorTest.java

diff --git a/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SCRDescriptorGeneratorTest.java b/tools/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SCRDescriptorGeneratorTest.java
similarity index 100%
rename from scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SCRDescriptorGeneratorTest.java
rename to tools/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SCRDescriptorGeneratorTest.java

tools/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SourceImpl.java

diff --git a/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SourceImpl.java b/tools/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SourceImpl.java
similarity index 100%
rename from scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SourceImpl.java
rename to tools/scrplugin/generator/src/test/java/org/apache/felix/scrplugin/SourceImpl.java

tools/scrplugin/generator/src/test/java/testComponents/ComponentWithClassReferenceAndMissingInterface.java

diff --git a/scrplugin/generator/src/test/java/testComponents/ComponentWithClassReferenceAndMissingInterface.java b/tools/scrplugin/generator/src/test/java/testComponents/ComponentWithClassReferenceAndMissingInterface.java
similarity index 100%
rename from scrplugin/generator/src/test/java/testComponents/ComponentWithClassReferenceAndMissingInterface.java
rename to tools/scrplugin/generator/src/test/java/testComponents/ComponentWithClassReferenceAndMissingInterface.java

tools/scrplugin/generator/src/test/java/testComponents/SimpleComponent.java

diff --git a/scrplugin/generator/src/test/java/testComponents/SimpleComponent.java b/tools/scrplugin/generator/src/test/java/testComponents/SimpleComponent.java
similarity index 100%
rename from scrplugin/generator/src/test/java/testComponents/SimpleComponent.java
rename to tools/scrplugin/generator/src/test/java/testComponents/SimpleComponent.java

tools/scrplugin/maven-scr-plugin/changelog.txt

diff --git a/scrplugin/maven-scr-plugin/changelog.txt b/tools/scrplugin/maven-scr-plugin/changelog.txt
similarity index 100%
rename from scrplugin/maven-scr-plugin/changelog.txt
rename to tools/scrplugin/maven-scr-plugin/changelog.txt

tools/scrplugin/maven-scr-plugin/pom.xml

diff --git a/scrplugin/maven-scr-plugin/pom.xml b/tools/scrplugin/maven-scr-plugin/pom.xml
similarity index 100%
rename from scrplugin/maven-scr-plugin/pom.xml
rename to tools/scrplugin/maven-scr-plugin/pom.xml

tools/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml

diff --git a/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml b/tools/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
rename to tools/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml

tools/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java

diff --git a/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java b/tools/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
rename to tools/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java

tools/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml

diff --git a/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml b/tools/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
rename to tools/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml

tools/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java

diff --git a/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java b/tools/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
rename to tools/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java

tools/scrplugin/maven-scr-plugin/src/it/settings.xml

diff --git a/scrplugin/maven-scr-plugin/src/it/settings.xml b/tools/scrplugin/maven-scr-plugin/src/it/settings.xml
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/it/settings.xml
rename to tools/scrplugin/maven-scr-plugin/src/it/settings.xml

tools/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES

diff --git a/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES b/tools/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES
rename to tools/scrplugin/maven-scr-plugin/src/main/appended-resources/META-INF/DEPENDENCIES

tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java

diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java b/tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java
rename to tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java

tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenProjectScanner.java

diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenProjectScanner.java b/tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenProjectScanner.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenProjectScanner.java
rename to tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenProjectScanner.java

tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java

diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java b/tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
rename to tools/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java

tools/scrplugin/maven-scr-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml

diff --git a/scrplugin/maven-scr-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/tools/scrplugin/maven-scr-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
rename to tools/scrplugin/maven-scr-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml

tools/scrplugin/pom.xml

diff --git a/scrplugin/pom.xml b/tools/scrplugin/pom.xml
similarity index 100%
rename from scrplugin/pom.xml
rename to tools/scrplugin/pom.xml

tools/scrplugin/scrtask/changelog.txt

diff --git a/scrplugin/scrtask/changelog.txt b/tools/scrplugin/scrtask/changelog.txt
similarity index 100%
rename from scrplugin/scrtask/changelog.txt
rename to tools/scrplugin/scrtask/changelog.txt

tools/scrplugin/scrtask/pom.xml

diff --git a/scrplugin/scrtask/pom.xml b/tools/scrplugin/scrtask/pom.xml
similarity index 100%
rename from scrplugin/scrtask/pom.xml
rename to tools/scrplugin/scrtask/pom.xml

tools/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES

diff --git a/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES b/tools/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 100%
rename from scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES
rename to tools/scrplugin/scrtask/src/main/appended-resources/META-INF/DEPENDENCIES

tools/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE

diff --git a/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE b/tools/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE
rename to tools/scrplugin/scrtask/src/main/appended-resources/META-INF/LICENSE

tools/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE

diff --git a/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE b/tools/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE
rename to tools/scrplugin/scrtask/src/main/appended-resources/META-INF/NOTICE

tools/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java

diff --git a/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java b/tools/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java
similarity index 100%
rename from scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java
rename to tools/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java

tools/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java

diff --git a/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java b/tools/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
similarity index 100%
rename from scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
rename to tools/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java

tools/scrplugin/scrtask/src/main/resources/scrtask.properties

diff --git a/scrplugin/scrtask/src/main/resources/scrtask.properties b/tools/scrplugin/scrtask/src/main/resources/scrtask.properties
similarity index 100%
rename from scrplugin/scrtask/src/main/resources/scrtask.properties
rename to tools/scrplugin/scrtask/src/main/resources/scrtask.properties