Author: rombert
Date: Mon Jul 22 20:18:44 2013
New Revision: 1505793
URL: http://svn.apache.org/r1505793
Log:
SLING-2789 - deploying Sling 7-SNAPSHOT on Karaf fails
Applied SLING-2789.2013-07-17.patch from Oliver Lietz:
* corrected various documentation and legal files
* use a released version of the karaf-maven-plugin
* resync the karaf feature list with the launchpad
* remove unneeded dependency on org.apache.karaf.tooling.exam.options
Modified:
sling/trunk/contrib/launchpad/karaf/NOTICE
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-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
Modified: sling/trunk/contrib/launchpad/karaf/NOTICE
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/NOTICE?rev=1505793&r1=1505792&r2=1505793&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/NOTICE (original)
+++ sling/trunk/contrib/launchpad/karaf/NOTICE Mon Jul 22 20:18:44 2013
@@ -1,9 +1,8 @@
-Apache Sling Launchpad ServiceMix Kernel
-Copyright 2008-2009 The Apache Software Foundation
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
\ No newline at end of file
+Apache Sling Launchpad Karaf
+Copyright 2008-2013 The Apache Software Foundation
+
+Apache Sling is based on source code originally developed
+by Day Software (http://www.day.com/).
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
Modified: sling/trunk/contrib/launchpad/karaf/README.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/README.txt?rev=1505793&r1=1505792&r2=1505793&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/README.txt (original)
+++ sling/trunk/contrib/launchpad/karaf/README.txt Mon Jul 22 20:18:44 2013
@@ -1,10 +1,10 @@
Apache Sling Launchpad Karaf
-Builds a repository of features that allows an easy deployment of Apache Sling
-on Apache Felix Karaf [1]. See [2] for details.
+A repository of features and a startup handler that allow an easy deployment
+of Apache Sling on Apache Karaf [1]. See [2] for details.
-[1] http://felix.apache.org/site/apache-felix-karaf.html
-[2] http://felix.apache.org/site/46-provisioning.html
+[1] http://karaf.apache.org
+[2] http://karaf.apache.org/manual/latest/users-guide/provisioning.html
Getting Started
===============
@@ -13,15 +13,15 @@ This component uses a Maven 2 (http://ma
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.
-If you have Maven 2 installed, you can install locally
-the features repository using the following command:
+If you have Maven 2 installed, you can install locally the features repository
+and startup handler using the following command:
mvn clean install
See the Maven 2 documentation for other build features.
The latest source code for this component is available in the
-Subversion (http://subversion.tigris.org/) source repository of
+Subversion (http://subversion.apache.org/) source repository of
the Apache Software Foundation. If you have Subversion installed,
you can checkout the latest source using the following command:
@@ -33,28 +33,19 @@ See the Subversion documentation for oth
How to deploy this
-------------------
-1) Install Apache Felix Karaf. See details in:
+1) Start Apache Karaf. See details in:
- http://felix.apache.org/site/3-installation.html
+ http://karaf.apache.org/manual/latest/quick-start.html
-2) Deploy your favourite JTA bundle specification. Apache Karaf recommends
- geronimo-jta_1.1_spec-1.1.1. From smx console:
-
- karaf@root:/> osgi:install
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1
+2) Add the Apache Sling features repository and install:
- Start the bundle just installed:
+ karaf@root()> feature:repo-add
mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.0.BUILD-SNAPSHOT/xml/features
+ karaf@root()> feature:install sling-karaf
- karaf@root:/> osgi:start <bundle-pid>
-
-3) Install the http feature in order to get an HTTP OSGi service available:
-
- karaf@root:/> features:install http
+3) Install Launchpad content and Explorer:
-4) Add the Sling features reposity and install:
+ karaf@root()> feature:install sling-karaf-demo
- karaf@root:/> features:addUrl
mvn:org.apache.sling/org.apache.sling.launchpad.karaf/1.0.0-SNAPSHOT/xml/features
- karaf@root:/> features:install sling
-
-5) Browse Sling in:
+4) Browse to:
- http://localhost:8181/
\ No newline at end of file
+ http://localhost:8181/
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=1505793&r1=1505792&r2=1505793&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
Mon Jul 22 20:18:44 2013
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.RC1</version>
<extensions>true</extensions>
</plugin>
</plugins>
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=1505793&r1=1505792&r2=1505793&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
Mon Jul 22 20:18:44 2013
@@ -22,13 +22,13 @@
<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_1</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.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.memoryusage/1.0.2</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>
</feature>
<feature name="sling-karaf" version="0.1.0.BUILD-SNAPSHOT">
@@ -40,21 +40,21 @@
<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_1</bundle>
+ <bundle
dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
<!-- Apache Derby -->
<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>
- <bundle>mvn:org.apache.sling/org.apache.sling.api/2.3.0</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.1.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.engine/2.2.6</bundle>
+ <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.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.0</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.0.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/1.1.2</bundle>
+
<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.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.auth.form/1.0.2</bundle>
+ <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>
<!-- Apache Sling Commons -->
@@ -64,6 +64,12 @@
<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>
<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 -->
<bundle>mvn:org.apache.sling/org.apache.sling.extensions.groovy/1.0.0-SNAPSHOT</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2</bundle>
@@ -91,7 +97,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0</bundle>
<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.4</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 -->
@@ -103,12 +109,12 @@
<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>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.javascript/2.0.12</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.0.26</bundle>
+ <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 -->
<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.2.0</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.2.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.0</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.2.4</bundle>
<!-- Apache Jackrabbit -->
<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>
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=1505793&r1=1505792&r2=1505793&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
Mon Jul 22 20:18:44 2013
@@ -94,12 +94,6 @@
<version>3.8.0.v20120529-1548</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.tooling.exam</groupId>
- <artifactId>org.apache.karaf.tooling.exam.options</artifactId>
- <version>3.0.0.RC1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.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/BootstrapTest.java?rev=1505793&r1=1505792&r2=1505793&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
Mon Jul 22 20:18:44 2013
@@ -22,7 +22,6 @@ import java.io.File;
import javax.inject.Inject;
-import org.apache.karaf.tooling.exam.options.LogLevelOption;
import org.apache.sling.jcr.api.SlingRepository;
import org.junit.Ignore;
import org.junit.Test;
@@ -30,17 +29,18 @@ 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.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFileExtend;
-import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFilePut;
-import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
-import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
-import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
import static org.junit.Assert.assertNotNull;
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.editConfigurationFilePut;
+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)
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=1505793&r1=1505792&r2=1505793&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
Mon Jul 22 20:18:44 2013
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.0</version>
+ <version>1.9.4</version>
<scope>provided</scope>
</dependency>
<!-- logging -->
@@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -84,12 +84,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.11.0</version>
+ <version>1.13.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
