FELIX-2669 move scr.annotations to scrplugin/annotations and reorder sources amongst the new modules
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1025937 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr-annotations/LICENSE b/scrplugin/annotations/LICENSE
similarity index 100%
rename from scr-annotations/LICENSE
rename to scrplugin/annotations/LICENSE
diff --git a/scr-annotations/NOTICE b/scrplugin/annotations/NOTICE
similarity index 100%
rename from scr-annotations/NOTICE
rename to scrplugin/annotations/NOTICE
diff --git a/scr-annotations/pom.xml b/scrplugin/annotations/pom.xml
similarity index 100%
rename from scr-annotations/pom.xml
rename to scrplugin/annotations/pom.xml
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/package-info.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/package-info.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/package-info.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/package-info.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingAnnotationTagProvider.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingAnnotationTagProvider.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingAnnotationTagProvider.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingAnnotationTagProvider.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
rename to scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
diff --git a/scrplugin/generator/pom.xml b/scrplugin/generator/pom.xml
new file mode 100644
index 0000000..bb439c6
--- /dev/null
+++ b/scrplugin/generator/pom.xml
@@ -0,0 +1,100 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>felix-parent</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <version>1.2.0</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.generator</artifactId>
+
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Descriptor Generator Implementation</name>
+ <description>
+ Provides the implementation to generate Declarative Services and Metatype
+ Service descriptors from Java 5 Annotations and/or JavaDoc tags.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin/generator</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin/generator</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/scrplugin/generator</url>
+ </scm>
+
+ <dependencies>
+ <!-- JavaDoc Tags -->
+ <dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>1.12</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- SCR Annotations -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.3.1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- bind/unbind method generation -->
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>3.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- OSGi APIs (some constant references used only) -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- JDK 1.5 needed for annotation support -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Constants.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Constants.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Log.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Log.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/Log.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Component.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Component.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Components.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Components.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Interface.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Interface.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Property.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Property.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Reference.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Reference.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Service.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/Service.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/ClassUtil.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/ClassUtil.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/ClassUtil.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/ClassUtil.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptionInheritanceComparator.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptionInheritanceComparator.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptionInheritanceComparator.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptionInheritanceComparator.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/ModifiableJavaClassDescription.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/ModifiableJavaClassDescription.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/ModifiableJavaClassDescription.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/ModifiableJavaClassDescription.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AbstractTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AbstractTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaField.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaField.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaField.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaField.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProvider.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProvider.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProvider.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProvider.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
similarity index 93%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
index b0f4e76..052709f 100644
--- a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
@@ -24,8 +24,6 @@
import org.apache.felix.scrplugin.SCRDescriptorFailureException;
import org.apache.felix.scrplugin.tags.JavaField;
import org.apache.felix.scrplugin.tags.JavaTag;
-import org.apache.felix.scrplugin.tags.annotation.defaulttag.DefaultAnnotationTagProvider;
-import org.apache.felix.scrplugin.tags.annotation.sling.SlingAnnotationTagProvider;
import com.thoughtworks.qdox.model.Annotation;
import com.thoughtworks.qdox.model.JavaClass;
@@ -52,8 +50,8 @@
public AnnotationTagProviderManager(String[] annotationTagProviderClasses) throws SCRDescriptorFailureException {
// always add provider supporting built-in SCR default properties
- annotationTagProviders.add(new DefaultAnnotationTagProvider());
- annotationTagProviders.add(new SlingAnnotationTagProvider());
+// TODO: annotationTagProviders.add(new DefaultAnnotationTagProvider());
+// TODO: annotationTagProviders.add(new SlingAnnotationTagProvider());
// add custom providers defined in pom
for (int i = 0; i < annotationTagProviderClasses.length; i++) {
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/Util.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/Util.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/package-info.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/package-info.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/package-info.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/package-info.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaField.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaField.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaField.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaField.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
rename to scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
diff --git a/scrplugin/maven-scr-plugin/pom.xml b/scrplugin/maven-scr-plugin/pom.xml
index 0ea3fdf..6bb2216 100644
--- a/scrplugin/maven-scr-plugin/pom.xml
+++ b/scrplugin/maven-scr-plugin/pom.xml
@@ -29,21 +29,21 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.5-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <version>1.4.5-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
- <name>Maven SCR Plugin</name>
- <description>
- Maven plugin for generating OSGi service descriptors based on annotations.
- </description>
+ <name>Maven SCR Plugin</name>
+ <description>
+ Maven plugin for generating OSGi service descriptors based on annotations.
+ </description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin</connection>
- <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin</developerConnection>
- <url>http://svn.apache.org/repos/asf/felix/scrplugin</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin/maven-scr-plugin</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin/maven-scr-plugin</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/scrplugin/maven-scr-plugin</url>
+ </scm>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -55,84 +55,11 @@
<version>2.2</version>
</dependency>
- <!-- Ant Task Implementation -->
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.0</version>
- <scope>provided</scope>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.generator</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
-
- <!-- JavaDoc Tags -->
- <dependency>
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.12</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- SCR Annotations -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- bind/unbind method generation -->
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>3.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- OSGi APIs (some constant references used only) -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <!-- unpack qdox, asm and annotations into bundle package -->
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeArtifactIds>
- qdox,asm-all,org.apache.felix.scr.annotations
- </includeArtifactIds>
- <outputDirectory>
- ${project.build.outputDirectory}
- </outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- JDK 1.5 needed for annotation support -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </dependencies>
</project>
diff --git a/scrplugin/pom.xml b/scrplugin/pom.xml
new file mode 100644
index 0000000..6e820a9
--- /dev/null
+++ b/scrplugin/pom.xml
@@ -0,0 +1,41 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <groupId>org.apache.felix</groupId>
+ <artifactId>scr-plugin-reactor</artifactId>
+ <version>1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Maven SCR Plugin/Task support reactor</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/scrplugin</url>
+ </scm>
+
+ <modules>
+ <module>generator</module>
+ <module>annotations</module>
+ <module>maven-scr-plugin</module>
+ <module>scrtask</module>
+ </modules>
+
+</project>
diff --git a/scrplugin/scrtask/pom.xml b/scrplugin/scrtask/pom.xml
new file mode 100644
index 0000000..c1b283b
--- /dev/null
+++ b/scrplugin/scrtask/pom.xml
@@ -0,0 +1,85 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>felix-parent</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <version>1.2.0</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.ant</artifactId>
+
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>SCR Ant Task</name>
+ <description>
+ Implements the Ant Task to generate Declarative Services and Metatype
+ Service descriptors from Java 5 annotations and/or JavaDoc tags.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin/scrtask</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin/scrtask</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/scrplugin/scrtask</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.generator</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- unpack qdox, asm and annotations into bundle package -->
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>
+ qdox,asm-all,org.apache.felix.scr.annotations
+ </includeArtifactIds>
+ <outputDirectory>
+ ${project.build.outputDirectory}
+ </outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/AntJavaClassDescriptorManager.java b/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntJavaClassDescriptorManager.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/AntJavaClassDescriptorManager.java
rename to scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntJavaClassDescriptorManager.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java b/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java
rename to scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java
diff --git a/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java b/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
rename to scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
diff --git a/scrplugin/maven-scr-plugin/src/main/resources/scrtask.properties b/scrplugin/scrtask/src/main/resources/scrtask.properties
similarity index 100%
rename from scrplugin/maven-scr-plugin/src/main/resources/scrtask.properties
rename to scrplugin/scrtask/src/main/resources/scrtask.properties