Author: clement
Date: Wed Apr 28 06:15:21 2010
New Revision: 938795
URL: http://svn.apache.org/viewvc?rev=938795&view=rev
Log:
update to the latest ipojo and felix
Added:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/bnd-0.0.401.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/hello.client.annotation.bnd
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/hello.impl.annotation.bnd
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/hello.service.bnd
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.249.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.2.0.jar
(with props)
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar
(with props)
Removed:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.2.1.jar
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.2.jar
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/doc/
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/ipojo/
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/bnd-0.0.249.jar
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/org.apache.felix.ipojo.ant-1.4.2.jar
Modified:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bin/felix.jar
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/conf/config.properties
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker.gui/build.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/build.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.english/build.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.services/build.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker.gui/build.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker/build.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.english/build.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.services/build.xml
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/metadata.xml
Modified:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bin/felix.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bin/felix.jar?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
Binary files - no diff available.
Added:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.4.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.ipojo-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.ipojo.arch-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell-1.4.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/bundle/org.apache.felix.shell.tui-1.4.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/conf/config.properties
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/conf/config.properties?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/conf/config.properties
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/felix/conf/config.properties
Wed Apr 28 06:15:21 2010
@@ -31,50 +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: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
Modified:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker.gui/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker.gui/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker.gui/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker.gui/build.xml
Wed Apr 28 06:15:21 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/10.minutes.tutorial/solution/spell.checker/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/build.xml
Wed Apr 28 06:15:21 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/10.minutes.tutorial/solution/spell.english/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.english/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.english/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.english/build.xml
Wed Apr 28 06:15:21 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/10.minutes.tutorial/solution/spell.services/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.services/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.services/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.services/build.xml
Wed Apr 28 06:15:21 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}"/>
Modified:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker.gui/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker.gui/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker.gui/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker.gui/build.xml
Wed Apr 28 06:15:21 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/10.minutes.tutorial/spell.checker/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker/build.xml
Wed Apr 28 06:15:21 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/10.minutes.tutorial/spell.english/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.english/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.english/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.english/build.xml
Wed Apr 28 06:15:21 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/10.minutes.tutorial/spell.services/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.services/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.services/build.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.services/build.xml
Wed Apr 28 06:15:21 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/10.minutes.tutorial/tasks/bnd-0.0.401.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/bnd-0.0.401.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/bnd-0.0.401.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/tasks/org.apache.felix.ipojo.ant-1.6.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/build.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/build.xml
(original)
+++ felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/build.xml Wed Apr
28 06:15:21 2010
@@ -1,11 +1,20 @@
<?xml version="1.0"?>
-<project name="annotation.tutorial" default="dist" basedir=".">
+<project name="annotation.tutorial" default="package" basedir=".">
<target name="clean">
<!-- clean Felix cache -->
<delete dir="felix/felix-cache"/>
+ <ant dir="hello.service" target="clean"/>
+ <ant dir="hello.impl.annotation" target="clean"/>
+ <ant dir="hello.client.annotation" target="clean"/>
+ </target>
+
+ <target name="package">
+ <ant dir="hello.service"/>
+ <ant dir="hello.impl.annotation"/>
+ <ant dir="hello.client.annotation"/>
</target>
<target name="dist" depends="clean">
@@ -14,7 +23,6 @@
<zip destfile="dist/annotation-tutorial.zip">
<fileset dir=".">
<exclude name="dist/"/>
- <exclude name="build.xml"/>
<exclude name="*/target/"/>
<exclude name=".*"/>
<exclude name="*/_*"/>
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml?rev=938795&view=auto
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml
(added)
+++
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml
Wed Apr 28 06:15:21 2010
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+
+<project name="hello.client.annotation" default="package" basedir=".">
+
+ <property name="src.dir" value="src"/>
+ <property name="build.dir" value="target/classes"/>
+ <property name="output.dir" value="target"/>
+ <property name="bundle.name" value="hello.client.annotation-1.0.0.jar"/>
+
+ <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.2.0.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ >
+ <classpath>
+ <filelist>
+ <file
name="${basedir}/../hello.service/target/hello.service-1.0.0.jar"/>
+ <file
name="${basedir}/../tasks/org.apache.felix.ipojo.annotations-1.2.0.jar"/>
+ </filelist>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="package" depends="compile">
+ <bnd
+ classpath="${build.dir}"
+ failok="false"
+ exceptions="true"
+ files="${ant.project.name}.bnd"
+ output="${output.dir}/${bundle.name}"/>
+
+ <ipojo
+ input="${output.dir}/${bundle.name}"
+ metadata="metadata.xml"
+ />
+ </target>
+
+</project>
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/hello.client.annotation.bnd
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/hello.client.annotation.bnd?rev=938795&view=auto
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/hello.client.annotation.bnd
(added)
+++
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/hello.client.annotation.bnd
Wed Apr 28 06:15:21 2010
@@ -0,0 +1 @@
+Private-Package: ipojo.example.hello.client
\ No newline at end of file
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.client.annotation/hello.client.annotation.bnd
------------------------------------------------------------------------------
svn:executable = *
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml?rev=938795&view=auto
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml
(added)
+++
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml
Wed Apr 28 06:15:21 2010
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<project name="hello.impl.annotation" default="package" basedir=".">
+
+ <property name="src.dir" value="src"/>
+ <property name="build.dir" value="target/classes"/>
+ <property name="output.dir" value="target"/>
+ <property name="bundle.name" value="hello.impl.annotation-1.0.0.jar"/>
+
+ <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.2.0.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ >
+ <classpath>
+ <filelist>
+ <file
name="${basedir}/../hello.service/target/hello.service-1.0.0.jar"/>
+ <file
name="${basedir}/../tasks/org.apache.felix.ipojo.annotations-1.2.0.jar"/>
+ </filelist>
+ </classpath>
+ </javac>
+
+ </target>
+
+ <target name="package" depends="compile">
+ <bnd
+ classpath="${build.dir}"
+ failok="false"
+ exceptions="true"
+ files="${ant.project.name}.bnd"
+ output="${output.dir}/${bundle.name}"/>
+
+ <ipojo
+ input="${output.dir}/${bundle.name}"
+ metadata="metadata.xml"
+ />
+ </target>
+
+</project>
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/hello.impl.annotation.bnd
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/hello.impl.annotation.bnd?rev=938795&view=auto
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/hello.impl.annotation.bnd
(added)
+++
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/hello.impl.annotation.bnd
Wed Apr 28 06:15:21 2010
@@ -0,0 +1 @@
+Private-Package: ipojo.example.hello.impl
\ No newline at end of file
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.impl.annotation/hello.impl.annotation.bnd
------------------------------------------------------------------------------
svn:executable = *
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml?rev=938795&view=auto
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml
(added)
+++
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml
Wed Apr 28 06:15:21 2010
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<project name="hello.service" default="package" basedir=".">
+
+ <property name="src.dir" value="src"/>
+ <property name="build.dir" value="target/classes"/>
+ <property name="output.dir" value="target"/>
+ <property name="bundle.name" value="hello.service-1.0.0.jar"/>
+
+
+ <taskdef resource="aQute/bnd/ant/taskdef.properties"
+ classpath="../tasks/bnd-0.0.249.jar"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ />
+ </target>
+
+ <target name="package" depends="compile">
+ <bnd
+ classpath="${build.dir}"
+ failok="false"
+ exceptions="true"
+ files="${ant.project.name}.bnd"
+ output="${output.dir}/${bundle.name}"/>
+ </target>
+
+</project>
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/hello.service.bnd
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/hello.service.bnd?rev=938795&view=auto
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/hello.service.bnd
(added)
+++
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/hello.service.bnd
Wed Apr 28 06:15:21 2010
@@ -0,0 +1 @@
+Export-Package: ipojo.example.hello
\ No newline at end of file
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/hello.service/hello.service.bnd
------------------------------------------------------------------------------
svn:executable = *
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.249.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.249.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/bnd-0.0.249.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.2.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.2.0.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.annotations-1.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar?rev=938795&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
felix/sandbox/clement/ipojo-tutorials/annotation.tutorial/tasks/org.apache.felix.ipojo.ant-1.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/metadata.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/metadata.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/metadata.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/metadata.xml
Wed Apr 28 06:15:21 2010
@@ -9,7 +9,8 @@
<instance component="spell.checker.SpellCheck"/>
<!-- Instantiates an instance of the GUI -->
- <instance component="spell.gui.SpellCheckerGui"/>
+ <!-- <instance component="spell.gui.SpellCheckerGui"/>-->
+ <instance component="my gui"/>
</composite>
<!-- Instantiates an instance of our composition -->
Modified:
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/metadata.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/metadata.xml?rev=938795&r1=938794&r2=938795&view=diff
==============================================================================
---
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/metadata.xml
(original)
+++
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/metadata.xml
Wed Apr 28 06:15:21 2010
@@ -1,5 +1,5 @@
<ipojo>
-<component classname="spell.gui.SpellCheckerGui">
+<component classname="spell.gui.SpellCheckerGui" name="my gui">
<requires field="m_checker"/>
<callback transition="validate" method="start"/>
<callback transition="invalidate" method="stop"/>
