FELIX-4092 Move 'annotation' module from 'runtime' to 'manipulator' project
* Moved project
* Introduced some properties for version references
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1488558 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/annotations/changelog.txt b/ipojo/manipulator/annotations/changelog.txt
similarity index 100%
rename from ipojo/runtime/annotations/changelog.txt
rename to ipojo/manipulator/annotations/changelog.txt
diff --git a/ipojo/runtime/annotations/pom.xml b/ipojo/manipulator/annotations/pom.xml
similarity index 100%
rename from ipojo/runtime/annotations/pom.xml
rename to ipojo/manipulator/annotations/pom.xml
diff --git a/ipojo/runtime/annotations/src/main/appended-resources/NOTICE b/ipojo/manipulator/annotations/src/main/appended-resources/NOTICE
similarity index 100%
rename from ipojo/runtime/annotations/src/main/appended-resources/NOTICE
rename to ipojo/manipulator/annotations/src/main/appended-resources/NOTICE
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Component.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Component.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Component.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Component.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Controller.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Controller.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Controller.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Controller.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Handler.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Handler.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Handler.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Handler.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/HandlerDeclaration.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/HandlerDeclaration.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/HandlerDeclaration.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/HandlerDeclaration.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Instantiate.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Instantiate.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Instantiate.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Instantiate.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Invalidate.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Invalidate.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Invalidate.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Invalidate.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Modified.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Modified.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Modified.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Modified.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostRegistration.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostRegistration.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostRegistration.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostRegistration.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostUnregistration.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostUnregistration.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostUnregistration.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostUnregistration.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Property.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Property.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Property.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Property.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Provides.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Provides.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Provides.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Provides.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceController.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceController.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceController.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceController.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceProperty.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceProperty.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceProperty.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceProperty.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/StaticServiceProperty.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/StaticServiceProperty.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/StaticServiceProperty.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/StaticServiceProperty.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Updated.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Updated.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Updated.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Updated.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Validate.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Validate.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Validate.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/annotations/Validate.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/extender/Extender.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/extender/Extender.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/extender/Extender.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/extender/Extender.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Requires.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Requires.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Requires.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Requires.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Temporal.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Temporal.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Temporal.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Temporal.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publisher.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publisher.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publisher.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publisher.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publishes.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publishes.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publishes.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publishes.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Subscriber.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Subscriber.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Subscriber.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Subscriber.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXBean.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXBean.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXBean.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXBean.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXMethod.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXMethod.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXMethod.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXMethod.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXProperty.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXProperty.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXProperty.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXProperty.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transaction.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transaction.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transaction.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transaction.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Wbp.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Wbp.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Wbp.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Wbp.java
diff --git a/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Whiteboards.java b/ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Whiteboards.java
similarity index 100%
rename from ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Whiteboards.java
rename to ipojo/manipulator/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Whiteboards.java
diff --git a/ipojo/manipulator/bnd-ipojo-plugin/pom.xml b/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
index cc68e8f..645e44b 100644
--- a/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
+++ b/ipojo/manipulator/bnd-ipojo-plugin/pom.xml
@@ -40,12 +40,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.10.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.8.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/ipojo/manipulator/ipojo-ant-task/pom.xml b/ipojo/manipulator/ipojo-ant-task/pom.xml
index bdcf267..9da8ca4 100644
--- a/ipojo/manipulator/ipojo-ant-task/pom.xml
+++ b/ipojo/manipulator/ipojo-ant-task/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.10.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
diff --git a/ipojo/manipulator/manipulator/pom.xml b/ipojo/manipulator/manipulator/pom.xml
index 89eb5a0..9b12e67 100644
--- a/ipojo/manipulator/manipulator/pom.xml
+++ b/ipojo/manipulator/manipulator/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.8.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
diff --git a/ipojo/manipulator/maven-ipojo-plugin/pom.xml b/ipojo/manipulator/maven-ipojo-plugin/pom.xml
index f9aa76d..d31af7e 100644
--- a/ipojo/manipulator/maven-ipojo-plugin/pom.xml
+++ b/ipojo/manipulator/maven-ipojo-plugin/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.10.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
diff --git a/ipojo/manipulator/online-manipulator/pom.xml b/ipojo/manipulator/online-manipulator/pom.xml
index 3b5e62e..a3eac0b 100644
--- a/ipojo/manipulator/online-manipulator/pom.xml
+++ b/ipojo/manipulator/online-manipulator/pom.xml
@@ -132,7 +132,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.10.1-SNAPSHOT</version>
+ <version>${project.version}</version>
<executions>
<execution>
<goals>
diff --git a/ipojo/manipulator/pom.xml b/ipojo/manipulator/pom.xml
index c55d536..29bddcc 100644
--- a/ipojo/manipulator/pom.xml
+++ b/ipojo/manipulator/pom.xml
@@ -35,6 +35,7 @@
</description>
<modules>
+ <module>annotations</module>
<module>manipulator</module>
<module>manipulator-it</module>
<module>ipojo-ant-task</module>
diff --git a/ipojo/runtime/core-it/pom.xml b/ipojo/runtime/core-it/pom.xml
index 6fddb95..8fa42e9 100644
--- a/ipojo/runtime/core-it/pom.xml
+++ b/ipojo/runtime/core-it/pom.xml
@@ -87,8 +87,7 @@
<properties>
<exam.version>3.0.1</exam.version>
<url.version>1.5.1</url.version>
-
-
+ <manipulator.version>1.10.1-SNAPSHOT</manipulator.version>
</properties>
<dependencies>
@@ -171,7 +170,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.10.1-SNAPSHOT</version>
+ <version>${manipulator.version}</version>
</dependency>
<dependency>
@@ -189,7 +188,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>1.10.1-SNAPSHOT</version>
+ <version>${manipulator.version}</version>
</dependency>
<dependency>
diff --git a/ipojo/runtime/pom.xml b/ipojo/runtime/pom.xml
index e547fea..25ebc68 100644
--- a/ipojo/runtime/pom.xml
+++ b/ipojo/runtime/pom.xml
@@ -30,11 +30,10 @@
<packaging>pom</packaging>
<description>
- The iPOJO runtime project contains the core iPOJO bundle, the composite support and the annotations.
+ The iPOJO runtime project contains the core iPOJO bundle, the composite support and the api.
</description>
<modules>
- <module>annotations</module>
<module>core</module>
<module>core-it</module>
<module>composite</module>