You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2009/04/18 20:31:43 UTC
svn commit: r766372 - in /felix/trunk: scr-annotations/
scr-annotations/src/main/java/org/apache/felix/scr/annotations/ scrplugin/
scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/
Author: cziegeler
Date: Sat Apr 18 18:31:43 2009
New Revision: 766372
URL: http://svn.apache.org/viewvc?rev=766372&view=rev
Log:
FELIX-1010 : Rename annotations to scr annotations.
Modified:
felix/trunk/scr-annotations/ (props changed)
felix/trunk/scr-annotations/pom.xml
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
felix/trunk/scrplugin/pom.xml
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
Propchange: felix/trunk/scr-annotations/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 18 18:31:43 2009
@@ -0,0 +1 @@
+target
Modified: felix/trunk/scr-annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/pom.xml?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/pom.xml (original)
+++ felix/trunk/scr-annotations/pom.xml Sat Apr 18 18:31:43 2009
@@ -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>
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java Sat Apr 18 18:31:43 2009
@@ -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
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java Sat Apr 18 18:31:43 2009
@@ -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.*;
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java Sat Apr 18 18:31:43 2009
@@ -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.*;
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java Sat Apr 18 18:31:43 2009
@@ -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.*;
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java Sat Apr 18 18:31:43 2009
@@ -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.*;
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java Sat Apr 18 18:31:43 2009
@@ -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.*;
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java Sat Apr 18 18:31:43 2009
@@ -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.
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java Sat Apr 18 18:31:43 2009
@@ -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.
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java Sat Apr 18 18:31:43 2009
@@ -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.*;
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java Sat Apr 18 18:31:43 2009
@@ -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.*;
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java Sat Apr 18 18:31:43 2009
@@ -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.*;
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java Sat Apr 18 18:31:43 2009
@@ -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;
Modified: felix/trunk/scrplugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/pom.xml?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scrplugin/pom.xml (original)
+++ felix/trunk/scrplugin/pom.xml Sat Apr 18 18:31:43 2009
@@ -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>
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java Sat Apr 18 18:31:43 2009
@@ -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;
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java Sat Apr 18 18:31:43 2009
@@ -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;
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java Sat Apr 18 18:31:43 2009
@@ -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;
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java Sat Apr 18 18:31:43 2009
@@ -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;
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java?rev=766372&r1=766371&r2=766372&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java Sat Apr 18 18:31:43 2009
@@ -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;