felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r760530 - in /felix/trunk: ./ scrplugin-annotations/ scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ scrplugin/
Date Tue, 31 Mar 2009 17:18:17 GMT
Author: cziegeler
Date: Tue Mar 31 17:18:17 2009
New Revision: 760530

URL: http://svn.apache.org/viewvc?rev=760530&view=rev
Log:
FELIX-1010 : Add annotations to the build, change version and make the retention policy to
be source (we don't want the annotations in the compiled classes)

Modified:
    felix/trunk/pom.xml
    felix/trunk/scrplugin-annotations/pom.xml
    felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
    felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java
    felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
    felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java
    felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
    felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java
    felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
    felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java
    felix/trunk/scrplugin/pom.xml

Modified: felix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/pom.xml?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/pom.xml (original)
+++ felix/trunk/pom.xml Tue Mar 31 17:18:17 2009
@@ -66,6 +66,7 @@
       <modules>
         <module>maven-obr-plugin</module>
         <module>bundleplugin</module>
+        <module>scrplugin-annotations</module>
         <module>scrplugin</module>
         <module>tools/maven2/maven-osgi-plugin</module>
 <!--        <module>tools/maven2/maven-felix-plugin</module> -->

Modified: felix/trunk/scrplugin-annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/pom.xml?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/pom.xml (original)
+++ felix/trunk/scrplugin-annotations/pom.xml Tue Mar 31 17:18:17 2009
@@ -23,12 +23,13 @@
 		<artifactId>felix</artifactId>
 		<groupId>org.apache.felix</groupId>
 		<version>1.0.4</version>
+		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 	
 	<groupId>org.apache.felix</groupId>
 	<artifactId>maven-scr-plugin-annotations</artifactId>
 
-	<version>1.0.11-SNAPSHOT</version>
+	<version>0.9.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Annotations for Maven SCR Plugin</name>

Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
(original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
Tue Mar 31 17:18:17 2009
@@ -18,10 +18,7 @@
  */
 package org.apache.felix.scrplugin.annotations;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * The <code>Component</code> annotation is the only required annotation. If
@@ -37,7 +34,7 @@
  * </p>
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
 public @interface Component {
 
     /**

Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java
(original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java
Tue Mar 31 17:18:17 2009
@@ -18,17 +18,13 @@
  */
 package org.apache.felix.scrplugin.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Allows to define multiple {@link Property} annotations for one type.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
 @Documented
 public @interface Properties {
 

Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
(original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
Tue Mar 31 17:18:17 2009
@@ -18,11 +18,7 @@
  */
 package org.apache.felix.scrplugin.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * The <code>Property</code> annotation defines properties which are made
@@ -37,7 +33,7 @@
  * OSGi Service Platform Service Compendium Specification for more information.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
 @Documented
 public @interface Property {
 

Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java
(original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java
Tue Mar 31 17:18:17 2009
@@ -18,17 +18,13 @@
  */
 package org.apache.felix.scrplugin.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Defines a {@link Property} option.
  */
 @Target(ElementType.ANNOTATION_TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
 @Documented
 public @interface PropertyOption {
 

Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
(original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
Tue Mar 31 17:18:17 2009
@@ -18,11 +18,7 @@
  */
 package org.apache.felix.scrplugin.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * The <code>Reference</code> annotation defines references to other services
@@ -37,7 +33,7 @@
  * Service Platform Service Compendium Specification for more information.
  */
 @Target( { ElementType.TYPE, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
 @Documented
 public @interface Reference {
 

Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java
(original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java
Tue Mar 31 17:18:17 2009
@@ -18,17 +18,13 @@
  */
 package org.apache.felix.scrplugin.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Allows to define multiple {@link Reference} annotations for one type.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
 @Documented
 public @interface References {
 

Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
(original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
Tue Mar 31 17:18:17 2009
@@ -18,11 +18,7 @@
  */
 package org.apache.felix.scrplugin.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * The <code>Service</code> annotation defines whether and which service
@@ -34,7 +30,7 @@
  * information.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
 @Documented
 public @interface Service {
 

Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java
(original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java
Tue Mar 31 17:18:17 2009
@@ -18,17 +18,13 @@
  */
 package org.apache.felix.scrplugin.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Allows to define multiple {@link Service} annotations for one type.
  */
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.SOURCE)
 @Documented
 public @interface Services {
 

Modified: felix/trunk/scrplugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/pom.xml?rev=760530&r1=760529&r2=760530&view=diff
==============================================================================
--- felix/trunk/scrplugin/pom.xml (original)
+++ felix/trunk/scrplugin/pom.xml Tue Mar 31 17:18:17 2009
@@ -23,12 +23,13 @@
         <artifactId>felix</artifactId>
         <groupId>org.apache.felix</groupId>
         <version>1.0.4</version>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.felix</groupId>
     <artifactId>maven-scr-plugin</artifactId>
 
-	<version>1.0.11-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>Maven SCR Plugin</name>
@@ -101,7 +102,7 @@
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>maven-scr-plugin-annotations</artifactId>
-			<version>1.0.11-SNAPSHOT</version>
+			<version>0.9.0-SNAPSHOT</version>
 		</dependency>
 		
 	</dependencies>



Mime
View raw message