Author: jukka
Date: Mon May 7 09:05:17 2012
New Revision: 1334928
URL: http://svn.apache.org/viewvc?rev=1334928&view=rev
Log:
OAK-87: Declarative services and OSGi configuration
Add declarative services support from Apache Felix to our OSGi integration tests
Modified:
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Modified:
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1334928&r1=1334927&r2=1334928&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
(original)
+++
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Mon May 7 09:05:17 2012
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.osgi;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import java.io.File;
import java.io.IOException;
@@ -45,6 +46,7 @@ public class OSGiIT {
File base = new File(TARGET, "test-bundles");
return CoreOptions.options(
junitBundles(),
+ mavenBundle("org.apache.felix", "org.apache.felix.scr",
"1.6.0"),
bundle(new File(base, "jcr.jar").toURI().toURL().toString()),
bundle(new File(base,
"commons-io.jar").toURI().toURL().toString()),
bundle(new File(base,
"commons-collections.jar").toURI().toURL().toString()),
