You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2013/10/05 12:45:43 UTC
svn commit: r1529429 - in /sling/trunk/contrib/launchpad/karaf: ./
org.apache.sling.launchpad.karaf-features/
org.apache.sling.launchpad.karaf-features/src/main/feature/
org.apache.sling.launchpad.karaf-integration-tests/
org.apache.sling.launchpad.kar...
Author: olli
Date: Sat Oct 5 10:45:43 2013
New Revision: 1529429
URL: http://svn.apache.org/r1529429
Log:
SLING-3027 improve Launchpad Karaf features
- break down sling-karaf feature into more fine-grained features for better reusability
- add descriptions and versions
- add more features
- update integration tests
- update Pax Exam to 3.3.0
- update Maven Failsafe Plugin to 2.16
- add workaround for KARAF-1972
- update README
- cleanup
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.java
Removed:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapIT.java
Modified:
sling/trunk/contrib/launchpad/karaf/README.txt
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
Modified: sling/trunk/contrib/launchpad/karaf/README.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/README.txt?rev=1529429&r1=1529428&r2=1529429&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/README.txt (original)
+++ sling/trunk/contrib/launchpad/karaf/README.txt Sat Oct 5 10:45:43 2013
@@ -9,16 +9,16 @@ of Apache Sling on Apache Karaf [1]. See
Getting Started
===============
-This component uses a Maven 2 (http://maven.apache.org/) build
-environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/)
-2.0.7 or later. We recommend to use the latest Maven version.
+This component uses a Maven 3 (http://maven.apache.org/) build
+environment. It requires a Java 6 JDK (or higher) and Maven (http://maven.apache.org/)
+3.0.4 or later. We recommend to use the latest Maven version.
-If you have Maven 2 installed, you can install locally the features repository
+If you have Maven 3 installed, you can install the features repository
and startup handler using the following command:
mvn clean install
-See the Maven 2 documentation for other build features.
+See the Maven 3 documentation for other build features.
The latest source code for this component is available in the
Subversion (http://subversion.apache.org/) source repository of
@@ -31,20 +31,21 @@ See the Subversion documentation for oth
How to deploy this
--------------------
+------------------
1) Start Apache Karaf. See details in:
http://karaf.apache.org/manual/latest/quick-start.html
-
+
2) Add the Apache Sling features repository and install:
- karaf@root()> feature:repo-add mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0-SNAPSHOT/xml/features
- karaf@root()> feature:install sling-karaf
-
+ karaf@root()> feature:repo-add mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.1-SNAPSHOT/xml/features
+ karaf@root()> feature:install sling-launchpad-jackrabbit
+
3) Install Launchpad content and Explorer:
- karaf@root()> feature:install sling-karaf-demo
+ karaf@root()> feature:install sling-launchpad-content
+ karaf@root()> feature:install sling-extension-explorer
4) Browse to:
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml?rev=1529429&r1=1529428&r2=1529429&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml Sat Oct 5 10:45:43 2013
@@ -29,12 +29,29 @@
</parent>
<artifactId>org.apache.sling.launchpad.karaf-features</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<packaging>feature</packaging>
<name>Apache Sling Launchpad Karaf - Features</name>
<description>Apache Sling Features for provisioning with Apache Karaf</description>
+ <!--
+ following dependencies are inherited from parent
+ setting scope to runtime to prevent creation of a new (useless) feature for this project as workaround for KARAF-1972
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1529429&r1=1529428&r2=1529429&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml Sat Oct 5 10:45:43 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<features name="sling-launchpad-karaf" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
- <feature name="sling-karaf-requirements" version="${project.version}">
- <!-- features (some are part of Karaf's defaults)-->
+<features name="sling" version="${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+ <!-- infrastructure services for Sling -->
+ <feature name="infrastructure-sling" version="${project.version}">
<feature>config</feature>
<feature>eventadmin</feature>
<feature>scr</feature>
@@ -9,128 +9,229 @@
<feature>management</feature>
<feature>http</feature>
<feature>http-whiteboard</feature>
- <!--
- we want vanilla web console, not the one from Karaf
- (loader constraint violation: when resolving method "org.apache.felix.webconsole.WebConsoleUtil.keyVal(Lorg/json/JSONWriter;Ljava/lang/String;Ljava/lang/Object;)V" the class loader (instance of org/apache/felix/framework/BundleWiringImpl$BundleClassLoaderJava5) of the current class, org/apache/felix/webconsole/plugins/ds/internal/WebConsolePlugin, and the class loader (instance of org/apache/felix/framework/BundleWiringImpl$BundleClassLoaderJava5) for resolved class, org/apache/felix/webconsole/WebConsoleUtil, have different Class objects for the type Writer;Ljava/lang/String;Ljava/lang/Object;)V used in the signature)
- -->
- <!-- misc -->
- <bundle dependency="true">mvn:org.apache.geronimo.bundles/json/20090211_1</bundle>
- <!-- Apache Commons -->
- <bundle dependency="true">mvn:commons-codec/commons-codec/1.6</bundle>
- <bundle dependency="true">mvn:commons-collections/commons-collections/3.2.1</bundle>
- <bundle dependency="true">mvn:commons-fileupload/commons-fileupload/1.2.2</bundle>
- <bundle dependency="true">mvn:commons-io/commons-io/1.4</bundle>
- <bundle dependency="true">mvn:commons-lang/commons-lang/2.5</bundle>
- <bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
- <!-- Apache Felix Webconsole -->
- <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole/4.0.0</bundle>
- <!-- Apache Felix Webconsole Plugins -->
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.0</bundle>
+ </feature>
+ <!-- javax -->
+ <feature name="javax-sling" version="${project.version}">
+ <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
+ </feature>
+ <!-- Apache Felix Webconsole -->
+ <feature name="webconsole-sling" version="${project.version}">
+ <feature>commons-sling</feature>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole/4.2.0</bundle>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/1.0.0</bundle>
- <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/1.0.2</bundle>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.0</bundle>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.4</bundle>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.0</bundle>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.scriptconsole/1.0.0</bundle>
</feature>
- <feature name="sling-karaf" version="${project.version}">
- <feature>sling-karaf-requirements</feature>
- <!-- Apache Commons -->
+ <!-- Apache Commons -->
+ <feature name="commons-sling" version="${project.version}">
<bundle dependency="true">mvn:commons-codec/commons-codec/1.6</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/3.2.1</bundle>
- <bundle dependency="true">mvn:commons-fileupload/commons-fileupload/1.2.2</bundle>
+ <bundle dependency="true">mvn:commons-fileupload/commons-fileupload/1.3</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/1.4</bundle>
- <bundle dependency="true">mvn:commons-lang/commons-lang/2.5</bundle>
+ <bundle dependency="true">mvn:commons-lang/commons-lang/2.6</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
- <!-- Apache Derby -->
+ </feature>
+ <!-- Apache Derby -->
+ <feature name="derby-sling" version="${project.version}">
<bundle dependency="true">mvn:org.apache.derby/derby/10.5.3.0_1</bundle>
- <!-- Apache Sling -->
- <bundle>mvn:org.apache.sling/org.apache.sling.adapter/2.1.0</bundle>
+ </feature>
+ <!-- Apache Sling -->
+ <feature name="sling" version="${project.version}">
+ <feature version="${project.version}">infrastructure-sling</feature>
+ <feature version="${project.version}">commons-sling</feature>
+ <feature version="${project.version}">javax-sling</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.api/2.4.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.1.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.1.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.2.8</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.event/3.1.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/1.1.2</bundle>
+ <!-- org.apache.sling.resourceresolver requires jcr -->
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.0.6</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.settings/1.2.2</bundle>
- <!-- Apache Sling Auth -->
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.1.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.form/1.0.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.openid/1.0.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.selector/1.0.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.settings/1.3.0</bundle>
<!-- Apache Sling Commons -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.0</bundle>
+ <!-- org.apache.sling.commons.json requires jcr -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.json/2.0.6</bundle>
+ <!-- (not using org.apache.sling.commons.log) -->
+ <!-- (not using org.apache.sling.commons.logservice) -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.osgi/2.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.3.4</bundle>
+ <!-- (not using org.apache.sling.commons.testing) -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.1.0</bundle>
- <!-- Apache Sling Discovery -->
- <!--
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.1-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/0.1.0-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/0.0.1-SNAPSHOT</bundle>
- -->
- <!-- Apache Sling Extensions -->
+ <!-- Apache Sling Launchpad -->
+ <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.api/1.1.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.karaf/${project.version}</bundle>
+ <!-- json -->
+ <bundle dependency="true">mvn:org.apache.geronimo.bundles/json/20090211_1</bundle>
+ </feature>
+ <!-- Apache Sling Auth -->
+ <feature name="sling-auth-form" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.auth.form/1.0.4</bundle>
+ </feature>
+ <feature name="sling-auth-openid" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.auth.openid/1.0.2</bundle>
+ </feature>
+ <feature name="sling-auth-selector" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.auth.selector/1.0.4</bundle>
+ </feature>
+ <!-- Apache Sling Extensions -->
+ <feature name="sling-extension-adapter" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.adapter/2.1.0</bundle>
+ </feature>
+ <feature name="sling-extension-bundleresource" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.1.2</bundle>
+ </feature>
+ <feature name="sling-extension-discovery" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.0</bundle>
+ </feature>
+ <feature name="sling-extension-discovery-impl" version="${project.version}">
+ <feature>sling-extension-discovery</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.0.0</bundle>
+ </feature>
+ <feature name="sling-extension-discovery-standalone" version="${project.version}">
+ <feature version="${project.version}">sling-extension-discovery</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.standalone/1.0.0</bundle>
+ </feature>
+ <feature name="sling-extension-event" version="${project.version}">
+ <feature version="${project.version}">sling-extension-discovery</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.event/3.2.0</bundle>
+ </feature>
+ <feature name="sling-extension-explorer" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.extensions.explorer/1.0.2</bundle>
+ </feature>
+ <feature name="sling-extension-fsresource" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/1.1.2</bundle>
+ </feature>
+ <feature name="sling-extension-groovy" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle dependency="true">mvn:org.codehaus.groovy/groovy-all/1.8.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.extensions.groovy/1.0.0-SNAPSHOT</bundle>
+ </feature>
+ <feature name="sling-extension-threaddump" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2</bundle>
- <!-- Apache Sling Fragments -->
+ </feature>
+ <!-- Apache Sling Fragments -->
+ <feature name="sling-fragments" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.fragment.activation/1.0.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.fragment.transaction/1.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.fragment.ws/1.0.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.fragment.xml/1.0.2</bundle>
- <!-- Apache Sling Installer -->
+ </feature>
+ <!-- Apache Sling Installer -->
+ <feature name="sling-installer" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <!-- api will be merged into core 3.4.8 -->
<bundle>mvn:org.apache.sling/org.apache.sling.installer.api/1.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.console/1.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.core/3.4.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.factory.configuration/1.0.10</bundle>
+ </feature>
+ <feature name="sling-installer-provider-file" version="${project.version}">
+ <feature version="${project.version}">sling-installer</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.file/1.0.2</bundle>
+ </feature>
+ <feature name="sling-installer-provider-jcr" version="${project.version}">
+ <feature version="${project.version}">sling-installer</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.6</bundle>
- <!-- Apache Sling Launchpad -->
- <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.api/1.1.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.karaf/${project.version}</bundle>
- <!-- Apache Sling JCR -->
+ </feature>
+ <!-- Apache Sling Launchpad -->
+ <feature name="sling-launchpad-content" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
+ <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.6</bundle>
+ </feature>
+ <feature name="sling-launchpad-jackrabbit" version="${project.version}">
+ <!-- Sling with Jackrabbit Repository and Felix Web Console -->
+ <feature version="${project.version}">infrastructure-sling</feature>
+ <feature version="${project.version}">webconsole-sling</feature>
+ <feature version="${project.version}">derby-sling</feature>
+ <feature version="${project.version}">sling</feature>
+ <feature version="${project.version}">sling-jcr-jackrabbit</feature>
+ <!-- ... -->
+ <feature version="${project.version}">sling-fragments</feature>
+ <feature version="${project.version}">sling-installer</feature>
+ <feature version="${project.version}">sling-scripting-javascript</feature>
+ <feature version="${project.version}">sling-scripting-jsp</feature>
+ <feature version="${project.version}">sling-extension-adapter</feature>
+ <feature version="${project.version}">sling-extension-bundleresource</feature>
+ </feature>
+ <!-- Apache Sling JCR -->
+ <feature name="sling-jcr" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.1.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/2.1.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.1.12</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.classloader/3.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.1.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.1.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0</bundle>
+ <!-- (not using org.apache.sling.jcr.jcr-wrapper) -->
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.ocm/2.0.4-incubator</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.registration/0.0.1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.resource/2.2.8</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.webconsole/1.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.1.2</bundle>
- <!-- Apache Sling JCR Jackrabbit -->
+ </feature>
+ <!-- Apache Sling JCR Jackrabbit -->
+ <feature name="sling-jcr-jackrabbit" version="${project.version}">
+ <feature version="${project.version}">sling-jcr</feature>
+ <feature version="${project.version}">tika-sling</feature>
+ <feature version="${project.version}">jackrabbit-sling</feature>
+ <feature version="${project.version}">sling-servlets</feature>
+ <!-- org.apache.sling.jcr.jackrabbit.accessmanager requires org.apache.sling.servlets.post -->
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.0</bundle>
- <!-- Apache Sling Scripting -->
+ </feature>
+ <!-- Apache Sling Scripting -->
+ <feature name="sling-scripting" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.1.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.0.24</bundle>
+ </feature>
+ <feature name="sling-scripting-javascript" version="${project.version}">
+ <feature version="${project.version}">sling-scripting</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.javascript/2.0.12</bundle>
+ </feature>
+ <feature name="sling-scripting-jsp" version="${project.version}">
+ <feature version="${project.version}">sling-scripting</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.0.28</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.1.8</bundle>
- <!-- Apache Sling Servlets -->
+ </feature>
+ <!-- Apache Sling Servlets -->
+ <feature name="sling-servlets" version="${project.version}">
+ <feature version="${project.version}">sling</feature>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.4</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.2.4</bundle>
- <!-- Apache Jackrabbit -->
+ </feature>
+ <!-- Apache Jackrabbit -->
+ <feature name="jackrabbit-sling" version="${project.version}">
+ <feature version="${project.version}">javax-sling</feature>
+ <feature version="${project.version}">commons-sling</feature>
<bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/2.4.2</bundle>
<bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.4.2</bundle>
<bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-rmi/2.4.2</bundle>
<bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-spi/2.4.2</bundle>
<bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-spi-commons/2.4.2</bundle>
<bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-webdav/2.4.2</bundle>
- <!-- Apache Tika -->
- <bundle dependency="true">mvn:org.apache.tika/tika-bundle/1.0</bundle>
- <bundle dependency="true">mvn:org.apache.tika/tika-core/1.0</bundle>
- <!-- misc -->
- <bundle dependency="true">mvn:org.apache.geronimo.bundles/json/20090211_1</bundle>
- <bundle dependency="true">mvn:org.codehaus.groovy/groovy-all/1.8.2</bundle>
</feature>
- <feature name="sling-karaf-demo" version="${project.version}">
- <feature>sling-karaf</feature>
- <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.6</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.extensions.explorer/1.0.2</bundle>
+ <!-- Apache Tika -->
+ <feature name="tika-sling" version="${project.version}">
+ <bundle dependency="true">mvn:org.apache.tika/tika-bundle/1.2</bundle>
+ <bundle dependency="true">mvn:org.apache.tika/tika-core/1.2</bundle>
+ </feature>
+ <!-- contrib -->
+ <!-- Apache Sling Extensions -->
+ <feature name="sling-extension-i18n" version="2.2.6">
+ <bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.2.6</bundle>
</feature>
</features>
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1529429&r1=1529428&r2=1529429&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml Sat Oct 5 10:45:43 2013
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.launchpad.karaf-integration-tests</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Launchpad Karaf - Integration Tests</name>
@@ -41,7 +41,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
@@ -63,6 +62,12 @@
<version>2.1.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.engine</artifactId>
+ <version>2.2.6</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -74,12 +79,12 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -138,7 +143,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.15</version>
+ <version>2.16</version>
<executions>
<execution>
<goals>
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.java?rev=1529429&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.java (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingIT.java Sat Oct 5 10:45:43 2013
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.karaf.tests;
+
+import java.io.File;
+
+import javax.inject.Inject;
+
+import org.apache.sling.engine.SlingRequestProcessor;
+import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.ops4j.pax.exam.util.Filter;
+
+import static org.junit.Assert.assertNotNull;
+import static org.ops4j.pax.exam.CoreOptions.bundle;
+import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class BootstrapSlingIT extends KarafTestSupport {
+
+ @Inject
+ @Filter(timeout = 300000)
+ public SlingRequestProcessor slingRequestProcessor;
+
+ @Configuration
+ public Option[] configuration() {
+ return new Option[]{
+ karafDistributionConfiguration().frameworkUrl(maven().groupId(karafGroupId()).artifactId(karafArtifactId()).version(karafVersion()).type("tar.gz")).karafVersion(karafVersion()).name(karafName()).unpackDirectory(new File("target/paxexam/")),
+ keepRuntimeFolder(),
+ logLevel(LogLevelOption.LogLevel.INFO),
+ editConfigurationFileExtend("etc/org.apache.karaf.features.cfg", "featuresRepositories", ",mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.1-SNAPSHOT/xml/features"),
+ editConfigurationFileExtend("etc/org.apache.karaf.features.cfg", "featuresBoot", ",sling"),
+ bundle("file:target/org.apache.sling.launchpad.karaf-integration-tests-0.1.1-SNAPSHOT.jar")
+ };
+ }
+
+ @Test
+ public void testSlingRequestProcessor() throws Exception {
+ assertNotNull(slingRequestProcessor);
+ }
+
+}
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.java?rev=1529429&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.java (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/BootstrapSlingLaunchpadJackrabbitIT.java Sat Oct 5 10:45:43 2013
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.karaf.tests;
+
+import java.io.File;
+
+import javax.inject.Inject;
+import javax.jcr.Session;
+
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.ops4j.pax.exam.util.Filter;
+
+import static org.junit.Assert.assertNotNull;
+import static org.ops4j.pax.exam.CoreOptions.bundle;
+import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class BootstrapSlingLaunchpadJackrabbitIT extends KarafTestSupport {
+
+ @Inject
+ @Filter(timeout = 300000)
+ public SlingRepository slingRepository;
+
+ @Configuration
+ public Option[] configuration() {
+ return new Option[]{
+ karafDistributionConfiguration().frameworkUrl(maven().groupId(karafGroupId()).artifactId(karafArtifactId()).version(karafVersion()).type("tar.gz")).karafVersion(karafVersion()).name(karafName()).unpackDirectory(new File("target/paxexam/")),
+ keepRuntimeFolder(),
+ logLevel(LogLevelOption.LogLevel.INFO),
+ editConfigurationFileExtend("etc/org.apache.karaf.features.cfg", "featuresRepositories", ",mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.1-SNAPSHOT/xml/features"),
+ editConfigurationFileExtend("etc/org.apache.karaf.features.cfg", "featuresBoot", ",sling-launchpad-jackrabbit"),
+ bundle("file:target/org.apache.sling.launchpad.karaf-integration-tests-0.1.1-SNAPSHOT.jar")
+ };
+ }
+
+ @Test
+ public void testSlingRepository() throws Exception {
+ assertNotNull(slingRepository);
+ }
+
+ @Test
+ public void testVarSlingExists() throws Exception {
+ final Session session = slingRepository.loginAdministrative(null);
+ session.getRootNode().getNode("var/sling");
+ session.logout();
+ }
+
+}
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml?rev=1529429&r1=1529428&r2=1529429&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml Sat Oct 5 10:45:43 2013
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.launchpad.karaf</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Launchpad Karaf</name>
@@ -56,7 +56,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.4</version>
<scope>provided</scope>
</dependency>
<!-- logging -->
@@ -76,15 +75,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-Category>sling</Bundle-Category>
<Bundle-Description>${project.description}</Bundle-Description>
+ <Bundle-DocURL>http://sling.apache.org</Bundle-DocURL>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.13.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>