You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2008/11/20 16:52:00 UTC
svn commit: r719260 [2/2] - in /felix/trunk/ipojo: ./ annotations/
annotations/src/main/java/org/apache/felix/ipojo/handlers/
annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/ ant/
ant/src/main/java/org/apache/felix/ipojo/task/ arch/ compo...
Modified: felix/trunk/ipojo/tests/core/factories/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factories/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factories/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/factories/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/core/service-dependency-comparator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-comparator/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-comparator/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-comparator/pom.xml Thu Nov 20 07:51:56 2008
@@ -19,8 +19,8 @@
<project>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
- <name>iPOJO Service Dependency (Binding Policy) Test Suite</name>
- <artifactId>tests.core.service.dependency.bindingpolicy</artifactId>
+ <name>iPOJO Service Dependency Comparator Test Suite</name>
+ <artifactId>tests.core.service.dependency.comparator</artifactId>
<groupId>ipojo.tests</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -68,7 +68,8 @@
${pom.artifactId}
</Bundle-SymbolicName>
<Private-Package>
- org.apache.felix.ipojo.test.scenarios.service.dependency.comparator
+ org.apache.felix.ipojo.test.scenarios.service.dependency.comparator,
+ org.apache.felix.ipojo.test.scenarios.service.dependency.comparator.component
</Private-Package>
<Test-Suite>
org.apache.felix.ipojo.test.scenarios.service.dependency.comparator.ComparatorTestCase
Modified: felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/ComparatorTestCase.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/ComparatorTestCase.java?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/ComparatorTestCase.java (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/ComparatorTestCase.java Thu Nov 20 07:51:56 2008
@@ -26,7 +26,7 @@
}
public void tearDown() {
- dynInstance.dispose();
+ dynInstance.dispose();
dpInstance.dispose();
}
@@ -46,6 +46,8 @@
assertEquals("fs grade -1", 2, fsGrade);
assertEquals("fs2 grade -1", 2, fs2Grade);
assertEquals("fss grade size -1", 2, fssGrades.length);
+
+
assertEquals("fss grade[0] -1", 2, fssGrades[0]);
assertEquals("fss grade[1] -1", 1, fssGrades[1]);
Modified: felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/component/CheckServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/component/CheckServiceProvider.java?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/component/CheckServiceProvider.java (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-comparator/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/comparator/component/CheckServiceProvider.java Thu Nov 20 07:51:56 2008
@@ -42,6 +42,11 @@
props.put("fs2", new Integer(fs2.getInt()));
int[] grades = new int[fss.length];
+
+ for (int i = 0; i < grades.length; i++) {
+ grades[i] = fss[i].getInt();
+ }
+
props.put("fss", grades);
return props;
Modified: felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/core/service-dependency/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/core/service-providing/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-providing/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-providing/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/service-providing/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/handler/eventadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/eventadmin/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/eventadmin/pom.xml (original)
+++ felix/trunk/ipojo/tests/handler/eventadmin/pom.xml Thu Nov 20 07:51:56 2008
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: felix/trunk/ipojo/tests/handler/temporal/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/temporal/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/temporal/pom.xml (original)
+++ felix/trunk/ipojo/tests/handler/temporal/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/handler/whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/whiteboard/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/whiteboard/pom.xml (original)
+++ felix/trunk/ipojo/tests/handler/whiteboard/pom.xml Thu Nov 20 07:51:56 2008
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/manipulator/creation/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/creation/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/creation/pom.xml (original)
+++ felix/trunk/ipojo/tests/manipulator/creation/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/manipulator/manipulator-java5/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulator-java5/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulator-java5/pom.xml (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulator-java5/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/manipulator/metadata/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/metadata/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/metadata/pom.xml (original)
+++ felix/trunk/ipojo/tests/manipulator/metadata/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: felix/trunk/ipojo/tests/manipulator/primitives/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/primitives/pom.xml?rev=719260&r1=719259&r2=719260&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/primitives/pom.xml (original)
+++ felix/trunk/ipojo/tests/manipulator/primitives/pom.xml Thu Nov 20 07:51:56 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>