Author: clement
Date: Fri Apr 30 07:18:32 2010
New Revision: 939569
URL: http://svn.apache.org/viewvc?rev=939569&view=rev
Log:
Update tutorial to latest iPOJO, Felix and Config Admin
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.configadmin-1.2.6.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/bnd-0.0.401.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
(with props)
Removed:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.configadmin-1.0.10.jar
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/doc/
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/ipojo/
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/bnd-0.0.249.jar
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/org.apache.felix.ipojo.ant-1.4.2.jar
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bin/felix.jar
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/conf/config.properties
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.buns-and-wieners/build.xml
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.corn.transporter/build.xml
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer.creator/build.xml
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer/build.xml
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.hotdog/build.xml
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.popcorn/build.xml
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.services/build.xml
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bin/felix.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bin/felix.jar?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
Binary files - no diff available.
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar?rev=939569&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.configadmin-1.2.6.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.configadmin-1.2.6.jar?rev=939569&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.configadmin-1.2.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar?rev=939569&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar?rev=939569&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar?rev=939569&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar?rev=939569&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/conf/config.properties
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/conf/config.properties?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/conf/config.properties
(original)
+++
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/felix/conf/config.properties
Fri Apr 30 07:18:32 2010
@@ -31,51 +31,70 @@
# available to all bundles. You should avoid using this property.
#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+# Felix tries to guess when to implicitly boot delegate in certain
+# situations to ease integration without outside code. This feature
+# is enabled by default, uncomment the following line to disable it.
+#felix.bootdelegation.implicit=false
+
# The following property explicitly specifies the location of the bundle
# cache, which defaults to "felix-cache" in the current working directory.
# If this value is not absolute, then the felix.cache.rootdir controls
# how the absolute location is calculated. (See next property)
-#org.osgi.framework.storage=${felix.cache.rootdir}/felix-cache
+#org.osgi.framework.storage=${dollar}{felix.cache.rootdir}/felix-cache
# The following property is used to convert a relative bundle cache
# 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=${user.dir}
+#felix.cache.rootdir=${dollar}{user.dir}
# The following property controls whether the bundle cache is flushed
# the first time the framework is initialized. Possible values are
# "none" and "onFirstInit"; the default is "none".
-org.osgi.framework.storage.clean=onFirstInit
+#org.osgi.framework.storage.clean=onFirstInit
-felix.auto.start.1= \
- file:bundle/org.apache.felix.shell-1.0.2.jar \
- file:bundle/org.apache.felix.shell.tui-1.0.2.jar \
- file:bundle/org.apache.felix.bundlerepository-1.2.1.jar \
- file:bundle/org.apache.felix.configadmin-1.0.10.jar \
- file:ipojo/org.apache.felix.ipojo-1.4.0.jar \
- file:ipojo/org.apache.felix.ipojo.arch-1.4.0.jar
+# The following property determines which actions are performed when
+# processing the auto-deploy directory. It is a comma-delimited list of
+# the following values: 'install', 'start', 'update', and 'uninstall'.
+# An undefined or blank value is equivalent to disabling auto-deploy
+# processing.
+felix.auto.deploy.action=install,start
+
+# 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
+
+# The following property is a space-delimited list of bundle URLs
+# to install when the framework starts. The ending numerical component
+# is the target start level. Any number of these properties may be
+# specified for different start levels.
+#felix.auto.install.1=
+
+# The following property is a space-delimited list of bundle URLs
+# to install and start when the framework starts. The ending numerical
+# component is the target start level. Any number of these properties
+# may be specified for different start levels.
+#felix.auto.start.1=
felix.log.level=1
# Sets the initial start level of the framework upon startup.
-#org.osgi.framework.startlevel=1
+#org.osgi.framework.startlevel.beginning=1
# Sets the start level of newly installed bundles.
#felix.startlevel.bundle=1
-# Invalid fragment bundles throw an 'exception' by default, but
-# uncomment the follow line to have them log a 'warning' instead.
-#felix.fragment.validation=warning
-
# Felix installs a stream and content handler factories by default,
# uncomment the following line to not install them.
#felix.service.urlhandlers=false
+# The launcher registers a shutdown hook to cleanly stop the framework
+# by default, uncomment the following line to disable it.
+#felix.shutdown.hook=false
+
#
# Bundle config properties.
#
org.osgi.service.http.port=8080
-osgi.shell.telnet=on
obr.repository.url=http://felix.apache.org/obr/releases.xml
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/bnd-0.0.401.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/bnd-0.0.401.jar?rev=939569&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/bnd-0.0.401.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar?rev=939569&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.buns-and-wieners/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.buns-and-wieners/build.xml?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.buns-and-wieners/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.buns-and-wieners/build.xml
Fri Apr 30 07:18:32 2010
@@ -8,8 +8,8 @@
<property name="output.dir" value="output"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
- <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.4.2.jar"
+ classpath="../tasks/bnd-0.0.401.jar"/>
+ <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.6.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
<target name="clean">
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.corn.transporter/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.corn.transporter/build.xml?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.corn.transporter/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.corn.transporter/build.xml
Fri Apr 30 07:18:32 2010
@@ -8,8 +8,8 @@
<property name="output.dir" value="output" />
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
- <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.4.2.jar"
+ classpath="../tasks/bnd-0.0.401.jar"/>
+ <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.6.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
<target name="clean">
@@ -25,7 +25,7 @@
<javac srcdir="${src.dir}" destdir="${build.dir}" debug="on">
<classpath>
- <pathelement
location="../felix/bundle/org.apache.felix.configadmin-1.0.10.jar" />
+ <pathelement
location="../felix/bundle/org.apache.felix.configadmin-1.2.6.jar" />
</classpath>
</javac>
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer.creator/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer.creator/build.xml?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer.creator/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer.creator/build.xml
Fri Apr 30 07:18:32 2010
@@ -8,8 +8,8 @@
<property name="output.dir" value="output"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
- <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.4.2.jar"
+ classpath="../tasks/bnd-0.0.401.jar"/>
+ <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.6.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
<target name="clean">
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer/build.xml?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.customer/build.xml
Fri Apr 30 07:18:32 2010
@@ -8,8 +8,8 @@
<property name="output.dir" value="output"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
- <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.4.2.jar"
+ classpath="../tasks/bnd-0.0.401.jar"/>
+ <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.6.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
<target name="clean">
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.hotdog/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.hotdog/build.xml?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.hotdog/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.hotdog/build.xml
Fri Apr 30 07:18:32 2010
@@ -8,8 +8,8 @@
<property name="output.dir" value="output"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
- <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.4.2.jar"
+ classpath="../tasks/bnd-0.0.401.jar"/>
+ <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.6.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
<target name="clean">
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.popcorn/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.popcorn/build.xml?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.popcorn/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.popcorn/build.xml
Fri Apr 30 07:18:32 2010
@@ -8,8 +8,8 @@
<property name="output.dir" value="output"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
- <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.4.2.jar"
+ classpath="../tasks/bnd-0.0.401.jar"/>
+ <taskdef name="ipojo"
classpath="../tasks/org.apache.felix.ipojo.ant-1.6.0.jar"
classname="org.apache.felix.ipojo.task.IPojoTask"/>
<target name="clean">
Modified:
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.services/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.services/build.xml?rev=939569&r1=939568&r2=939569&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.services/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/advanced.tutorial/vendor.services/build.xml
Fri Apr 30 07:18:32 2010
@@ -8,7 +8,7 @@
<property name="output.dir" value="output"/>
<taskdef resource="aQute/bnd/ant/taskdef.properties"
- classpath="../tasks/bnd-0.0.249.jar"/>
+ classpath="../tasks/bnd-0.0.401.jar"/>
<target name="clean">
<delete dir="${build.dir}"/>
