felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1495676 - in /felix/trunk/ipojo/runtime/core-it: ./ ipojo-core-annotations-test/ ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/ ipojo-core-annotations-test/src/main/java/org/apache/felix/ipoj...
Date Sat, 22 Jun 2013 07:22:45 GMT
Author: clement
Date: Sat Jun 22 07:22:44 2013
New Revision: 1495676

URL: http://svn.apache.org/r1495676
Log:
Continue the work about FELIX-4134
Migrate all core-it tests to the reactor.

Added:
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-annotations-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-annotations-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-bad-configuration-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-bad-configuration-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-admin-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-admin-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-processor-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-processor-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-external-handlers-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-external-handlers-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-callback-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-callback-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-controller-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-controller-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-logger-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-logger-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-interceptor-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-interceptor-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-policies/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-policies/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-test/pom.xml
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/
      - copied from r1493469, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/
    felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/pom.xml
      - copied, changed from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/pom.xml
Removed:
    felix/trunk/ipojo/runtime/core-it/src/it/
Modified:
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/ManagedServicePID.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/NoPropagation.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PIDandPropagation.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Propagation.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PropagationandPID.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Properties.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithManagedService.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithProperties.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSub.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubDeprecated.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubWithPublishes.java
    felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/extender/Extender.java
    felix/trunk/ipojo/runtime/core-it/pom.xml

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-annotations-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-annotations-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-annotations-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/ManagedServicePID.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/ManagedServicePID.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/ManagedServicePID.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/ManagedServicePID.java Sat Jun 22 07:22:44 2013
@@ -27,7 +27,7 @@ import org.apache.felix.ipojo.runtime.co
 @Component(managedservice="MyPID")
 public class ManagedServicePID implements FooService, BarService {
     
-    @Property(name="foo")
+    @Property(name= "foo")
     public int m_foo = 0;
     
     @Property(value = "4")

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/NoPropagation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/NoPropagation.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/NoPropagation.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/NoPropagation.java Sat Jun 22 07:22:44 2013
@@ -27,7 +27,7 @@ import org.apache.felix.ipojo.runtime.co
 @Component(propagation=false)
 public class NoPropagation implements FooService, BarService {
     
-    @Property(name="foo")
+    @Property(name= "foo")
     public int m_foo = 0;
     
     @Property(value = "4")

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PIDandPropagation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PIDandPropagation.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PIDandPropagation.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PIDandPropagation.java Sat Jun 22 07:22:44 2013
@@ -28,7 +28,7 @@ import org.apache.felix.ipojo.runtime.co
 @Component(managedservice="MyPID", propagation=true)
 public class PIDandPropagation implements FooService, BarService {
     
-    @Property(name="foo")
+    @Property(name= "foo")
     public int m_foo = 0;
     
     @Property(value = "4")

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Propagation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Propagation.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Propagation.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Propagation.java Sat Jun 22 07:22:44 2013
@@ -28,7 +28,7 @@ import org.apache.felix.ipojo.runtime.co
 @Component(propagation=true)
 public class Propagation implements FooService, BarService {
     
-    @Property(name="foo")
+    @Property(name= "foo")
     public int m_foo = 0;
     
     @Property(value = "4")

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PropagationandPID.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PropagationandPID.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PropagationandPID.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/PropagationandPID.java Sat Jun 22 07:22:44 2013
@@ -28,7 +28,7 @@ import org.apache.felix.ipojo.runtime.co
 @Component(managedservice="MyPID", propagation=true)
 public class PropagationandPID implements FooService, BarService {
     
-    @Property(name="foo")
+    @Property(name= "foo")
     public int m_foo = 0;
     
     @Property(value = "4")

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Properties.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Properties.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Properties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/Properties.java Sat Jun 22 07:22:44 2013
@@ -27,7 +27,7 @@ import org.apache.felix.ipojo.runtime.co
 @Component
 public class Properties implements FooService, BarService {
     
-    @Property(name="foo")
+    @Property(name= "foo")
     public int m_foo = 0;
     
     @Property(value = "4")

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithManagedService.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithManagedService.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithManagedService.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithManagedService.java Sat Jun 22 07:22:44 2013
@@ -31,7 +31,7 @@ import org.apache.felix.ipojo.runtime.co
 @Component(managedservice="MyPID")
 public class UpdatedWithManagedService implements FooService, BarService {
     
-    @Property(name="foo")
+    @Property(name= "foo")
     public int m_foo = 0;
     
     @Property(value = "4")

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithProperties.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithProperties.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/UpdatedWithProperties.java Sat Jun 22 07:22:44 2013
@@ -38,7 +38,7 @@ public class UpdatedWithProperties imple
         // ...
     }
     
-    @Property(name="foo")
+    @Property(name= "foo")
     public int m_foo = 0;
     
     @Property(value = "4")

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSub.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSub.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSub.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSub.java Sat Jun 22 07:22:44 2013
@@ -46,7 +46,7 @@ public class PubSub {
     }
 
 
-    @Subscriber(name="s3", topics="foo", dataKey="data", dataType="java.lang.String")
+    @Subscriber(name="s3", topics= "foo", dataKey="data", dataType="java.lang.String")
     public void receive3(String foo) {
         // Nothing
     }

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubDeprecated.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubDeprecated.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubDeprecated.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubDeprecated.java Sat Jun 22 07:22:44 2013
@@ -46,7 +46,7 @@ public class PubSubDeprecated {
     }
     
     
-    @Subscriber(name="s3", topics="foo", data_key="data", data_type="java.lang.String")
+    @Subscriber(name="s3", topics= "foo", data_key="data", data_type="java.lang.String")
     public void receive3(String foo) {
         // Nothing
     }

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubWithPublishes.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubWithPublishes.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubWithPublishes.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/event/PubSubWithPublishes.java Sat Jun 22 07:22:44 2013
@@ -47,7 +47,7 @@ public class PubSubWithPublishes {
     }
 
 
-    @Subscriber(name="s3", topics="foo", dataKey="data", dataType="java.lang.String")
+    @Subscriber(name="s3", topics= "foo", dataKey="data", dataType="java.lang.String")
     public void receive3(String foo) {
         // Nothing
     }

Modified: felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/extender/Extender.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/extender/Extender.java?rev=1495676&r1=1493469&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/extender/Extender.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-annotations-test/src/main/java/org/apache/felix/ipojo/runtime/core/test/components/extender/Extender.java Sat Jun 22 07:22:44 2013
@@ -24,7 +24,7 @@ import org.osgi.framework.Bundle;
 
 
 @Component
-@org.apache.felix.ipojo.extender.Extender(extension="foo", onArrival="onArrival", onDeparture="onDeparture")
+@org.apache.felix.ipojo.extender.Extender(extension= "foo", onArrival="onArrival", onDeparture="onDeparture")
 public class Extender {
     
     public void onArrival(Bundle bundle, String foo) {

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-bad-configuration-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-bad-configuration-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-bad-configuration-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-bad-configuration-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-bad-configuration-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-admin-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-admin-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-admin-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-admin-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-processor-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-processor-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-processor-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-processor-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-configuration-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-configuration-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-external-handlers-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-external-handlers-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-external-handlers-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-external-handlers-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-factory-version-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -23,7 +23,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-handler-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-callback-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-callback-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-callback-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-callback-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-controller-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-controller-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-lifecycle-controller-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-lifecycle-controller-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-logger-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-logger-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-logger-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-logger-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-interceptor-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-interceptor-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-interceptor-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-interceptor-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-optional-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-optional-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-policies/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-policies/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-policies/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-policies/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-policies/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-proxies/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-proxies/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-dependency-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-dependency-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Copied: felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/pom.xml (from r1493776, felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/pom.xml)
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/pom.xml?p2=felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/pom.xml&p1=felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/pom.xml&r1=1493776&r2=1495676&rev=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-service-providing-test/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-core-service-providing-test/pom.xml Sat Jun 22 07:22:44 2013
@@ -26,7 +26,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
         <version>1.10.2-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/runtime/core-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/pom.xml?rev=1495676&r1=1495675&r2=1495676&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/pom.xml Sat Jun 22 07:22:44 2013
@@ -16,23 +16,73 @@
   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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
         <version>2.1</version>
         <relativePath>../../../pom/pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
+
     <artifactId>org.apache.felix.ipojo.runtime.core-it</artifactId>
     <version>1.10.2-SNAPSHOT</version>
     <name>Apache Felix iPOJO Runtime Project ~ Core Integration Tests</name>
     <packaging>pom</packaging>
 
+    <properties>
+        <!-- Tests are enabled only when the 'test' profile is activated  -->
+        <skipTestExecution>true</skipTestExecution>
+
+        <exam.version>3.0.0</exam.version>
+        <url.version>1.5.1</url.version>
+
+        <felix.version>4.2.0</felix.version>
+        <equinox.version>3.8.1.v20120830-144521</equinox.version>
+        <knoperflerfish.version>5.3.3</knoperflerfish.version>
+
+        <manipulator.version>1.10.0</manipulator.version>
+    </properties>
+
+    <modules>
+        <module>ipojo-core-annotations-test</module>
+        <module>ipojo-core-bad-configuration-test</module>
+        <module>ipojo-core-configuration-admin-test</module>
+        <module>ipojo-core-configuration-processor-test</module>
+        <module>ipojo-core-configuration-test</module>
+        <module>ipojo-core-external-handlers-test</module>
+        <module>ipojo-core-factory-test</module>
+        <module>ipojo-core-factory-version-test</module>
+        <module>ipojo-core-handler-test</module>
+        <module>ipojo-core-lifecycle-callback-test</module>
+        <module>ipojo-core-lifecycle-controller-test</module>
+        <module>ipojo-core-logger-test</module>
+        <module>ipojo-core-service-dependency-optional-test</module>
+        <module>ipojo-core-service-dependency-policies</module>
+        <module>ipojo-core-service-dependency-proxies</module>
+        <module>ipojo-core-service-dependency-test</module>
+        <module>ipojo-core-service-dependency-interceptor-test</module>
+        <module>ipojo-core-service-providing-test</module>
+    </modules>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.14.1</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <!-- TIME_FACTOR can be set from the command line with -DTIME_FACTOR=9-->
+                        <TIME_FACTOR>${TIME_FACTOR}</TIME_FACTOR>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.5.1</version>
                 <configuration>
@@ -74,9 +124,6 @@
                     <excludes>
                         <exclude>src/main/appended-resources/**</exclude>
                         <exclude>**/*.iml</exclude>
-                        <!-- Exclude iml files -->
-                        <exclude>src/it/*/target/**/*</exclude>
-                        <!-- Exclude sub target folders -->
                     </excludes>
                 </configuration>
             </plugin>
@@ -92,11 +139,6 @@
 
     </build>
 
-    <properties>
-        <exam.version>3.0.1</exam.version>
-        <url.version>1.5.1</url.version>
-        <manipulator.version>1.10.0</manipulator.version>
-    </properties>
 
     <dependencies>
 
@@ -128,13 +170,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!--<dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>4.2.0</version>
-            <scope>test</scope>
-        </dependency>-->
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
@@ -290,15 +325,9 @@
                 <dependency>
                     <groupId>org.knopflerfish</groupId>
                     <artifactId>framework</artifactId>
-                    <version>5.2.0</version>
+                    <version>${knoperflerfish.version}</version>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                    <version>4.3.1</version>
-                    <scope>provided</scope>
-                </dependency>
             </dependencies>
         </profile>
 
@@ -318,22 +347,16 @@
                 <dependency>
                     <groupId>org.eclipse.tycho</groupId>
                     <artifactId>org.eclipse.osgi</artifactId>
-                    <version>3.8.1.v20120830-144521</version>
+                    <version>${equinox.version}</version>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                    <version>4.3.1</version>
-                    <scope>provided</scope>
-                </dependency>
             </dependencies>
         </profile>
 
         <profile>
             <id>felix</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
                 <property>
                     <name>pax.exam.framework</name>
                     <value>felix</value>
@@ -346,207 +369,17 @@
                 <dependency>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>org.apache.felix.framework</artifactId>
-                    <version>4.2.0</version>
+                    <version>${felix.version}</version>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                    <version>4.3.1</version>
-                    <scope>compile</scope>
-                </dependency>
             </dependencies>
         </profile>
 
         <profile>
-            <!--
-                avoid using the invoker and use a regular reactor instead.
-                it must be coupled with another profile to select the right OSGi framework implementation
-
-                * mvn clean install -Preactor,felix
-                * mvn clean install -Preactor,equinox
-                * mvn clean install -Preactor,knopflerfish
-             -->
-            <id>reactor</id>
-
-            <modules>
-                <module>src/it/ipojo-core-annotations-test</module>
-                <module>src/it/ipojo-core-bad-configuration-test</module>
-                <module>src/it/ipojo-core-configuration-admin-test</module>
-                <module>src/it/ipojo-core-configuration-processor-test</module>
-                <module>src/it/ipojo-core-configuration-test</module>
-                <module>src/it/ipojo-core-external-handlers-test</module>
-                <module>src/it/ipojo-core-factory-test</module>
-                <module>src/it/ipojo-core-factory-version-test</module>
-                <module>src/it/ipojo-core-handler-test</module>
-                <module>src/it/ipojo-core-lifecycle-callback-test</module>
-                <module>src/it/ipojo-core-lifecycle-controller-test</module>
-                <module>src/it/ipojo-core-logger-test</module>
-                <module>src/it/ipojo-core-service-dependency-optional-test</module>
-                <module>src/it/ipojo-core-service-dependency-policies</module>
-                <module>src/it/ipojo-core-service-dependency-proxies</module>
-                <module>src/it/ipojo-core-service-dependency-test</module>
-                <module>src/it/ipojo-core-service-dependency-interceptor-test</module>
-                <module>src/it/ipojo-core-service-providing-test</module>
-            </modules>
-
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <version>2.14.1</version>
-                            <configuration>
-                                <systemPropertyVariables>
-                                    <!-- TIME_FACTOR can be set from the command line with -DTIME_FACTOR=9-->
-                                    <TIME_FACTOR>${TIME_FACTOR}</TIME_FACTOR>
-                                </systemPropertyVariables>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-
-        <profile>
             <id>test</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.8</version>
-                        <configuration>
-                            <streamLogs>true</streamLogs>
-                            <goals>
-                                <goal>clean</goal>
-                                <goal>test</goal>
-                            </goals>
-                            <cloneClean>true</cloneClean>
-                            <environmentVariables>
-                                <!-- TIME_FACTOR can be set from the command line with -DTIME_FACTOR=9-->
-                                <TIME_FACTOR>${TIME_FACTOR}</TIME_FACTOR>
-                            </environmentVariables>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>regular</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <profiles>
-                                        <profile>felix</profile>
-                                    </profiles>
-                                    <cloneProjectsTo>${project.build.directory}/regular</cloneProjectsTo>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>test-all</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-invoker-plugin</artifactId>
-                        <version>1.8</version>
-                        <configuration>
-                            <streamLogs>true</streamLogs>
-                            <goals>
-                                <goal>clean</goal>
-                                <goal>test</goal>
-                            </goals>
-                            <cloneClean>true</cloneClean>
-                            <environmentVariables>
-                                <!-- TIME_FACTOR can be set from the command line with -DTIME_FACTOR=9-->
-                                <TIME_FACTOR>${TIME_FACTOR}</TIME_FACTOR>
-                            </environmentVariables>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>equinox-native</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <profiles>
-                                        <profile>equinox</profile>
-                                    </profiles>
-                                    <cloneProjectsTo>${project.build.directory}/equinox-native</cloneProjectsTo>
-
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>felix-native</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <profiles>
-                                        <profile>felix</profile>
-                                    </profiles>
-                                    <cloneProjectsTo>${project.build.directory}/felix-native</cloneProjectsTo>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>knopflerfish-native</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <profiles>
-                                        <profile>knopflerfish</profile>
-                                    </profiles>
-                                    <cloneProjectsTo>${project.build.directory}/knopflerfish-native</cloneProjectsTo>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>apache-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.apache.resources</groupId>
-                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                                <version>1.0.3</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>source-release-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
-                                    <descriptorRefs>
-                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
-                                    </descriptorRefs>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <properties>
+                <skipTestExecution>false</skipTestExecution>
+            </properties>
         </profile>
     </profiles>
 </project>



Mime
View raw message