svn commit: r1684909 - in /sling/trunk/contrib/crankstart/launcher: ./ src/test/resources/crankstart-model.txt src/test/resources/launchpad-addons.txt

[bd...@apache.org]

Author: bdelacretaz
Date: Thu Jun 11 14:49:09 2015
New Revision: 1684909

URL: http://svn.apache.org/r1684909
Log:
SLING-4728 - work towards passing the Sling Launchpad integration tests

Added:
    sling/trunk/contrib/crankstart/launcher/src/test/resources/launchpad-addons.txt
Modified:
    sling/trunk/contrib/crankstart/launcher/   (props changed)
    sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt

Propchange: sling/trunk/contrib/crankstart/launcher/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 11 14:49:09 2015
@@ -9,5 +9,7 @@ bin
 .externalToolBuilders
 maven-eclipse.xml
 felix-cache
-sling-crankstart
+CRANKSTART
 derby.log
+jackrabbit
+tarmk

Modified: sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt?rev=1684909&r1=1684908&r2=1684909&view=diff
==============================================================================
--- sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt (original)
+++ sling/trunk/contrib/crankstart/launcher/src/test/resources/crankstart-model.txt Thu Jun 11 14:49:09 2015
@@ -22,16 +22,18 @@
 [feature name=:crankstart]
 
 [variables]
-  felix.framework.version=4.4.0
+  felix.framework.version=5.0.0
   slf4j.version = 1.6.2
   http.port = 8080
   osgi.storage.path = CRANKSTART
+  osgi.start.level = 42
   
 [settings]
   org.osgi.service.http.port = ${http.port}
   org.osgi.framework.storage = ${osgi.storage.path}
+  org.osgi.framework.startlevel.beginning = ${osgi.start.level}
   
 [artifacts]
   org.apache.felix/org.apache.felix.framework/${felix.framework.version}
   org.slf4j/slf4j-api/${slf4j.version}
-  org.slf4j/slf4j-simple/${slf4j.version}
\ No newline at end of file
+  org.slf4j/slf4j-simple/${slf4j.version}

Added: sling/trunk/contrib/crankstart/launcher/src/test/resources/launchpad-addons.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/resources/launchpad-addons.txt?rev=1684909&view=auto
==============================================================================
--- sling/trunk/contrib/crankstart/launcher/src/test/resources/launchpad-addons.txt (added)
+++ sling/trunk/contrib/crankstart/launcher/src/test/resources/launchpad-addons.txt Thu Jun 11 14:49:09 2015
@@ -0,0 +1,42 @@
+#
+#  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.
+#
+
+# Additional items needed to be able to start the Sling Launchpad
+# using the :crankstart feature found in this folder + this file + 
+# the standard model from launchpad/builder so that it passes 
+# the Sling integration tests. As of June 11th, 2015 this is
+# not fully working, some integration tests fail. Probably due,
+# at least in part, to run modes not being implemented yet, which
+# means we possibly get conflicting bundles.
+
+[feature name=crankstart.launchpad.addons]
+
+[artifacts]
+  org.apache.sling/org.apache.sling.launchpad.api/1.1.0
+  org.apache.sling/org.apache.sling.launchpad.karaf/0.1.1-SNAPSHOT
+  org.apache.sling/org.apache.sling.launchpad.test-services/2.0.9-SNAPSHOT
+  org.apache.sling/org.apache.sling.junit.core/1.0.10
+
+[configurations]
+  integrationTestsConfig
+    message="This test config should be loaded at startup"
+
+  org.apache.sling.servlets.resolver.SlingServletResolver
+    # Set the servlet resolver's cache size to zero for testing
+    servletresolver.cacheSize=I"0"