You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2012/04/25 14:40:39 UTC
svn commit: r1330245 - in /jackrabbit/oak/trunk: oak-core/pom.xml
oak-it/osgi/pom.xml
oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
oak-it/osgi/test-bundles.xml oak-mk/pom.xml
Author: jukka
Date: Wed Apr 25 12:40:39 2012
New Revision: 1330245
URL: http://svn.apache.org/viewvc?rev=1330245&view=rev
Log:
OAK-67: Initial OSGi Bundle Setup
Fix bundle resolution problems in the test case. TODO: Fix the package dependencies.
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-it/osgi/pom.xml
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
jackrabbit/oak/trunk/oak-mk/pom.xml
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1330245&r1=1330244&r2=1330245&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Apr 25 12:40:39 2012
@@ -39,7 +39,11 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.jackrabbit.oak.api
+ org.apache.jackrabbit.oak.api,
+ org.apache.jackrabbit.oak.core,
+ org.apache.jackrabbit.oak.util,
+ org.apache.jackrabbit.oak.namepath,
+ org.apache.jackrabbit.oak.plugins.name
</Export-Package>
</instructions>
</configuration>
Modified: jackrabbit/oak/trunk/oak-it/osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/pom.xml?rev=1330245&r1=1330244&r2=1330245&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/pom.xml Wed Apr 25 12:40:39 2012
@@ -53,6 +53,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>
+ WARN
+ </org.ops4j.pax.logging.DefaultServiceLog.level>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
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=1330245&r1=1330244&r2=1330245&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 Wed Apr 25 12:40:39 2012
@@ -41,6 +41,11 @@ public class OSGiIT {
File base = new File(TARGET, "test-bundles");
return CoreOptions.options(
junitBundles(),
+ 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()),
+ bundle(new File(base, "jackrabbit-api.jar").toURI().toURL().toString()),
+ bundle(new File(base, "jackrabbit-jcr-commons.jar").toURI().toURL().toString()),
bundle(new File(base, "oak-mk.jar").toURI().toURL().toString()),
bundle(new File(base, "oak-core.jar").toURI().toURL().toString()),
bundle(new File(base, "oak-jcr.jar").toURI().toURL().toString()));
Modified: jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml?rev=1330245&r1=1330244&r2=1330245&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml Wed Apr 25 12:40:39 2012
@@ -28,6 +28,11 @@
<outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
<scope>test</scope>
<includes>
+ <include>javax.jcr:jcr</include>
+ <include>commons-io:commons-io</include>
+ <include>commons-collections:commons-collections</include>
+ <include>org.apache.jackrabbit:jackrabbit-api</include>
+ <include>org.apache.jackrabbit:jackrabbit-jcr-commons</include>
<include>org.apache.jackrabbit:oak-mk</include>
<include>org.apache.jackrabbit:oak-core</include>
<include>org.apache.jackrabbit:oak-jcr</include>
Modified: jackrabbit/oak/trunk/oak-mk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/pom.xml?rev=1330245&r1=1330244&r2=1330245&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk/pom.xml Wed Apr 25 12:40:39 2012
@@ -41,7 +41,9 @@
<Export-Package>
org.apache.jackrabbit.mk.api,
org.apache.jackrabbit.mk.json,
- org.apache.jackrabbit.mk.util
+ org.apache.jackrabbit.mk.util,
+ org.apache.jackrabbit.mk.core,
+ org.apache.jackrabbit.mk.blobs
</Export-Package>
</instructions>
</configuration>