You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2013/04/22 11:15:01 UTC
svn commit: r1470417 - in /sling/trunk/contrib: ./ launchpad/karaf/
launchpad/karaf/org.apache.sling.launchpad.karaf-features/
launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/
launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/...
Author: cziegeler
Date: Mon Apr 22 09:15:01 2013
New Revision: 1470417
URL: http://svn.apache.org/r1470417
Log:
SLING-2789 : deploying Sling 7-SNAPSHOT on Karaf fails . Apply patch from Oliver Lietz
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml (with props)
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml (with props)
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml (with props)
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java (with props)
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/KarafTestSupport.java (with props)
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml (with props)
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/KarafStartupHandler.java (with props)
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/metatype.properties (with props)
Removed:
sling/trunk/contrib/launchpad/karaf/src/main/filtered-resources/features.xml
Modified:
sling/trunk/contrib/launchpad/karaf/pom.xml
sling/trunk/contrib/pom.xml
Added: 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=1470417&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml Mon Apr 22 09:15:01 2013
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>15</version>
+ <relativePath>../../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.launchpad.karaf-features</artifactId>
+ <version>0.1.0.BUILD-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name>Apache Sling Launchpad Karaf - Features</name>
+ <description>Apache Sling Features for provisioning with Apache Karaf</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.apache.repository.snapshots</id>
+ <url>https://repository.apache.org/content/groups/snapshots-group/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+</project>
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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=1470417&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml Mon Apr 22 09:15:01 2013
@@ -0,0 +1,131 @@
+<?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="0.1.0.BUILD-SNAPSHOT">
+ <!-- features (some are part of Karaf's defaults)-->
+ <feature>config</feature>
+ <feature>eventadmin</feature>
+ <feature>scr</feature>
+ <feature>obr</feature>
+ <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_1</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.packageadmin/1.0.0</bundle>
+ </feature>
+ <feature name="sling-karaf" version="0.1.0.BUILD-SNAPSHOT">
+ <feature>sling-karaf-requirements</feature>
+ <!-- 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_1</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.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.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.openid/1.0.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.auth.selector/1.0.4</bundle>
+ <!-- Apache Sling Commons -->
+ <bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.commons.json/2.0.6</bundle>
+ <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>
+ <bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.1.0</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>
+ <!-- Apache Sling Fragments -->
+ <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 -->
+ <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>
+ <bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.file/1.0.2</bundle>
+ <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/0.1.0.BUILD-SNAPSHOT</bundle>
+ <!-- Apache Sling JCR -->
+ <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.contentloader/2.1.7-SNAPSHOT</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>
+ <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.webconsole/1.0.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.1.2</bundle>
+ <!-- Apache Sling JCR Jackrabbit -->
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.0</bundle>
+ <!-- org.apache.sling.jcr.jackrabbit.server 2.1.0 is broken, problems with Tika -->
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.1-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.0</bundle>
+ <!-- Apache Sling Scripting -->
+ <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.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>
+ <!-- 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>
+ <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="0.1.0.BUILD-SNAPSHOT">
+ <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>
+ </feature>
+</features>
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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=1470417&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml Mon Apr 22 09:15:01 2013
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>15</version>
+ <relativePath>../../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.launchpad.karaf-integration-tests</artifactId>
+ <version>0.1.0.BUILD-SNAPSHOT</version>
+
+ <name>Apache Sling Launchpad Karaf - Integration Tests</name>
+ <description>Integration Tests for Apache Sling Launchpad Karaf</description>
+
+ <dependencies>
+ <!-- javax -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Apache Sling -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.api</artifactId>
+ <version>2.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.6</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-karaf</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>tar.gz</type>
+ <version>3.0.0.RC1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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=1470417&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java Mon Apr 22 09:15:01 2013
@@ -0,0 +1,71 @@
+/*
+ * 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;
+
+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;
+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.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;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class BootstrapTest extends KarafTestSupport {
+
+ @Inject
+ @Filter(timeout = 120000)
+ 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.0.BUILD-SNAPSHOT/xml/features"),
+ editConfigurationFileExtend("etc/org.apache.karaf.features.cfg", "featuresBoot", ",sling-karaf"),
+ editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "log4j.rootLogger=DEBUG, sift, osgi:*")
+ };
+ }
+
+ @Ignore
+ @Test
+ public void testSlingRepository() throws Exception {
+ assertNotNull(slingRepository);
+ }
+
+}
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/BootstrapTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/KarafTestSupport.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/KarafTestSupport.java?rev=1470417&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/KarafTestSupport.java (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/KarafTestSupport.java Mon Apr 22 09:15:01 2013
@@ -0,0 +1,59 @@
+/*
+ * 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;
+
+import javax.inject.Inject;
+
+import org.apache.karaf.features.BootFinished;
+import org.ops4j.pax.exam.util.Filter;
+
+public abstract class KarafTestSupport {
+
+ public static final String KARAF_GROUP_ID = "org.apache.karaf";
+
+ public static final String KARAF_ARTIFACT_ID = "apache-karaf";
+
+ public static final String KARAF_VERSION = "3.0.0.RC1";
+
+ public static final String KARAF_NAME = "Apache Karaf";
+
+ @Inject
+ @Filter(timeout = 120000)
+ BootFinished bootFinished;
+
+ protected KarafTestSupport() {
+ }
+
+ public String karafGroupId() {
+ return KARAF_GROUP_ID;
+ }
+
+ public String karafArtifactId() {
+ return KARAF_ARTIFACT_ID;
+ }
+
+ public String karafVersion() {
+ return KARAF_VERSION;
+ }
+
+ public String karafName() {
+ return KARAF_NAME;
+ }
+
+}
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/KarafTestSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/KarafTestSupport.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/KarafTestSupport.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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=1470417&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml Mon Apr 22 09:15:01 2013
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>15</version>
+ <relativePath>../../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.launchpad.karaf</artifactId>
+ <version>0.1.0.BUILD-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Launchpad Karaf</name>
+ <description>Apache Sling Launchpad Karaf</description>
+
+ <properties>
+ <sling.java.version>6</sling.java.version>
+ </properties>
+
+ <dependencies>
+ <!-- Sling -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.api</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Apache Felix -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.9.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Description>${project.description}</Bundle-Description>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>1.11.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/KarafStartupHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/KarafStartupHandler.java?rev=1470417&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/KarafStartupHandler.java (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/KarafStartupHandler.java Mon Apr 22 09:15:01 2013
@@ -0,0 +1,132 @@
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Modified;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.PropertyOption;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.launchpad.api.StartupHandler;
+import org.apache.sling.launchpad.api.StartupMode;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * TODO
+ * figure out when we are finished @see #isFinished()
+ */
+@Component(
+ name = "org.apache.sling.launchpad.karaf.KarafStartupHandler",
+ label = "%org.apache.sling.launchpad.karaf.label",
+ description = "%org.apache.sling.launchpad.karaf.description",
+ metatype = true,
+ immediate = true
+)
+@Service
+@Property(name = Constants.SERVICE_VENDOR, value = "The Apache Software Foundation")
+public class KarafStartupHandler implements StartupHandler {
+
+ private StartupMode startupMode;
+
+ private static final String STARTUP_MODE_INSTALL = "INSTALL";
+
+ private static final String STARTUP_MODE_RESTART = "RESTART";
+
+ private static final String STARTUP_MODE_UPDATE = "UPDATE";
+
+ /**
+ * TODO
+ * until fully figured out what happens on INSTALL we use RESTART even on initial startup as Sling is booting and
+ * running fine on Karaf with RESTART
+ */
+ private static final String DEFAULT_STARTUP_MODE = STARTUP_MODE_RESTART;
+
+ @Property(
+ value = DEFAULT_STARTUP_MODE,
+ options = {
+ @PropertyOption(name = STARTUP_MODE_INSTALL, value = "install"),
+ @PropertyOption(name = STARTUP_MODE_RESTART, value = "restart"),
+ @PropertyOption(name = STARTUP_MODE_UPDATE, value = "update")
+ })
+ private static final String STARTUP_MODE_PARAMETER_NAME = "org.apache.sling.launchpad.startupmode";
+
+ private final Logger logger = LoggerFactory.getLogger(KarafStartupHandler.class);
+
+ public KarafStartupHandler() {
+ }
+
+ @Activate
+ private void activate(final BundleContext bundleContext, final Map<String, Object> properties) {
+ logger.info("activate('{}', '{}')", bundleContext, properties);
+ configure(properties);
+ }
+
+ @Modified
+ private void modified(Map<String, Object> properties) {
+ logger.info("modified('{}')", properties);
+ configure(properties);
+ }
+
+ @Deactivate
+ private void deactivate(final BundleContext bundleContext) {
+ logger.info("deactivate('{}')", bundleContext);
+ }
+
+ private void configure(Map<String, Object> properties) {
+ logger.info("configure('{}')", properties);
+ if (properties == null) {
+ properties = new HashMap<String, Object>();
+ }
+ // startup mode
+ String startupMode = (String) properties.get(STARTUP_MODE_PARAMETER_NAME);
+ if (startupMode == null) {
+ startupMode = DEFAULT_STARTUP_MODE;
+ }
+ this.startupMode = StartupMode.valueOf(startupMode);
+ logger.info("configured startup mode: {}", this.startupMode);
+ }
+
+ @Override
+ public StartupMode getMode() {
+ logger.info("getMode(): {}", startupMode);
+ return startupMode;
+ }
+
+ // TODO
+ @Override
+ public boolean isFinished() {
+ logger.info("isFinished()");
+ return true;
+ }
+
+ // TODO
+ @Override
+ public void waitWithStartup(boolean flag) {
+ logger.info("waitWithStartup({})", flag);
+ }
+
+}
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/KarafStartupHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/KarafStartupHandler.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/java/org/apache/sling/launchpad/karaf/KarafStartupHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1470417&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/metatype.properties Mon Apr 22 09:15:01 2013
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+org.apache.sling.launchpad.karaf.label = Apache Sling Launchpad for Karaf
+org.apache.sling.launchpad.karaf.description = Startup handler for Apache Karaf
+org.apache.sling.launchpad.startupmode.name = Startup Mode
+org.apache.sling.launchpad.startupmode.description = the Startup Mode for Sling Launchpad
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/metatype.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/metatype.properties
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf/src/main/resources/OSGI-INF/metatype/metatype.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: sling/trunk/contrib/launchpad/karaf/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/pom.xml?rev=1470417&r1=1470416&r2=1470417&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/pom.xml Mon Apr 22 09:15:01 2013
@@ -17,90 +17,33 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>15</version>
- <relativePath>../../../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.sling.launchpad.karaf</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>Apache Sling Features for Apache Felix Karaf</name>
- <description>
- Builds a repository of features that allows an easy
- deployment of Apache Sling on Apache Felix Karaf.
- </description>
- <scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/launchpad/karaf
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/launchpad/karaf
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf
- </url>
- </scm>
-
- <build>
-
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/filtered-resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/classes/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>15</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>sling-launchpad-karaf-builder</artifactId>
+ <version>1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Apache Sling Launchpad Karaf Builder</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/launchpad/karaf</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/launchpad/karaf</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf</url>
+ </scm>
+
+ <modules>
+ <module>org.apache.sling.launchpad.karaf</module>
+ <module>org.apache.sling.launchpad.karaf-features</module>
+ <module>org.apache.sling.launchpad.karaf-integration-tests</module>
+ </modules>
+
</project>
Modified: sling/trunk/contrib/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=1470417&r1=1470416&r2=1470417&view=diff
==============================================================================
--- sling/trunk/contrib/pom.xml (original)
+++ sling/trunk/contrib/pom.xml Mon Apr 22 09:15:01 2013
@@ -103,6 +103,10 @@
<module>jcr/jackrabbit-client</module>
<module>jcr/compiler</module>
<module>jcr/prefs</module>
+ <!--
+ <module>launchpad/karaf</module>
+ -->
+ <module>launchpad/testing</module>
<module>scripting/script-console</module>
<module>scripting/jsp-taglib-atom</module>
<module>scripting/freemarker</module>