You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2010/05/01 13:49:16 UTC
svn commit: r939981 - in
/felix/sandbox/clement/ipojo-tutorials/composite.tutorial: ./ example1/
example2/ example3/ example4/ example5/ felix/ felix/bin/ felix/bundle/
felix/conf/ felix/doc/ felix/ipojo/ spell.checker-v2/ spell.checker.gui/
spell.chec...
Author: clement
Date: Sat May 1 11:49:15 2010
New Revision: 939981
URL: http://svn.apache.org/viewvc?rev=939981&view=rev
Log:
Update iPOJO and Felix versions.
Added:
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo.composite-1.6.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.log-1.0.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/bnd-0.0.401.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.annotations-1.6.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar (with props)
Removed:
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.log-0.9.0-SNAPSHOT.jar
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/doc/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/bnd-0.0.249.jar
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.ant-1.4.2.jar
Modified:
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/ (props changed)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bin/felix.jar
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/config.properties
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/script.txt
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/build.xml
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 1 11:49:15 2010
@@ -2,3 +2,4 @@ bin
dist
.classpath
.project
+.settings
Modified: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/build.xml Sat May 1 11:49:15 2010
@@ -7,8 +7,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/composite.tutorial/example2/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/build.xml Sat May 1 11:49:15 2010
@@ -7,8 +7,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/composite.tutorial/example3/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/build.xml Sat May 1 11:49:15 2010
@@ -7,8 +7,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/composite.tutorial/example4/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/build.xml Sat May 1 11:49:15 2010
@@ -7,8 +7,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/composite.tutorial/example5/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/build.xml Sat May 1 11:49:15 2010
@@ -7,8 +7,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/composite.tutorial/felix/bin/felix.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bin/felix.jar?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
Binary files - no diff available.
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo.composite-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo.composite-1.6.0.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.ipojo.composite-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.log-1.0.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.log-1.0.0.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.log-1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/config.properties
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/config.properties?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/config.properties (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/config.properties Sat May 1 11:49:15 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
-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:ipojo/org.apache.felix.ipojo-1.4.0.jar \
- file:ipojo/org.apache.felix.ipojo.arch-1.4.0.jar \
- file:ipojo/org.apache.felix.ipojo.composite-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
Modified: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/script.txt
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/script.txt?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/script.txt (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/script.txt Sat May 1 11:49:15 2010
@@ -10,7 +10,6 @@ start file:../spell.services/output/spel
start file:../spell.english/output/spell.english.jar
start file:../spell.checker-v2/output/spell.checker-v2.jar
start file:../spell.checker.gui/output/spell.checker.gui.jar
-start file:bundle/org.apache.felix.log-0.9.0-SNAPSHOT.jar
start file:../example2/output/composition2.jar
# Example 3
Modified: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/build.xml Sat May 1 11:49:15 2010
@@ -1,30 +1,30 @@
<?xml version="1.0"?>
<project name="spell.checker-v2" default="package" basedir=".">
-
+
<property name="src.dir" value="src"/>
<property name="lib.dir" value="libs"/>
<property name="build.dir" value="output/classes"/>
<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">
<delete dir="${build.dir}"/>
<delete dir="${output.dir}"/>
<delete dir="${lib.dir}"/>
</target>
-
+
<target name="buildclasspath">
<copy file="../spell.services/output/spell.services.jar" todir="${lib.dir}"/>
- <copy file="../felix/bundle/org.apache.felix.log-0.9.0-SNAPSHOT.jar" todir="${lib.dir}"/>
+ <copy file="../felix/bundle/org.apache.felix.log-1.0.0.jar" todir="${lib.dir}"/>
<copy file="../felix/bin/felix.jar" todir="${lib.dir}"/>
</target>
-
-
+
+
<target name="compile" depends="clean, buildclasspath">
<mkdir dir="${output.dir}"/>
@@ -39,19 +39,19 @@
<include name="**/*.jar"/>
</fileset>
</classpath>
-
+
</javac>
</target>
<target name="package" depends="compile">
<bnd
- classpath="${build.dir}"
- failok="false"
- exceptions="true"
+ classpath="${build.dir}"
+ failok="false"
+ exceptions="true"
files="${ant.project.name}.bnd"
output="${output.dir}"/>
-
+
<ipojo
input="${output.dir}/${ant.project.name}.jar"
metadata="metadata.xml"
Modified: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/build.xml Sat May 1 11:49:15 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/composite.tutorial/spell.checker/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/build.xml Sat May 1 11:49:15 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/composite.tutorial/spell.english/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/build.xml Sat May 1 11:49:15 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/composite.tutorial/spell.french/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/build.xml Sat May 1 11:49:15 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/composite.tutorial/spell.services/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/build.xml?rev=939981&r1=939980&r2=939981&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/build.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/build.xml Sat May 1 11:49:15 2010
@@ -7,7 +7,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}"/>
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/bnd-0.0.401.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/bnd-0.0.401.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/bnd-0.0.401.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.annotations-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.annotations-1.6.0.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.annotations-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar?rev=939981&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream