Author: cziegeler
Date: Mon Apr 22 09:05:32 2013
New Revision: 1470415
URL: http://svn.apache.org/r1470415
Log:
SLING-2807 : remove create-karaf-descriptor from org.apache.sling.launchpad,
contrib/servicemix-feature and contrib/launchpad/smx-kernel. Apply patch from
Oliver Lietz
Removed:
sling/trunk/contrib/launchpad/smx-kernel/LICENSE
sling/trunk/contrib/launchpad/smx-kernel/NOTICE
sling/trunk/contrib/launchpad/smx-kernel/README.txt
sling/trunk/contrib/launchpad/smx-kernel/pom.xml
sling/trunk/contrib/launchpad/smx-kernel/src/main/filtered-resources/features.xml
sling/trunk/contrib/servicemix-feature/pom.xml
Modified:
sling/trunk/contrib/pom.xml
sling/trunk/launchpad/builder/README.txt
sling/trunk/launchpad/builder/pom.xml
Modified: sling/trunk/contrib/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=1470415&r1=1470414&r2=1470415&view=diff
==============================================================================
--- sling/trunk/contrib/pom.xml (original)
+++ sling/trunk/contrib/pom.xml Mon Apr 22 09:05:32 2013
@@ -112,7 +112,6 @@
<module>scripting/ruby</module>
<module>scripting/velocity</module>
<module>scripting/xproc</module>
- <module>launchpad/smx-kernel</module>
</modules>
<profiles>
<profile>
Modified: sling/trunk/launchpad/builder/README.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/README.txt?rev=1470415&r1=1470414&r2=1470415&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/README.txt (original)
+++ sling/trunk/launchpad/builder/README.txt Mon Apr 22 09:05:32 2013
@@ -74,33 +74,3 @@ in the top-level directory of the Sling
Deploy target/org.apache.sling.launchpad-6.war to your favorite application
server or servlet container.
-
-How to run the Sling launchpad/builder module in Apache Felix Karaf
-----------------------------------------
-
-1) Build Sling using
-
- mvn clean install
-
-in the top-level directory of the Sling source code.
-
-2) Install Apache Felix Karaf. See details in:
-
- http://felix.apache.org/site/3-installation.html
-
-3) Install the http feature in order to get an HTTP OSGi service available:
-
- karaf@root:/> features:install http
-
-4) Install the webconsole feature in order to get the Felix Web Console
available:
-
- karaf@root:/> features:install webconsole
-
-5) Add the Sling features reposity and install:
-
- karaf@root:/> features:addUrl
mvn:org.apache.sling/org.apache.sling.launchpad/6/xml/features
- karaf@root:/> features:install sling
-
-6) Browse Sling in:
-
- http://localhost:8181
Modified: sling/trunk/launchpad/builder/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1470415&r1=1470414&r2=1470415&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/pom.xml (original)
+++ sling/trunk/launchpad/builder/pom.xml Mon Apr 22 09:05:32 2013
@@ -116,35 +116,6 @@
</goals>
</execution>
<execution>
- <id>create-karaf-descriptor</id>
- <goals>
- <goal>create-karaf-descriptor</goal>
- </goals>
- <configuration>
- <additionalBundles>
- <bundle>
-
<groupId>org.apache.geronimo.specs</groupId>
-
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- </bundle>
- </additionalBundles>
- <bundleExclusions>
- <bundle>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.configadmin</artifactId>
- </bundle>
- <bundle>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.webconsole</artifactId>
- </bundle>
- <bundle>
- <groupId>org.apache.sling</groupId>
-
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- </bundle>
- </bundleExclusions>
- </configuration>
- </execution>
- <execution>
<id>create-bundle-jar</id>
<goals>
<goal>create-bundle-jar</goal>
