Author: clement
Date: Thu Nov 8 08:58:27 2012
New Revision: 1406963
URL: http://svn.apache.org/viewvc?rev=1406963&view=rev
Log:
Update the Felix version in junit4osgi
Modified:
felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java
Modified: felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml?rev=1406963&r1=1406962&r2=1406963&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml Thu Nov 8
08:58:27 2012
@@ -37,7 +37,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<!--<version>3.1.0-SNAPSHOT</version> -->
- <version>3.0.2</version>
+ <version>4.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified:
felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java?rev=1406963&r1=1406962&r2=1406963&view=diff
==============================================================================
---
felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java
(original)
+++
felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/src/main/java/org/apache/felix/ipojo/junit4osgi/plugin/Junit4osgiPlugin.java
Thu Nov 8 08:58:27 2012
@@ -339,10 +339,10 @@ public class Junit4osgiPlugin extends Ab
int count2 = 0;
while (! serviceStability && count < 500) {
try {
- ServiceReference[] refs = context.getServiceReferences(null,
null);
+ ServiceReference[] refs =
context.getServiceReferences((String) null, null);
count1 = refs.length;
Thread.sleep(500);
- refs = context.getServiceReferences(null, null);
+ refs = context.getServiceReferences((String) null, null);
count2 = refs.length;
serviceStability = count1 == count2;
} catch (Exception e) {
@@ -360,7 +360,7 @@ public class Junit4osgiPlugin extends Ab
}
try {
- ServiceReference[] refs = context.getServiceReferences(null, null);
+ ServiceReference[] refs = context.getServiceReferences((String)
null, null);
getLog().debug("Service List");
for (int i = 0; i < refs.length; i++) {
String[] itfs = (String[])
refs[i].getProperty(Constants.OBJECTCLASS);