Author: reto
Date: Mon Nov 22 20:01:10 2010
New Revision: 1037863
URL: http://svn.apache.org/viewvc?rev=1037863&view=rev
Log:
CLEREZZA-361: fixing tests (while not yet doing the necessary tidying up)
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml?rev=1037863&r1=1037862&r2=1037863&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
Mon Nov 22 20:01:10 2010
@@ -122,6 +122,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.metadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -177,6 +182,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.content.imagemetadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.content</artifactId>
<scope>provided</scope>
</dependency>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java?rev=1037863&r1=1037862&r2=1037863&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
Mon Nov 22 20:01:10 2010
@@ -27,6 +27,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.configProfile;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.webProfile;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.dsProfile;
import static org.ops4j.pax.exam.junit.JUnitOptions.junitBundles;
import java.io.FileNotFoundException;
@@ -91,12 +92,12 @@ public class FelixClerezzaPlatformTest {
"wrhapi-osgi").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
"com.ibm.icu").versionAsInProject(),
-
mavenBundle().groupId("org.apache.felix").artifactId(
+
/*mavenBundle().groupId("org.apache.felix").artifactId(
"org.apache.felix.scr").version("1.0.6"),
mavenBundle().groupId("org.apache.felix").artifactId(
"org.apache.felix.eventadmin").version("1.0.0"),
mavenBundle().groupId("org.apache.felix").artifactId(
- "org.apache.felix.metatype").version("1.0.2"),
+ "org.apache.felix.metatype").version("1.0.2"),*/
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.triaxrs").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
@@ -158,6 +159,10 @@ public class FelixClerezzaPlatformTest {
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.usermanager").startLevel(4).versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.security").startLevel(4).versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.security.conditions").startLevel(4).versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.scripting").startLevel(4).versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.rdf.jena.sparql").versionAsInProject(),
@@ -185,9 +190,13 @@ public class FelixClerezzaPlatformTest {
"org.apache.clerezza.utils.imageprocessing").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.language.core").versionAsInProject(),
+
mavenBundle().groupId("org.apache.clerezza").artifactId(
+
"org.apache.clerezza.platform.language.ontologies").versionAsInProject(),
mavenBundle().groupId("org.apache.httpcomponents").artifactId(
"httpcore-osgi").versionAsInProject(),
- // dsProfile(),
+
mavenBundle().groupId("org.mortbay.jetty").artifactId(
+ "servlet-api-2.5").version("6.1.12"),
+ dsProfile(),
configProfile(),
webProfile(),
junitBundles(),
