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/scrplugin/annotations/LICENSE b/scrplugin/annotations/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/scrplugin/annotations/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
diff --git a/scrplugin/annotations/NOTICE b/scrplugin/annotations/NOTICE
new file mode 100644
index 0000000..a3ad1f6
--- /dev/null
+++ b/scrplugin/annotations/NOTICE
@@ -0,0 +1,20 @@
+Apache Felix SCR Annotations
+Copyright 2007-2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/scrplugin/annotations/pom.xml b/scrplugin/annotations/pom.xml
new file mode 100644
index 0000000..3175aee
--- /dev/null
+++ b/scrplugin/annotations/pom.xml
@@ -0,0 +1,62 @@
+<!--
+ 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.annotations</artifactId>
+
+ <version>1.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Annotations for SCR</name>
+ <description>
+ Annotations for generating OSGi service descriptors.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scr-annotations</connection>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scr-annotations</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/scr-annotations</url>
+ </scm>
+
+ <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/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java
new file mode 100644
index 0000000..7d2dd29
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Activate.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * The <code>Activate</code> annotation defines the method which is used
+ * to activate the component.
+ * Please note that this annotation only marks the method name which is
+ * put into the configuration. The DS implementation will still use its
+ * search strategy to find the method based on the name.
+ */
+@Target( { ElementType.METHOD })
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface Activate {
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
new file mode 100644
index 0000000..9ce6e73
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+/**
+ * Placeholder class for default value of annotation properties with
+ * "auto detect" capabilities.
+ */
+public final class AutoDetect {
+
+ private AutoDetect() {
+ // disallows instancing this class
+ }
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
new file mode 100644
index 0000000..e67ba5c
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
@@ -0,0 +1,143 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * The <code>Component</code> annotation is the only required annotation. If
+ * this annotation is not declared in a Java class, the class is not declared as
+ * a component.
+ * <p>
+ * This annotation is used to declare the <component> element of the
+ * component declaration. See section 112.4.3, Component Element, in the OSGi
+ * Service Platform Service Compendium Specification for more information. The
+ * required <implementation> element is automatically generated with the
+ * fully qualified name of the class containing the <code>Component</code>
+ * annotation.
+ * </p>
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+public @interface Component {
+
+ /**
+ * Defines the Component name also used as the PID for the Configuration
+ * Admin Service. Default value: Fully qualified name of the Java class.
+ */
+ String name() default "";
+
+ /**
+ * This is generally used as a title for the object described by the meta
+ * type. This name may be localized by prepending a % sign to the name.
+ * Default value: %<name>.name
+ */
+ String label() default "";
+
+ /**
+ * This is generally used as a description for the object described by the
+ * meta type. This name may be localized by prepending a % sign to the name.
+ * Default value: %<name>.description
+ */
+ String description() default "";
+
+ /**
+ * Whether the component is enabled when the bundle starts.
+ */
+ boolean enabled() default true;
+
+ /**
+ * Whether the component is a factory component.
+ */
+ String factory() default "";
+
+ /**
+ * Whether the component is immediately activated.
+ */
+ boolean immediate() default false;
+
+ /**
+ * Whether any service, property and reference declarations from base
+ * classes should be inherited by this class.
+ */
+ boolean inherit() default true;
+
+ /**
+ * Whether Metatype Service data is generated or not. If this parameter is
+ * set to true Metatype Service data is generated in the
+ * <code>metatype.xml</code> file for this component. Otherwise no Metatype
+ * Service data is generated for this component.
+ */
+ boolean metatype() default false;
+
+ /**
+ * This marks an abstract service description which is not added to the
+ * descriptor but intended for reuse through inheritance. This attribute
+ * defaults to true for abstract classes and false for concrete classes.
+ */
+ boolean componentAbstract() default false;
+
+ /**
+ * Whether Declarative Services descriptor is generated or not. If this
+ * parameter is not set or set to true the Declarative Services descriptor
+ * is generated in the service descriptor file for this component. Otherwise
+ * no Declarative Services descriptor is generated for this component.
+ */
+ boolean ds() default true;
+
+ /**
+ * The version of the Declarative Services specification against which the
+ * component is written. Generally, the Maven SCR Plugin is able to
+ * automatically detect which specification version a Component is written
+ * against. There are some cases, though, where this is not easily or
+ * reliably possible. In these cases use this attribute to force the
+ * specification version.
+ * <p>
+ * Valid values currently are <code>1.0</code> and <code>1.1</code>. If
+ * an unsupported value is declared, a descriptor failure results.
+ *
+ * @since 1.0.1
+ */
+ String specVersion() default "1.0";
+
+ /**
+ * Generated <code>service.pid</code> property by default, if none declared
+ * explicitly.
+ */
+ boolean createPid() default true;
+
+ /**
+ * Set the metatype factory pid property (only for non factory components).
+ * @since 1.0
+ * @deprecated Use {@link #configurationFactory()}
+ */
+ boolean getConfigurationFactory() default false;
+
+ /**
+ * Set the metatype factory pid property (only for non factory components).
+ * @since 1.3
+ */
+ boolean configurationFactory() default false;
+
+ /**
+ * The configuration policy
+ * @since 1.0
+ */
+ ConfigurationPolicy policy() default ConfigurationPolicy.OPTIONAL;
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java
new file mode 100644
index 0000000..871cebe
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ConfigurationPolicy.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+/**
+ * Options for {@link Component#policy()} property.
+ */
+public enum ConfigurationPolicy {
+
+ /**
+ * If a configuration is available it will be used, if not the component
+ * will be activated anyway (this is the default).
+ */
+ OPTIONAL,
+
+ /**
+ * The configuration admin is not consulted for a configuration for this component.
+ */
+ IGNORE,
+
+ /**
+ * In order to activate this component a configuration is required.
+ */
+ REQUIRE;
+
+ /**
+ * @return String representation of policy
+ */
+ public String getPolicyString() {
+ return this.name().toLowerCase();
+ }
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java
new file mode 100644
index 0000000..e9d5a54
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Deactivate.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * The <code>Dectivate</code> annotation defines the method which is used
+ * to deactivate the component.
+ * Please note that this annotation only marks the method name which is
+ * put into the configuration. The DS implementation will still use its
+ * search strategy to find the method based on the name.
+ */
+@Target( { ElementType.METHOD })
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface Deactivate {
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java
new file mode 100644
index 0000000..9419c2a
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Modified.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * The <code>Modified</code> annotation defines the method which is used
+ * to update the component.
+ * Please note that this annotation only marks the method name which is
+ * put into the configuration. The DS implementation will still use its
+ * search strategy to find the method based on the name.
+ */
+@Target( { ElementType.METHOD })
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface Modified {
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
new file mode 100644
index 0000000..bad34d1
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Allows to define multiple {@link Property} annotations for one type.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface Properties {
+
+ /**
+ * List of {@link Property} annotations.
+ */
+ Property[] value();
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
new file mode 100644
index 0000000..348a73a
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * The <code>Property</code> annotation defines properties which are made
+ * available to the component through the ComponentContext.getProperties()
+ * method. These annotations are not strictly required but may be used by
+ * components to defined initial configuration. Additionally properties may be
+ * set here to identify the component if it is registered as a service, for
+ * example the service.description and service.vendor properties.
+ * <p>
+ * This tag is used to declare <property> elements of the component
+ * declaration. See section 112.4.5, Properties and Property Elements, in the
+ * OSGi Service Platform Service Compendium Specification for more information.
+ */
+@Target( { ElementType.TYPE, ElementType.FIELD })
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface Property {
+
+ /**
+ * The name of the property
+ */
+ String name() default "";
+
+ /**
+ * The label to display in a form to configure this property. This name may
+ * be localized by prepending a % sign to the name. Default value:
+ * %<name>.name
+ */
+ String label() default "";
+
+ /**
+ * A descriptive text to provide the client in a form to configure this
+ * property. This name may be localized by prepending a % sign to the name.
+ * Default value: %<name>.description
+ */
+ String description() default "";
+
+ /**
+ * The value(s) of the property. If the property type is not String, parsing
+ * of the value is done using the valueOf(String) method of the class
+ * defined by the property type.
+ * This attribute should not be used in combination with any of the other
+ * value attributes.
+ */
+ String[] value() default {};
+
+ /**
+ * The long value(s) of the property.
+ * This attribute should not be used in combination with any of the other
+ * value attributes or the type attribute.
+ */
+ long[] longValue() default {};
+
+ /**
+ * The double value(s) of the property.
+ * This attribute should not be used in combination with any of the other
+ * value attributes.
+ */
+ double[] doubleValue() default {};
+
+ /**
+ * The float value(s) of the property.
+ * This attribute should not be used in combination with any of the other
+ * value attributes or the type attribute.
+ */
+ float[] floatValue() default {};
+
+ /**
+ * The int value(s) of the property.
+ * This attribute should not be used in combination with any of the other
+ * value attributes or the type attribute.
+ */
+ int[] intValue() default {};
+
+ /**
+ * The byte value(s) of the property.
+ * This attribute should not be used in combination with any of the other
+ * value attributes or the type attribute.
+ */
+ byte[] byteValue() default {};
+
+ /**
+ * The char value(s) of the property.
+ * This attribute should not be used in combination with any of the other
+ * value attributes or the type attribute.
+ */
+ char[] charValue() default {};
+
+ /**
+ * The bool value(s) of the property.
+ * This attribute should not be used in combination with any of the other
+ * value attributes or the type attribute.
+ */
+ boolean[] boolValue() default {};
+
+ /**
+ * The short value(s) of the property.
+ * This attribute should not be used in combination with any of the other
+ * value attributes or the type attribute.
+ */
+ short[] shortValue() default {};
+
+ /**
+ * Defines the cardinality of the property and its collection type. If the
+ * cardinality is negative, the property is expected to be stored in a
+ * {@link java.util.Vector} (primitive types such as boolean are boxed in
+ * the Wrapper class), if the cardinality is positive, the property is
+ * stored in an array (primitve types are unboxed, that is Boolean type
+ * values are stored in boolean[]). The actual value defines the maximum
+ * number of elements in the vector or array. If the cardinality is
+ * zero, the property is a scalar value. If the defined value of the
+ * property is set in the value attribute, the cardinality defaults to 0
+ * (zero for scalar value). If the property is defined in one or more
+ * properties starting with values, the cardinality defaults to
+ * an unbounded array.
+ */
+ int cardinality() default 0;
+
+ /**
+ * This defines if the property is unbounded. The property can either be
+ * an unbounded array or vector. If this attribute is set to any other
+ * value than {@link PropertyUnbounded#DEFAULT},
+ * this overrides the {@link #cardinality()}.
+ * @since 1.4
+ */
+ PropertyUnbounded unbounded() default PropertyUnbounded.DEFAULT;
+
+ /**
+ * Boolean flag defining whether a metatype descriptor entry should be
+ * generated for this property or not. By default a metatype descriptor
+ * entry, i.e. an AD element, is generated except for the properties
+ * <code>service.pid</code>, <code>service.description</code>,
+ * <code>service.id</code>, <code>service.ranking</code>,
+ * <code>service.vendor</code>, <code>service.bundlelocation</code> and
+ * <code>service.factoryPid</code>. If a property should not be available
+ * for display in a configuration user interface, this parameter should be
+ * set to true.
+ */
+ boolean propertyPrivate() default false;
+
+ /**
+ * Some properties may only be set to a set of possible values. To support
+ * user interfaces which provide a selection list of values or a list of
+ * checkboxes the option values and labels may be defined as parameters to
+ * the {@link Property} annotation. All parameters in the form of name-value
+ * pairs are used to build the list of available value options. The
+ * parameter name is used as the value while the parameter value is used as
+ * the label in the user interface. This label may be prepended with a %
+ * sign to localize the string.
+ * <p>
+ * The options are written to the metatype.xml file as Option elements
+ * inside the AD element defining the property. The name of the parameter
+ * will be used for the Option.value attribute while the value of the
+ * parameter defines the Option.label attribute.
+ */
+ PropertyOption[] options() default {};
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
new file mode 100644
index 0000000..1dec2da
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Defines a {@link Property} option.
+ */
+@Property(options=@PropertyOption(name="you",value="something"))
+@Target(ElementType.ANNOTATION_TYPE)
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface PropertyOption {
+
+ /**
+ * Name of the option
+ */
+ String name();
+
+ /**
+ * Value of the option
+ */
+ String value();
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java
new file mode 100644
index 0000000..4dc01d9
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/PropertyUnbounded.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+/**
+ * Options for {@link Property#unbounded()} property.
+ * @since 1.4
+ */
+public enum PropertyUnbounded {
+
+ /** Property is not unbounded. This is the default. */
+ DEFAULT,
+
+ /** Property is an unbounded array. */
+ ARRAY,
+
+ /** Property is an unbounded vector. */
+ VECTOR
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
new file mode 100644
index 0000000..9db25db
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * The <code>Reference</code> annotation defines references to other services
+ * made available to the component by the Service Component Runtime.
+ * <p>
+ * This annotation may be declared for a Java Class or any Java Field to which
+ * it might apply. Depending on where the annotation is declared, the parameters
+ * may have different default values.
+ * <p>
+ * This annotation is used to declare <reference> elements of the
+ * component declaration. See section 112.4.7, Reference Element, in the OSGi
+ * Service Platform Service Compendium Specification for more information.
+ */
+@Target( { ElementType.TYPE, ElementType.FIELD })
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface Reference {
+
+ /**
+ * The local name of the reference. If the annotation is declared on class
+ * level, this parameter is required. If the tag is declared for a field,
+ * the default value for the name parameter is the name of the field.
+ */
+ String name() default "";
+
+ /**
+ * The name of the service interface. This name is used by the Service
+ * Component Runtime to access the service on behalf of the component. If
+ * the annotation is declared on class level, this parameter is required. If
+ * the annotation is declared for a field, the default value for the
+ * interface parameter is the type of the field.
+ */
+ Class<?> referenceInterface() default AutoDetect.class;
+
+ /**
+ * The cardinality of the service reference. This must be one of 0..1, 1..1,
+ * 0..n, and 1..n.
+ */
+ ReferenceCardinality cardinality() default ReferenceCardinality.MANDATORY_UNARY;
+
+ /**
+ * The dynamicity policy of the reference. If dynamic the service will be
+ * made available to the component as it comes and goes. If static the
+ * component will be deactivated and re-activated if the service comes
+ * and/or goes away.
+ */
+ ReferencePolicy policy() default ReferencePolicy.STATIC;
+
+ /**
+ * A service target filter to select specific services to be made available.
+ * In order to be able to overwrite the value of this value by a
+ * configuration property, this parameter must be declared. If the parameter
+ * is not declared, the respective declaration attribute will not be
+ * generated.
+ */
+ String target() default "";
+
+ /**
+ * The name of the method to be called when the service is to be bound to
+ * the component. The default value is the name created by appending the
+ * reference name to the string bind. The method must be declared
+ * <code>public</code> or <code>protected</code> and take single argument
+ * which is declared with the service interface type.
+ */
+ String bind() default "";
+
+ /**
+ * The name of the method to be called when the service is to be unbound
+ * from the component. The default value is the name created by appending
+ * the reference name to the string unbind. The method must be declared
+ * <code>public</code> or <code>protected</code> and take single argument
+ * which is declared with the service interface type.
+ */
+ String unbind() default "";
+
+ /**
+ * The name of the method to be called when the bound service updates its
+ * service registration properties. By default this is not set.
+ */
+ String updated() default "";
+
+ /**
+ * The reference strategy for the reference. This can either be
+ * {@link ReferenceStrategy#EVENT} in which case the bind and unbind
+ * methods are used or it can be {@link ReferenceStrategy#LOOKUP}
+ * in which case the reference is looked up through the
+ * component context.
+ */
+ ReferenceStrategy strategy() default ReferenceStrategy.EVENT;
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
new file mode 100644
index 0000000..93d18e5
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+/**
+ * Options for {@link Reference#cardinality()} property.
+ */
+public enum ReferenceCardinality {
+
+ /**
+ * Optional, unary reference: No service required to be available for the
+ * refernce to be satisfied. Only a single service is available through this
+ * reference.
+ */
+ OPTIONAL_UNARY("0..1"),
+
+ /**
+ * Mandatory, unary reference: At least one service must be available for
+ * the reference to be satisfied. Only a single service is available through
+ * this reference.
+ */
+ MANDATORY_UNARY("1..1"),
+
+ /**
+ * Optional, multiple reference: No service required to be available for the
+ * refernce to be satisfied. All matching services are available through
+ * this reference.
+ */
+ OPTIONAL_MULTIPLE("0..n"),
+
+ /**
+ * Mandatory, multiple reference: At least one service must be available for
+ * the reference to be satisified. All matching services are available
+ * through this reference.
+ */
+ MANDATORY_MULTIPLE("1..n");
+
+ private final String cardinalityString;
+
+ private ReferenceCardinality(final String cardinalityString) {
+ this.cardinalityString = cardinalityString;
+ }
+
+ /**
+ * @return String representation of cardinality
+ */
+ public String getCardinalityString() {
+ return this.cardinalityString;
+ }
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
new file mode 100644
index 0000000..e476fa4
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+/**
+ * Options for {@link Reference#policy()} property.
+ */
+public enum ReferencePolicy {
+
+ /**
+ * The component will be deactivated and re-activated if the service comes
+ * and/or goes away.
+ */
+ STATIC,
+
+ /**
+ * The service will be made available to the component as it comes and goes.
+ */
+ DYNAMIC;
+
+ /**
+ * @return String representation of policy
+ */
+ public String getPolicyString() {
+ return this.name().toLowerCase();
+ }
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java
new file mode 100644
index 0000000..4193781
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceStrategy.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+/**
+ * Options for {@link Reference#strategy()} property.
+ */
+public enum ReferenceStrategy {
+
+ EVENT,
+
+ LOOKUP;
+
+ /**
+ * @return String representation of the stragey
+ */
+ public String getStrategyString() {
+ return this.name().toLowerCase();
+ }
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java
new file mode 100644
index 0000000..97260cb
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/References.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Allows to define multiple {@link Reference} annotations for one type.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface References {
+
+ /**
+ * List of {@link Reference} annotations.
+ */
+ Reference[] value();
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
new file mode 100644
index 0000000..9b206f8
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * The <code>Service</code> annotation defines whether and which service
+ * interfaces are provided by the component.
+ * <p>
+ * This annotation is used to declare <service> and <provide>
+ * elements of the component declaration. See section 112.4.6, Service Elements,
+ * in the OSGi Service Platform Service Compendium Specification for more
+ * information.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface Service {
+
+ /**
+ * The class of the service interface provided by the component. If this
+ * property is not set provide elements will be generated for all interfaces
+ * generated by the class
+ */
+ Class<?> value() default AutoDetect.class;
+
+ /**
+ * Whether the component is registered as a
+ * <code>org.osgi.framework.ServiceFactory</code> or not.
+ */
+ boolean serviceFactory() default false;
+
+}
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
new file mode 100644
index 0000000..1b52f84
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Allows to define multiple {@link Service} annotations for one type.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface Services {
+
+ /**
+ * List of {@link Service} annotations.
+ */
+ Service[] value();
+
+}
diff --git a/scrplugin/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
new file mode 100644
index 0000000..89b359c
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+/**
+ * The scr goal of the maven-scr-plugin looks for the annotations defined in the package when building component descriptors.
+ * The annotations are not interpreted in runtime.
+ */
+package org.apache.felix.scr.annotations;
+
diff --git a/scrplugin/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
new file mode 100644
index 0000000..5cb4fc5
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilter.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations.sling;
+
+import java.lang.annotation.*;
+
+/**
+ * Marks servlet classes as SCR component, and allows to add a
+ * filter to Sling's processing.
+ * This annotation generates to private properties for the
+ * order and the scope.
+ * By default it also generates a component and a service tag,
+ * but this generation can be overriden.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface SlingFilter {
+
+ /**
+ * The order of the filter.
+ * This value is used to sort the filters. Filters with a lower order
+ * are executed before a filter with a higher order. If two filters
+ * have the same order, they are executed in an undefined order.
+ */
+ int order();
+
+ /**
+ * The scope of a filter.
+ * If the filter has request scope, it is run once for a request.
+ * If the filter has component scope, it is run once for every included
+ * component (rendering).
+ */
+ SlingFilterScope scope() default SlingFilterScope.REQUEST;
+
+ /**
+ * Whether to generate a default SCR component tag with. If
+ * set to false, a {@link org.apache.felix.scr.annotations.Component}
+ * annotation can be added manually with defined whatever configuration
+ * needed.
+ */
+ boolean generateComponent() default true;
+
+ /**
+ * Whether to generate a default SCR service tag with
+ * "interface=javax.servlet.Filter". If set to false, a
+ * {@link org.apache.felix.scr.annotations.Service} annotation can be added
+ * manually with defined whatever configuration needed.
+ */
+ boolean generateService() default true;
+
+ /**
+ * Defines the Component name also used as the PID for the Configuration
+ * Admin Service. Default value: Fully qualified name of the Java class.
+ */
+ String name() default "";
+
+ /**
+ * Whether Metatype Service data is generated or not. If this parameter is
+ * set to true Metatype Service data is generated in the
+ * <code>metatype.xml</code> file for this component. Otherwise no Metatype
+ * Service data is generated for this component.
+ */
+ boolean metatype() default false;
+
+ /**
+ * This is generally used as a title for the object described by the meta
+ * type. This name may be localized by prepending a % sign to the name.
+ * Default value: %<name>.name
+ */
+ String label() default "";
+
+ /**
+ * This is generally used as a description for the object described by the
+ * meta type. This name may be localized by prepending a % sign to the name.
+ * Default value: %<name>.description
+ */
+ String description() default "";
+}
diff --git a/scrplugin/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
new file mode 100644
index 0000000..72bed73
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingFilterScope.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr.annotations.sling;
+
+/**
+ * The possible scopes for the {@link SlingFilter#scope()} annotation.
+ */
+public enum SlingFilterScope {
+
+ REQUEST("request"),
+
+ COMPONENT("component");
+
+ private final String scope;
+
+ private SlingFilterScope(final String scope) {
+ this.scope = scope;
+ }
+
+ /**
+ * @return String representation of the scope
+ */
+ public String getScope() {
+ return this.scope;
+ }
+}
diff --git a/scrplugin/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
new file mode 100644
index 0000000..abd0b0b
--- /dev/null
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/sling/SlingServlet.java
@@ -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.
+ */
+package org.apache.felix.scr.annotations.sling;
+
+import java.lang.annotation.*;
+
+/**
+ * Marks servlet classes as SCR component, and allows to configure
+ * Sling's resource resolver mapping.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+@Documented
+public @interface SlingServlet {
+
+ /**
+ * Whether to generate a default SCR component tag. If
+ * set to false, a {@link org.apache.felix.scr.annotations.Component}
+ * annotation can be added manually with defined whatever configuration
+ * needed.
+ */
+ boolean generateComponent() default true;
+
+ /**
+ * Whether to generate a default SCR service tag with
+ * "interface=javax.servlet.Servlet". If set to false, a
+ * {@link org.apache.felix.scr.annotations.Service} annotation can be added
+ * manually with defined whatever configuration needed.
+ */
+ boolean generateService() default true;
+
+ /**
+ * One or more paths under which the servlet will be registered in the
+ * Sling Resource tree.
+ * <p>
+ * This attribute is converted to values for the
+ * <code>sling.servlet.paths</code> property.
+ * <p>
+ * Note that to be used as a servlet for Sling either this attribute or
+ * the {@link #resourceTypes()} attribute or both must be set.
+ */
+ String[] paths() default {};
+
+ /**
+ * One or more resource types which are handled by this servlet.
+ * <p>
+ * This attribute is converted to values for the
+ * <code>sling.servlet.resourceTypes</code> property.
+ * <p>
+ * Note that to be used as a servlet for Sling either this attribute or
+ * the {@link #paths()} attribute or both must be set.
+ */
+ String[] resourceTypes() default {};
+
+ /**
+ * One ore more request URL selectors supported by the servlet. The
+ * selectors must be configured as they would be specified in the URL that
+ * is as a list of dot-separated strings such as <em>print.a4</em>.
+ * <p>
+ * This attribute is converted to values for the
+ * <code>sling.servlet.selectors</code> property and is ignored if the
+ * {@link #resourceTypes()} attribute is not set.
+ */
+ String[] selectors() default {};
+
+ /**
+ * One or more request URL extensions supported by the servlet.
+ * <p>
+ * This attribute is converted to values for the
+ * <code>sling.servlet.extensions</code> property and is ignored if the
+ * {@link #resourceTypes()} attribute is not set.
+ */
+ String[] extensions() default {};
+
+ /**
+ * One or more request methods supported by the servlet.
+ * <p>
+ * This attribute is converted to values for the
+ * <code>sling.servlet.methods</code> property and is ignored if the
+ * {@link #resourceTypes()} attribute is not set.
+ */
+ String[] methods() default {};
+
+}
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