You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2015/04/03 11:23:32 UTC
svn commit: r1671021 - in /sling/trunk/contrib: ./ launchpad/debian/
launchpad/debian/src/root_fs/etc/default/
launchpad/debian/src/root_fs/etc/init.d/ sling-s3/crank.d/ sling-s3/scripts/
Author: tomekr
Date: Fri Apr 3 09:23:32 2015
New Revision: 1671021
URL: http://svn.apache.org/r1671021
Log:
SLING-4517 Add warning if there is no runmode selected. Re-enabled debian package in the contrib pom.xml. Added oak-s3 to the contrib pom.xml
Modified:
sling/trunk/contrib/launchpad/debian/README.md
sling/trunk/contrib/launchpad/debian/pom.xml
sling/trunk/contrib/launchpad/debian/src/root_fs/etc/default/sling
sling/trunk/contrib/launchpad/debian/src/root_fs/etc/init.d/sling
sling/trunk/contrib/pom.xml
sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt
sling/trunk/contrib/sling-s3/scripts/download_dependencies.rb
Modified: sling/trunk/contrib/launchpad/debian/README.md
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/debian/README.md?rev=1671021&r1=1671020&r2=1671021&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/debian/README.md (original)
+++ sling/trunk/contrib/launchpad/debian/README.md Fri Apr 3 09:23:32 2015
@@ -22,11 +22,17 @@ Supported run modes are:
Each of these are supported by building crank files using the sling-s3 module to aggregate configuration templates into usable configurations.
* SLING_EXEC=/opt/sling - Location for all binaries & scripts.
-* SLING_CFG=/etc/sling - Tree of config file templates from which final.crantstart files are built. Editing any of these config templates triggers a rebuild of the target/crank* files.
+* SLING_CFG=/etc/sling - Tree of config file templates from which final.crantstart files are built. Editing any of these config templates triggers a rebuild of the target/crank\* files.
* SLING_DEFAULTS=/etc/default/sling - Defaults file for location & path setup and to override any of the crank settings.
* SLING_DATA=/var/lib/sling - Local sling data dir.
* SLING_LOG_DIR=/var/log/sling - Sling log data.
+Additional bundles can be loaded in any of the defined runmodes by creating packages containing the crankstart config and dependent jars:
+/etc/sling/crank\*/\*.txt - crankstart commands required
+/opt/sling/contrib.<package-name> - additional bundle dependencies
+
+At start time, all /etc/sling/crank*/*.txt files are concatenated as defined by the /etc/sling/Makefile and sling is started with the runmode defined in /etc/default/sling. The init script link all the jars into one repo folder.
+
TODO:
* Support clustered configurations.
Modified: sling/trunk/contrib/launchpad/debian/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/debian/pom.xml?rev=1671021&r1=1671020&r2=1671021&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/debian/pom.xml (original)
+++ sling/trunk/contrib/launchpad/debian/pom.xml Fri Apr 3 09:23:32 2015
@@ -133,9 +133,9 @@ under the License.
<goal>jdeb</goal>
</goals>
<configuration>
- <classifier>all</classifier>
<snapshotExpand>true</snapshotExpand>
<snapshotEnv>BUILD_NUMBER</snapshotEnv>
+ <classifier>all</classifier>
<dataSet>
<!-- etc/{default,logrotate.d}/sling - conf files -->
<data>
Modified: sling/trunk/contrib/launchpad/debian/src/root_fs/etc/default/sling
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/debian/src/root_fs/etc/default/sling?rev=1671021&r1=1671020&r2=1671021&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/debian/src/root_fs/etc/default/sling (original)
+++ sling/trunk/contrib/launchpad/debian/src/root_fs/etc/default/sling Fri Apr 3 09:23:32 2015
@@ -63,9 +63,6 @@ SLING_DATA=/var/lib/sling
SLING_LOG_DIR=/var/log/sling
START_LOG_FILE=$SLING_LOG_DIR/startup.log
-
-# Define where to load dependencies from
-M2REPO="${SLING_EXEC}/contrib"
SLING_SCRIPTS=${SLING_EXEC}/scripts
CRANKSTART_ENV=${SLING_SCRIPTS}/crankstart.sh
Modified: sling/trunk/contrib/launchpad/debian/src/root_fs/etc/init.d/sling
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/debian/src/root_fs/etc/init.d/sling?rev=1671021&r1=1671020&r2=1671021&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/debian/src/root_fs/etc/init.d/sling (original)
+++ sling/trunk/contrib/launchpad/debian/src/root_fs/etc/init.d/sling Fri Apr 3 09:23:32 2015
@@ -60,13 +60,29 @@ function start () {
if [ ! "${RUNMODE}" ] ; then
log_warning_msg "RUNMODE is not set in ${SLING_DEFAULTS}"
+ exit -1
fi
check_sling_permissions
# Get MVN_OPTS from crankstart env file.
- [ -r $CRANKSTART_ENV ] && . $CRANKSTART_ENV
- CRANKSTART_JAR=${M2REPO}/crankstart.jar
+ if [ -r $CRANKSTART_ENV ] ; then
+ # Other packages can use ${SLING_EXEC}.${artifactId}
+ # for dependencies to avoid name collisions.
+ # All will be aggregated here to provide a fully
+ # populated local repo.
+ M2REPO=${SLING_EXEC}/repo
+ rm -rf ${M2REPO}
+ install -d --owner=sling --group=sling ${M2REPO}
+ for f in ${SLING_EXEC}/contrib* ; do
+ sudo -u sling -s cp -sRf $f/* ${M2REPO}
+ done
+ . $CRANKSTART_ENV
+ else
+ log_failure_msg "Missing $CRANKSTART_ENV file, cannot read crankstart env settings."
+ exit -1
+ fi
+ CRANKSTART_JAR=${SLING_EXEC}/contrib/crankstart.jar
# Update crankstart file if needed
log_daemon_msg "Starting sling serices"
Modified: sling/trunk/contrib/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/pom.xml?rev=1671021&r1=1671020&r2=1671021&view=diff
==============================================================================
--- sling/trunk/contrib/pom.xml (original)
+++ sling/trunk/contrib/pom.xml Fri Apr 3 09:23:32 2015
@@ -109,6 +109,7 @@
<module>extensions/distribution/core</module>
<module>extensions/distribution/sample</module>
<module>extensions/distribution/it</module>
+ <module>extensions/oak-s3</module>
<module>extensions/reqanalyzer</module>
<module>extensions/resourcemerger</module>
<module>extensions/rewriter</module>
@@ -137,7 +138,7 @@
<module>scripting/xproc</module>
<module>launchpad/karaf</module>
<module>launchpad/testing</module>
- <!--module>launchpad/debian</module-->
+ <module>launchpad/debian</module>
</modules>
<profiles>
<profile>
Modified: sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt?rev=1671021&r1=1671020&r2=1671021&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt (original)
+++ sling/trunk/contrib/sling-s3/crank.d/55-sling-startlevel-0.txt Fri Apr 3 09:23:32 2015
@@ -10,7 +10,7 @@ bundle mvn:org.apache.servicemix.bundles
bundle mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_1
bundle mvn:org.apache.httpcomponents/httpcore-osgi/4.4
bundle mvn:org.apache.httpcomponents/httpclient-osgi/4.4
-bundle mvn:org.apache.sling/org.apache.sling.commons.osgi/2.2.2
+bundle mvn:org.apache.sling/org.apache.sling.commons.osgi/2.2.3-SNAPSHOT
bundle mvn:org.apache.sling/org.apache.sling.commons.mime/2.1.8
bundle mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.2
bundle mvn:org.apache.sling/org.apache.sling.commons.compiler/2.2.0
Modified: sling/trunk/contrib/sling-s3/scripts/download_dependencies.rb
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/sling-s3/scripts/download_dependencies.rb?rev=1671021&r1=1671020&r2=1671021&view=diff
==============================================================================
--- sling/trunk/contrib/sling-s3/scripts/download_dependencies.rb (original)
+++ sling/trunk/contrib/sling-s3/scripts/download_dependencies.rb Fri Apr 3 09:23:32 2015
@@ -13,7 +13,7 @@ DEP_PLUGIN = 'org.apache.maven.plugins:m
# Env defaults
$remote_repo = ENV.fetch("REMOTE_REPO",'https://repository.apache.org/content/repositories/snapshots')
-$local_repo = ENV.fetch("LOCAL_REPO",'~/.m2/repository')
+$local_repo = ENV.fetch("LOCAL_REPO", File.expand_path("~/.m2/repository"))
# If set, copy artifacts to OUTPUT location, default is ~/.m2 only
$output = ENV["OUTPUT"]
@@ -27,6 +27,7 @@ end.parse!
puts "local_repo=#{$local_repo}" if $verbose
puts "output=#{$output}" if $verbose
+FileUtils.mkdir_p $output if !$output.nil?
def run cmd
output = ""