FELIX-1010 : Rename annotations to scr annotations.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@766372 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr-annotations/pom.xml b/scr-annotations/pom.xml
index 0deb634..d26196d 100644
--- a/scr-annotations/pom.xml
+++ b/scr-annotations/pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin-annotations</artifactId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
<version>0.9.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -38,9 +38,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin-annotations</connection>
- <developerConnection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/scrplugin-annotations</developerConnection>
- <url>http://svn.apache.org/repos/asf/felix/scrplugin-annotations</url>
+ <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>
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
index 125e56a..9ce6e73 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
/**
* Placeholder class for default value of annotation properties with
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
index 6be0f48..2829d4a 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
import java.lang.annotation.*;
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
index faac843..bad34d1 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
import java.lang.annotation.*;
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
index b2a2566..6fe4fe0 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
import java.lang.annotation.*;
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
index 2d4b4a1..6814cc4 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
import java.lang.annotation.*;
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
index 72e289b..423d86e 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
import java.lang.annotation.*;
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
index 7705d5e..93d18e5 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
/**
* Options for {@link Reference#cardinality()} property.
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
index 598e7e1..e476fa4 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
/**
* Options for {@link Reference#policy()} property.
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java
index e2d3079..97260cb 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
import java.lang.annotation.*;
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
index 800871b..9b206f8 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
import java.lang.annotation.*;
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
index e00f689..1b52f84 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
import java.lang.annotation.*;
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
index d48edb2..89b359c 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
@@ -18,7 +18,7 @@
*/
/**
* 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.
+ * The annotations are not interpreted in runtime.
*/
-package org.apache.felix.scrplugin.annotations;
+package org.apache.felix.scr.annotations;
diff --git a/scrplugin/pom.xml b/scrplugin/pom.xml
index a4247c4..18910d0 100644
--- a/scrplugin/pom.xml
+++ b/scrplugin/pom.xml
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin-annotations</artifactId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
<version>0.9.0-SNAPSHOT</version>
</dependency>
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
index 5817b69..4390a3a 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
@@ -21,8 +21,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scrplugin.Constants;
-import org.apache.felix.scrplugin.annotations.Component;
import org.apache.felix.scrplugin.tags.JavaClassDescription;
import com.thoughtworks.qdox.model.Annotation;
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
index 671a51b..df5fc0f 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.felix.scrplugin.annotations.*;
+import org.apache.felix.scr.annotations.*;
import org.apache.felix.scrplugin.tags.JavaField;
import org.apache.felix.scrplugin.tags.JavaTag;
import org.apache.felix.scrplugin.tags.annotation.AnnotationJavaClassDescription;
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
index 279a234..3888ab7 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
@@ -20,8 +20,8 @@
import java.util.*;
+import org.apache.felix.scr.annotations.*;
import org.apache.felix.scrplugin.Constants;
-import org.apache.felix.scrplugin.annotations.*;
import org.apache.felix.scrplugin.tags.JavaClassDescription;
import com.thoughtworks.qdox.model.Annotation;
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
index f7c67eb..a5509e0 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
@@ -21,8 +21,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.scr.annotations.*;
import org.apache.felix.scrplugin.Constants;
-import org.apache.felix.scrplugin.annotations.*;
import org.apache.felix.scrplugin.tags.JavaClassDescription;
import org.apache.felix.scrplugin.tags.JavaField;
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
index 512751f..0c7f8e9 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
@@ -21,9 +21,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.scr.annotations.AutoDetect;
+import org.apache.felix.scr.annotations.Service;
import org.apache.felix.scrplugin.Constants;
-import org.apache.felix.scrplugin.annotations.AutoDetect;
-import org.apache.felix.scrplugin.annotations.Service;
import org.apache.felix.scrplugin.tags.JavaClassDescription;
import com.thoughtworks.qdox.model.Annotation;