You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/12/14 21:06:07 UTC
svn commit: r604283 - in /servicemix/smx4/runtime/trunk/testing/support:
pom.xml
src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java
Author: gnodet
Date: Fri Dec 14 12:06:05 2007
New Revision: 604283
URL: http://svn.apache.org/viewvc?rev=604283&view=rev
Log:
Fix test support
Modified:
servicemix/smx4/runtime/trunk/testing/support/pom.xml
servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java
Modified: servicemix/smx4/runtime/trunk/testing/support/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/testing/support/pom.xml?rev=604283&r1=604282&r2=604283&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/testing/support/pom.xml Fri Dec 14 12:06:05 2007
@@ -63,6 +63,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<version>${felix.framework.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi_R4_core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java?rev=604283&r1=604282&r2=604283&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java (original)
+++ servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java Fri Dec 14 12:06:05 2007
@@ -27,10 +27,9 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
-import org.springframework.osgi.internal.test.platform.FelixPlatform;
import org.springframework.osgi.internal.util.concurrent.Counter;
import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
-import org.springframework.osgi.test.platform.OsgiPlatform;
+import org.springframework.osgi.test.platform.Platforms;
import org.springframework.osgi.util.OsgiFilterUtils;
import org.springframework.osgi.util.OsgiListenerUtils;
@@ -46,10 +45,6 @@
private Properties dependencies;
- protected OsgiPlatform createPlatform() {
- return new FelixPlatform();
- }
-
protected String getBundle(String groupId, String artifactId) {
return groupId + "," + artifactId + "," + getBundleVersion(groupId, artifactId);
}
@@ -92,6 +87,7 @@
getBundle("org.springframework.osgi", "spring-osgi-extender"),
getBundle("org.springframework.osgi", "spring-osgi-test"),
getBundle("org.springframework.osgi", "spring-osgi-annotation"),
+ getBundle("org.apache.servicemix.runtime.testing", "org.apache.servicemix.runtime.testing.support"),
};
}