You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ie...@apache.org on 2013/03/24 01:53:31 UTC
svn commit: r1460250 - /sling/whiteboard/ieb/oak/pom.xml
Author: ieb
Date: Sun Mar 24 00:53:31 2013
New Revision: 1460250
URL: http://svn.apache.org/r1460250
Log:
SLING-2788 Added details patch of oak-sling. This starts up with no errors and the console works, but there is no Authentication Service present so no restfull operations outside /system/console work. Error message is 503 " AuthenticationSupport service missing. Cannot authenticate request."
Modified:
sling/whiteboard/ieb/oak/pom.xml
Modified: sling/whiteboard/ieb/oak/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/ieb/oak/pom.xml?rev=1460250&r1=1460249&r2=1460250&view=diff
==============================================================================
--- sling/whiteboard/ieb/oak/pom.xml (original)
+++ sling/whiteboard/ieb/oak/pom.xml Sun Mar 24 00:53:31 2013
@@ -77,16 +77,19 @@
</defaultBundleList>
<bundleExclusions>
<!--
+ Updated by additional Bundle
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
<version>2.4.2</version>
</bundle>
+ Updated by additional Bundle
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>2.4.2</version>
</bundle>
+ Updated by additional Bundle
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
@@ -138,30 +141,43 @@
<artifactId>org.apache.sling.jcr.webdav</artifactId>
<version>2.1.2</version>
</bundle>
- <!-- 35270 Sat Mar 23 16:55:56 EST 2013 resources/bundles/15/jackrabbit-api-2.4.2.jar
- 335264 Sat Mar 23 16:55:58 EST 2013 resources/bundles/15/jackrabbit-jcr-commons-2.4.2.jar
- 411205 Sat Mar 23 16:55:58 EST 2013 resources/bundles/15/jackrabbit-jcr-rmi-2.4.2.jar
- 27684 Sat Mar 23 16:55:58 EST 2013 resources/bundles/15/jackrabbit-spi-2.4.2.jar
- 761831 Sat Mar 23 16:55:58 EST 2013 resources/bundles/15/jackrabbit-spi-commons-2.4.2.jar
- 315627 Sat Mar 23 16:55:58 EST 2013 resources/bundles/15/jackrabbit-webdav-2.4.2.jar
- 40070 Sat Mar 23 16:55:58 EST 2013 resources/bundles/15/org.apache.sling.jcr.jackrabbit.accessmanager-2.1.1-SNAPSHOT.jar
- 4398519 Sat Mar 23 16:55:58 EST 2013 resources/bundles/15/org.apache.sling.jcr.jackrabbit.server-2.1.1-SNAPSHOT.jar
- 89668 Sat Mar 23 16:55:58 EST 2013 resources/bundles/15/org.apache.sling.jcr.jackrabbit.usermanager-2.2.1-SNAPSHOT.jar -->
</bundleExclusions>
<additionalBundles>
+ <!-- this imports org.apache.jackrabbit.tests which should be optional -->
+ <![CDATA[
+diff --git a/oak-sling/pom.xml b/oak-sling/pom.xml
+index 1fd27cb..6eeca57 100644
+--- a/oak-sling/pom.xml
++++ b/oak-sling/pom.xml
+@@ -41,6 +41,10 @@
+ <Export-Package>
+ !
+ </Export-Package>
++ <Import-Package>
++ org.apache.jackrabbit.test;resolution:=optional,
++ *
++ </Import-Package>
+ <Embed-Dependency>
+ oak-jcr
+ </Embed-Dependency>
+
+]]>
<bundle>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-sling</artifactId>
<version>0.7-SNAPSHOT</version>
</bundle>
+ <!--
+ This is embedded in oak-sling
<bundle>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-core</artifactId>
+ <artifactId>oak-jcr</artifactId>
<version>0.7-SNAPSHOT</version>
</bundle>
+ -->
<bundle>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-jcr</artifactId>
+ <artifactId>oak-core</artifactId>
<version>0.7-SNAPSHOT</version>
</bundle>
<bundle>
@@ -195,11 +211,6 @@
<version>2.7-SNAPSHOT</version>
</bundle>
<bundle>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-tests</artifactId>
- <version></version>
- </bundle>
- <bundle>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>13.0.1</version>
@@ -247,6 +258,8 @@
<classifier>app</classifier>
<scope>provided</scope>
</dependency>
+
+ <!-- dependencies from here are only present to allow inspection of the bundles in Eclipse. Not required explicitly for the build. -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-sling</artifactId>
@@ -267,10 +280,5 @@
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>2.7-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-tests</artifactId>
- <version>2.7-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>