[jboss-osgi-commits] JBoss-OSGI SVN: r96908 - in projects/jboss-osgi/trunk/testsuite: example and 1 other directories.
Author: thomas.diesler(a)jboss.com
Date: 2009-11-24 20:03:26 -0500 (Tue, 24 Nov 2009)
New Revision: 96908
Modified:
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Run examples on equinox - WIP
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-11-25 01:00:42 UTC (rev
96907)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-11-25 01:03:26 UTC (rev
96908)
@@ -181,8 +181,12 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- most tests work when run individually ??? -->
<exclude>${target.container.excludes}</exclude>
+ <!-- exclude interceptor based tests -->
+
<exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
+
<exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
+
<exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude>
+ <!-- -->
<exclude>org/jboss/test/osgi/example/blueprint/**</exclude>
<exclude>org/jboss/test/osgi/example/http/**</exclude>
<exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
@@ -239,7 +243,6 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
-
<!-- https://issues.apache.org/jira/browse/FELIX-1804 -->
<exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
<exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-11-25
01:00:42 UTC (rev 96907)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-11-25
01:03:26 UTC (rev 96908)
@@ -4,8 +4,10 @@
# $Id$
#
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.equinox.framework.EquinoxIntegration
+# Equinox properties
+org.eclipse.osgi/debug=true
+org.eclipse.osgi/debug/loader=true
+osgi.support.class.certificate=false
# Properties to configure the Framework
org.osgi.framework.storage=${basedir}/target/osgi-store
@@ -38,7 +40,7 @@
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+ file://${test.archive.directory}/bundles/org.eclipse.osgi.services.jar
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-11-25 01:00:42 UTC (rev 96907)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-11-25 01:03:26 UTC (rev 96908)
@@ -223,13 +223,6 @@
<artifactId>jboss-osgi-runtime-equinox</artifactId>
<scope>provided</scope>
</dependency>
- <!-- equinox-3.5 does not contain package org.osgi.util.xml -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</profile>