The following commit has been merged in the master branch:
commit b29eee4ff155e4976e84ffc77d4c2206957b1e03
Author: Damien Raude-Morvan <draz...@debian.org>
Date: Mon Nov 7 21:28:34 2011 +0100
Install a 'felix-framework' cli tool to start felix.
diff --git a/debian/changelog b/debian/changelog
index 7e9d3bd..fbc79a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ felix-main (4.0.1-1) UNRELEASED; urgency=low
* New felix-main package:
- d/control: Depends on libfelix-gogo-*-java.
- d/felix-main.*: Install and links to /usr/share/felix-main/.
+ - d/felix-framework.*: Install a 'felix-framework' cli tool to start felix.
- -- Damien Raude-Morvan <draz...@debian.org> Sun, 06 Nov 2011 20:23:29 +0100
+ -- Damien Raude-Morvan <draz...@debian.org> Mon, 07 Nov 2011 21:07:59 +0100
felix-main (2.0.5-2) unstable; urgency=low
diff --git a/debian/felix-framework.1 b/debian/felix-framework.1
new file mode 100644
index 0000000..1126206
--- /dev/null
+++ b/debian/felix-framework.1
@@ -0,0 +1,38 @@
+.TH FELIX "1" "November 2011" "Felix" "User Commands"
+.SH NAME
+felix-framework - command line Felix OSGi Framework launcher
+.SH SYNOPSIS
+.B felix-framework [-b \fI<bundle-deploy-dir>\fR] [\fI<bundle-cache-dir>\fR]
+.SH DESCRIPTION
+.B felix-framework
+provide a way to start Apache Felix OSGi Framework from command line.
+After startup, it provide some simple commands to help management of OSGi
bundle.
+.SH OPTIONS
+.IP "-b bundle-deploy-dir"
+The Felix launcher deploys all bundles in the auto-deploy directory into the
+framework instance during startup. By default, the auto-deploy directory is
+.I /usr/share/felix-framework/bundle/
+.
+Specifying an auto-deploy directory replaces the default directory,
+it does not augment it.
+.IP "bundle-cache-dir"
+path you want to use as the bundle cache. If you specify a relative cache path,
+then it will be treated as relative to
+.I ~/.felix/
+.
+By default, felix-framework will use
+.I ~/.felix/felix-cache/
+.SH FILES
+.I /etc/felix-framework/config.properties
+.RS
+The system wide configuration file for Felix Framework. See
+<URL:http://felix.apache.org/site/apache-felix-framework-configuration-properties.html>
+for further details.
+.SH FILES
+.I ~/.felix/
+.RS
+Default user cache directory for OSGi bundle information.
+.SH AUTHOR
+Damien Raude-Morvan <draz...@debian.org>
+.SH "SEE ALSO"
+<URL:http://felix.apache.org/site/apache-felix-framework-usage-documentation.html>
diff --git a/debian/felix-framework.sh b/debian/felix-framework.sh
new file mode 100755
index 0000000..c105f8d
--- /dev/null
+++ b/debian/felix-framework.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+FELIX_HOME="/usr/share/felix-framework"
+FELIX_CONF="/etc/felix-framework/config.properties"
+FELIX_OPTS=""
+JAVA_OPTS="-Dfelix.config.properties=file:$FELIX_CONF"
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+# We need a java5 runtime
+find_java_runtime java5 java6 java7
+
+exec $JAVA_HOME/bin/java $JAVA_OPTS -jar $FELIX_HOME/bin/felix.jar $FELIX_OPTS
"$@"
+
+
diff --git a/debian/felix-main.manpages b/debian/felix-main.manpages
new file mode 100644
index 0000000..23497a4
--- /dev/null
+++ b/debian/felix-main.manpages
@@ -0,0 +1 @@
+debian/felix-framework.1
\ No newline at end of file
diff --git a/debian/patches/default_usr_locations.diff
b/debian/patches/default_usr_locations.diff
new file mode 100644
index 0000000..969f770
--- /dev/null
+++ b/debian/patches/default_usr_locations.diff
@@ -0,0 +1,28 @@
+Description: Set some default values inside config.properties for
+ system wide installation.
+Author: Damien Raude-Morvan <draz...@debian.org>
+Last-Update: 2011-11-07
+Forwarded: not-needed
+
+Index: b/src/main/resources/config.properties
+===================================================================
+--- a/src/main/resources/config.properties
++++ b/src/main/resources/config.properties
+@@ -46,7 +46,7 @@
+ # location into an absolute one by specifying the root to prepend to
+ # the relative cache path. The default for this property is the
+ # current working directory.
+-#felix.cache.rootdir=${dollar}{user.dir}
++felix.cache.rootdir=${dollar}{user.home}/.felix
+
+ # The following property controls whether the bundle cache is flushed
+ # the first time the framework is initialized. Possible values are
+@@ -71,7 +71,7 @@
+
+ # The following property specifies the directory to use as the bundle
+ # auto-deploy directory; the default is 'bundle' in the working directory.
+-#felix.auto.deploy.dir=bundle
++felix.auto.deploy.dir=/usr/share/felix-framework/bundle/
+
+ # The following property is a space-delimited list of bundle URLs
+ # to install when the framework starts. The ending numerical component
diff --git a/debian/patches/series b/debian/patches/series
index 1274845..bb2ef2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
# Only for bootstrapping
#bootstrap_packaging_jar.diff
#default_version.diff
+default_usr_locations.diff
diff --git a/debian/rules b/debian/rules
index 3c07322..029e135 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,10 @@ include /usr/share/cdbs/1/class/maven.mk
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
+DEB_DESTDIR = $(CURDIR)/debian/felix-main
+
+install/felix-main::
+ install -m 755 -D debian/felix-framework.sh
$(DEB_DESTDIR)/usr/bin/felix-framework
get-orig-source:
uscan \
--
felix-main packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
