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 2008/10/17 19:04:06 UTC
svn commit: r705672 [1/2] - in /felix/sandbox/clement/ipojo-tutorials:
10.minutes.tutorial/solution/spell.checker/
10.minutes.tutorial/solution/spell.checker/src/spell/check/
10.minutes.tutorial/solution/spell.checker/src/spell/checker/
10.minutes.tuto...
Author: clement
Date: Fri Oct 17 10:04:04 2008
New Revision: 705672
URL: http://svn.apache.org/viewvc?rev=705672&view=rev
Log:
Updates the 10 minutes tutorial (apply changes made on the wiki (better package name)).
Commit the composite tutorial
Added:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/checker/ (props changed)
- copied from r676901, felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/check/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/ (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE.kxml2
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/NOTICE
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bin/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bin/felix.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.0.3.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.0.1.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.1.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/config.properties
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo-0.8.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-0.8.0.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo.composite-0.8.1.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.log-0.9.0-SNAPSHOT.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/script.txt
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/ (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/ (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/spell.checker-v2.bnd
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/src/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/src/spell/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/src/spell/checker2/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/src/spell/checker2/SpellCheck.java
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/ (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/spell.checker.gui.bnd
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/src/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/src/spell/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/src/spell/gui/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/src/spell/gui/SpellCheckerGui.java
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/spell.checker.bnd
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/src/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/src/spell/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/src/spell/checker/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/src/spell/checker/SpellCheck.java
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/ (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/spell.english.bnd
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/src/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/src/spell/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/src/spell/english/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/src/spell/english/EnglishDictionary.java
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/ (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/metadata.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/spell.french.bnd
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/src/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/src/spell/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/src/spell/french/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/src/spell/french/FrenchDictionary.java
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/src/spell/french/spell/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.french/src/spell/french/spell/french/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/build.xml
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/spell.services.bnd
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/src/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/src/spell/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/src/spell/services/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/src/spell/services/DictionaryService.java
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.services/src/spell/services/SpellChecker.java
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/bnd-0.0.223.jar (with props)
felix/sandbox/clement/ipojo-tutorials/composite.tutorial/tasks/org.apache.felix.ipojo.ant-0.8.1.jar (with props)
Removed:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/check/
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker/metadata.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/spell.checker/spell.checker.bnd
Modified:
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/metadata.xml
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/spell.checker.bnd
felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/checker/SpellCheck.java
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-Example/ (props changed)
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/Junit-OSGi-Example/ (props changed)
felix/sandbox/clement/ipojo-tutorials/junit4osgi.tutorial/felix/ (props changed)
Modified: felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/metadata.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/metadata.xml?rev=705672&r1=705671&r2=705672&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/metadata.xml (original)
+++ felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/metadata.xml Fri Oct 17 10:04:04 2008
@@ -1,7 +1,7 @@
<ipojo>
-<component classname="spell.check.SpellCheck">
+<component classname="spell.checker.SpellCheck">
<requires field="m_dictionary"/>
<provides/>
</component>
-<instance component="spell.check.SpellCheck"/>
+<instance component="spell.checker.SpellCheck"/>
</ipojo>
\ No newline at end of file
Modified: felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/spell.checker.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/spell.checker.bnd?rev=705672&r1=705671&r2=705672&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/spell.checker.bnd (original)
+++ felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/spell.checker.bnd Fri Oct 17 10:04:04 2008
@@ -1 +1 @@
-Private-Package: spell.check
\ No newline at end of file
+Private-Package: spell.checker
\ No newline at end of file
Propchange: felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/checker/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/checker/SpellCheck.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/checker/SpellCheck.java?rev=705672&r1=676901&r2=705672&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/checker/SpellCheck.java (original)
+++ felix/sandbox/clement/ipojo-tutorials/10.minutes.tutorial/solution/spell.checker/src/spell/checker/SpellCheck.java Fri Oct 17 10:04:04 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package spell.check;
+package spell.checker;
import java.util.ArrayList;
import java.util.List;
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 17 10:04:04 2008
@@ -0,0 +1,4 @@
+bin
+dist
+.classpath
+.project
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/build.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/build.xml?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+
+<project name="spell.checker.composite" default="all" basedir=".">
+
+ <target name="all">
+ <ant dir="spell.services"/>
+ <ant dir="spell.english"/>
+ <ant dir="spell.checker"/>
+ <ant dir="spell.checker.gui"/>
+ <ant dir="spell.french"/>
+ <ant dir="example1"/>
+ <ant dir="spell.checker-v2"/>
+ <ant dir="example2"/>
+ <ant dir="example3"/>
+ <ant dir="example4"/>
+ <ant dir="example5"/>
+ </target>
+
+ <target name="clean">
+ <ant dir="spell.services" target="clean" />
+ <ant dir="spell.english" target="clean" />
+ <ant dir="spell.checker" target="clean" />
+ <ant dir="spell.checker.gui" target="clean" />
+ <ant dir="spell.french" target="clean" />
+ <ant dir="example1" target="clean" />
+ <ant dir="spell.checker-v2" target="clean" />
+ <ant dir="example2" target="clean" />
+ <ant dir="example3" target="clean" />
+ <ant dir="example4" target="clean"/>
+ <ant dir="example5" target="clean"/>
+
+ <!-- clean Felix cache -->
+ <delete dir="felix/cache"/>
+ </target>
+
+ <target name="dist" depends="clean">
+ <delete dir="dist"/>
+ <mkdir dir="dist"/>
+ <zip destfile="dist/composite-tutorial.zip">
+ <fileset dir=".">
+ <exclude name="dist/"/>
+ <exclude name=".*"/>
+ <exclude name="*/_*"/>
+ <exclude name="bin/"/>
+ </fileset>
+ </zip>
+ </target>
+
+</project>
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<project name="composition1" 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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="package">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <jar destfile="${output.dir}/${ant.project.name}.jar">
+ <manifest>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-SymbolicName" value="${ant.project.name}"/>
+ <attribute name="Bundle-Version" value="0"/>
+ </manifest>
+ </jar>
+
+ <ipojo
+ input="${output.dir}/${ant.project.name}.jar"
+ metadata="metadata.xml"
+ />
+ </target>
+
+</project>
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example1/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,18 @@
+<ipojo>
+
+<!-- Declares a composition -->
+<composite name="composition1">
+ <!-- Instantiates an instance of the English dictionary -->
+ <instance component="spell.english.EnglishDictionary"/>
+
+ <!-- Instantiates an instance of the Checker -->
+ <instance component="spell.checker.SpellCheck"/>
+
+ <!-- Instantiates an instance of the GUI -->
+ <instance component="spell.gui.SpellCheckerGui"/>
+</composite>
+
+<!-- Instantiates an instance of our composition -->
+<instance component="composition1"/>
+
+</ipojo>
\ No newline at end of file
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<project name="composition2" 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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="package">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <jar destfile="${output.dir}/${ant.project.name}.jar">
+ <manifest>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-SymbolicName" value="${ant.project.name}"/>
+ <attribute name="Bundle-Version" value="0"/>
+ </manifest>
+ </jar>
+
+ <ipojo
+ input="${output.dir}/${ant.project.name}.jar"
+ metadata="metadata.xml"
+ />
+ </target>
+
+</project>
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/metadata.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/metadata.xml?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example2/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,21 @@
+<ipojo>
+
+<!-- Declares a composition -->
+<composite name="composition2">
+ <!-- Instantiates an instance of the English dictionary -->
+ <instance component="spell.english.EnglishDictionary"/>
+
+ <!-- Instantiates an instance of the Checker -->
+ <instance component="spell.checker.SpellCheck"/>
+
+ <!-- Instantiates an instance of the GUI -->
+ <instance component="spell.gui.SpellCheckerGui"/>
+
+ <!-- Imports the log service -->
+ <subservice action="import" specification="org.osgi.service.log.LogService"/>
+</composite>
+
+<!-- Instantiates an instance of our composition -->
+<instance component="composition2"/>
+
+</ipojo>
\ No newline at end of file
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<project name="composition3" 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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="package">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <jar destfile="${output.dir}/${ant.project.name}.jar">
+ <manifest>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-SymbolicName" value="${ant.project.name}"/>
+ <attribute name="Bundle-Version" value="0"/>
+ </manifest>
+ </jar>
+
+ <ipojo
+ input="${output.dir}/${ant.project.name}.jar"
+ metadata="metadata.xml"
+ />
+ </target>
+
+</project>
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/metadata.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/metadata.xml?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example3/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,18 @@
+<ipojo>
+
+<!-- Declares a composition -->
+<composite name="composition3">
+ <!-- Instantiates an instance of the English dictionary -->
+ <subservice action="instantiate" specification="spell.services.DictionaryService"/>
+
+ <!-- Instantiates an instance of the Checker -->
+ <instance component="spell.checker.SpellCheck"/>
+
+ <!-- Instantiates an instance of the GUI -->
+ <instance component="spell.gui.SpellCheckerGui"/>
+</composite>
+
+<!-- Instantiates an instance of our composition -->
+<instance component="composition3"/>
+
+</ipojo>
\ No newline at end of file
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<project name="composition4" 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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="package">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <jar destfile="${output.dir}/${ant.project.name}.jar">
+ <manifest>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-SymbolicName" value="${ant.project.name}"/>
+ <attribute name="Bundle-Version" value="0"/>
+ </manifest>
+ </jar>
+
+ <ipojo
+ input="${output.dir}/${ant.project.name}.jar"
+ metadata="metadata.xml"
+ />
+ </target>
+
+</project>
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/metadata.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/metadata.xml?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example4/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,21 @@
+<ipojo>
+
+<!-- Declares a composition -->
+<composite name="composition4">
+ <!-- Instantiates an instance of the English dictionary -->
+ <subservice action="instantiate" specification="spell.services.DictionaryService"/>
+
+ <!-- Instantiates an instance of the Checker -->
+ <instance component="spell.checker.SpellCheck"/>
+
+ <!-- Exports the SpellChecker service -->
+ <provides action="export" specification="spell.services.SpellChecker"/>
+</composite>
+
+<!-- Instantiates an instance of our composition -->
+<instance component="composition4"/>
+
+<!-- Instantiates an instance of the GUI in the global context -->
+<instance component="spell.gui.SpellCheckerGui"/>
+
+</ipojo>
\ No newline at end of file
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<project name="composition5" 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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="package">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <jar destfile="${output.dir}/${ant.project.name}.jar">
+ <manifest>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-SymbolicName" value="${ant.project.name}"/>
+ <attribute name="Bundle-Version" value="0"/>
+ </manifest>
+ </jar>
+
+ <ipojo
+ input="${output.dir}/${ant.project.name}.jar"
+ metadata="metadata.xml"
+ />
+ </target>
+
+</project>
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/metadata.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/metadata.xml?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/example5/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,32 @@
+<ipojo>
+
+<!-- Declare the same composition than the latest one -->
+<composite name="composition4">
+ <!-- Instantiates an instance of the English dictionary -->
+ <subservice action="instantiate" specification="spell.services.DictionaryService"/>
+
+ <!-- Instantiates an instance of the Checker -->
+ <instance component="spell.checker.SpellCheck"/>
+
+ <!-- Exports the SpellChecker service -->
+ <provides action="export" specification="spell.services.SpellChecker"/>
+</composite>
+
+<!-- Declares another composition containing an instance of the previous
+ composition and an instance of the GUI
+ -->
+<composite name="composition5">
+ <!-- Instantiates the previous composition
+ You can access to composition by following the
+ same way as for other types
+ -->
+ <instance component="composition4"/>
+
+ <!-- Instantiates an instance of the GUI in the composite -->
+<instance component="spell.gui.SpellCheckerGui"/>
+</composite>
+
+<!-- Instantiates an instance of our composition -->
+<instance component="composition5"/>
+
+</ipojo>
\ No newline at end of file
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE Fri Oct 17 10:04:04 2008
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE.kxml2
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE.kxml2?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE.kxml2 (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/LICENSE.kxml2 Fri Oct 17 10:04:04 2008
@@ -0,0 +1,19 @@
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/NOTICE
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/NOTICE?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/NOTICE (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/NOTICE Fri Oct 17 10:04:04 2008
@@ -0,0 +1,30 @@
+Apache Felix Main
+Copyright 2008 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 The OSGi Alliance.
+Licensed under the Apache License 2.0.
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 The OSGi Alliance.
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
+- BSD License
Added: 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=705672&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bin/felix.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.0.3.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.0.3.jar?rev=705672&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.bundlerepository-1.0.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.0.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.0.1.jar?rev=705672&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.1.jar?rev=705672&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/bundle/org.apache.felix.shell.tui-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/config.properties (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/conf/config.properties Fri Oct 17 10:04:04 2008
@@ -0,0 +1,479 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
+ org.osgi.service.packageadmin; version=1.2.0, \
+ org.osgi.service.startlevel; version=1.0.0, \
+ org.osgi.service.url; version=1.0.0, \
+ org.osgi.util.tracker; version=1.3.2 \
+ ${jre-${java.specification.version}}
+
+#org.osgi.framework.bootdelegation=sun.*,com.sun.*
+#felix.cache.profile=foo
+felix.cache.dir=cache
+felix.auto.start.1= \
+ file:bundle/org.apache.felix.shell-1.0.1.jar \
+ file:bundle/org.apache.felix.shell.tui-1.0.1.jar \
+ file:bundle/org.apache.felix.bundlerepository-1.0.3.jar \
+ file:ipojo/org.apache.felix.ipojo-0.8.0.jar \
+ file:ipojo/org.apache.felix.ipojo.composite-0.8.1.jar
+felix.log.level=4
+felix.startlevel.framework=1
+felix.startlevel.bundle=1
+#felix.service.urlhandlers=false
+
+#
+# Bundle config properties.
+#
+org.osgi.service.http.port=8080
+osgi.shell.telnet=on
+#obr.repository.url=http://bundles.osgi.org/obr/browse?_xml=1&cmd=repository
+
+
+#
+# Java platform package export properties.
+#
+jre-1.3=, \
+ javax.accessibility; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.transaction; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ version="1.3.0"
+
+jre-1.4=, \
+ javax.accessibility; \
+ javax.crypto; \
+ javax.crypto.interfaces; \
+ javax.crypto.spec; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.net; \
+ javax.net.ssl; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.transaction; \
+ javax.transaction.xa; \
+ javax.xml.parsers; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stream; \
+ org.ietf.jgss; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ version="1.4.0"
+
+jre-1.5=, \
+ javax.accessibility; \
+ javax.activity; \
+ javax.crypto; \
+ javax.crypto.interfaces; \
+ javax.crypto.spec; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.bmp; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.net; \
+ javax.net.ssl; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.rmi.ssl; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.security.sasl; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.sql.rowset; \
+ javax.sql.rowset.serial; \
+ javax.sql.rowset.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.plaf.synth; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.transaction; \
+ javax.transaction.xa; \
+ javax.xml; \
+ javax.xml.datatype; \
+ javax.xml.namespace; \
+ javax.xml.parsers; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stream; \
+ javax.xml.validation; \
+ javax.xml.xpath; \
+ org.ietf.jgss; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.omg.stub.javax.management.remote.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.bootstrap; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.ls; \
+ org.w3c.dom.ranges; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ version="1.5.0"
+
+jre-1.6=, \
+ javax.accessibility; \
+ javax.activation; \
+ javax.activity; \
+ javax.annotation; \
+ javax.annotation.processing; \
+ javax.crypto; \
+ javax.crypto.interfaces; \
+ javax.crypto.spec; \
+ javax.imageio; \
+ javax.imageio.event; \
+ javax.imageio.metadata; \
+ javax.imageio.plugins.bmp; \
+ javax.imageio.plugins.jpeg; \
+ javax.imageio.spi; \
+ javax.imageio.stream; \
+ javax.jws; \
+ javax.jws.soap; \
+ javax.lang.model; \
+ javax.lang.model.element; \
+ javax.lang.model.type; \
+ javax.lang.model.util; \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.naming.event; \
+ javax.naming.ldap; \
+ javax.naming.spi; \
+ javax.net; \
+ javax.net.ssl; \
+ javax.print; \
+ javax.print.attribute; \
+ javax.print.attribute.standard; \
+ javax.print.event; \
+ javax.rmi; \
+ javax.rmi.CORBA; \
+ javax.rmi.ssl; \
+ javax.script; \
+ javax.security.auth; \
+ javax.security.auth.callback; \
+ javax.security.auth.kerberos; \
+ javax.security.auth.login; \
+ javax.security.auth.spi; \
+ javax.security.auth.x500; \
+ javax.security.cert; \
+ javax.security.sasl; \
+ javax.sound.midi; \
+ javax.sound.midi.spi; \
+ javax.sound.sampled; \
+ javax.sound.sampled.spi; \
+ javax.sql; \
+ javax.sql.rowset; \
+ javax.sql.rowset.serial; \
+ javax.sql.rowset.spi; \
+ javax.swing; \
+ javax.swing.border; \
+ javax.swing.colorchooser; \
+ javax.swing.event; \
+ javax.swing.filechooser; \
+ javax.swing.plaf; \
+ javax.swing.plaf.basic; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.multi; \
+ javax.swing.plaf.synth; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.swing.text.html.parser; \
+ javax.swing.text.rtf; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.tools; \
+ javax.transaction; \
+ javax.transaction.xa; \
+ javax.xml; \
+ javax.xml.bind; \
+ javax.xml.bind.annotation; \
+ javax.xml.bind.annotation.adapters; \
+ javax.xml.bind.attachment; \
+ javax.xml.bind.helpers; \
+ javax.xml.bind.util; \
+ javax.xml.crypto; \
+ javax.xml.crypto.dom; \
+ javax.xml.crypto.dsig; \
+ javax.xml.crypto.dsig.dom; \
+ javax.xml.crypto.dsig.keyinfo; \
+ javax.xml.crypto.dsig.spec; \
+ javax.xml.datatype; \
+ javax.xml.namespace; \
+ javax.xml.parsers; \
+ javax.xml.soap; \
+ javax.xml.stream; \
+ javax.xml.stream.events; \
+ javax.xml.stream.util; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.sax; \
+ javax.xml.transform.stax; \
+ javax.xml.transform.stream; \
+ javax.xml.validation; \
+ javax.xml.ws; \
+ javax.xml.ws.handler; \
+ javax.xml.ws.handler.soap; \
+ javax.xml.ws.http; \
+ javax.xml.ws.soap; \
+ javax.xml.ws.spi; \
+ javax.xml.xpath; \
+ org.ietf.jgss; \
+ org.omg.CORBA; \
+ org.omg.CORBA_2_3; \
+ org.omg.CORBA_2_3.portable; \
+ org.omg.CORBA.DynAnyPackage; \
+ org.omg.CORBA.ORBPackage; \
+ org.omg.CORBA.portable; \
+ org.omg.CORBA.TypeCodePackage; \
+ org.omg.CosNaming; \
+ org.omg.CosNaming.NamingContextExtPackage; \
+ org.omg.CosNaming.NamingContextPackage; \
+ org.omg.Dynamic; \
+ org.omg.DynamicAny; \
+ org.omg.DynamicAny.DynAnyFactoryPackage; \
+ org.omg.DynamicAny.DynAnyPackage; \
+ org.omg.IOP; \
+ org.omg.IOP.CodecFactoryPackage; \
+ org.omg.IOP.CodecPackage; \
+ org.omg.Messaging; \
+ org.omg.PortableInterceptor; \
+ org.omg.PortableInterceptor.ORBInitInfoPackage; \
+ org.omg.PortableServer; \
+ org.omg.PortableServer.CurrentPackage; \
+ org.omg.PortableServer.POAManagerPackage; \
+ org.omg.PortableServer.POAPackage; \
+ org.omg.PortableServer.portable; \
+ org.omg.PortableServer.ServantLocatorPackage; \
+ org.omg.SendingContext; \
+ org.omg.stub.java.rmi; \
+ org.omg.stub.javax.management.remote.rmi; \
+ org.w3c.dom; \
+ org.w3c.dom.bootstrap; \
+ org.w3c.dom.css; \
+ org.w3c.dom.events; \
+ org.w3c.dom.html; \
+ org.w3c.dom.ls; \
+ org.w3c.dom.ranges; \
+ org.w3c.dom.stylesheets; \
+ org.w3c.dom.traversal; \
+ org.w3c.dom.views; \
+ org.w3c.dom.xpath; \
+ org.xml.sax; \
+ org.xml.sax.ext; \
+ org.xml.sax.helpers; \
+ version=\"1.6.0\"
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo-0.8.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo-0.8.0.jar?rev=705672&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo-0.8.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-0.8.0.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-0.8.0.jar?rev=705672&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo.arch-0.8.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo.composite-0.8.1.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo.composite-0.8.1.jar?rev=705672&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.ipojo.composite-0.8.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.log-0.9.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.log-0.9.0-SNAPSHOT.jar?rev=705672&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/ipojo/org.apache.felix.log-0.9.0-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/script.txt (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/felix/script.txt Fri Oct 17 10:04:04 2008
@@ -0,0 +1,40 @@
+# Example 1
+start file:../spell.services/output/spell.services.jar
+start file:../spell.english/output/spell.english.jar
+start file:../spell.checker/output/spell.checker.jar
+start file:../spell.checker.gui/output/spell.checker.gui.jar
+start file:../example1/output/composition1.jar
+
+# Example 2
+start file:../spell.services/output/spell.services.jar
+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:ipojo/org.apache.felix.log-0.9.0-SNAPSHOT.jar
+start file:../example2/output/composition2.jar
+
+# Example 3
+start file:../spell.services/output/spell.services.jar
+start file:../spell.english/output/spell.english.jar
+start file:../spell.checker/output/spell.checker.jar
+start file:../spell.checker.gui/output/spell.checker.gui.jar
+start file:../example3/output/composition3.jar
+
+start file:../spell.french/output/spell.french.jar
+
+# Example 4
+start file:../spell.services/output/spell.services.jar
+start file:../spell.english/output/spell.english.jar
+start file:../spell.checker/output/spell.checker.jar
+start file:../spell.checker.gui/output/spell.checker.gui.jar
+start file:../example4/output/composition4.jar
+
+# Example 5
+start file:../spell.services/output/spell.services.jar
+start file:../spell.english/output/spell.english.jar
+start file:../spell.checker/output/spell.checker.jar
+start file:../spell.checker.gui/output/spell.checker.gui.jar
+start file:../example5/output/composition5.jar
+
+
+
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 17 10:04:04 2008
@@ -0,0 +1 @@
+libs
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 17 10:04:04 2008
@@ -0,0 +1 @@
+libs
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,60 @@
+<?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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="buildclasspath">
+ <copy file="../spell.services/output/spell.services.jar" todir="${lib.dir}"/>
+ <copy file="../felix/ipojo/org.apache.felix.log-0.9.0-SNAPSHOT.jar" todir="${lib.dir}"/>
+ <copy file="../felix/bin/felix.jar" todir="${lib.dir}"/>
+ </target>
+
+
+
+ <target name="compile" depends="clean, buildclasspath">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ >
+ <classpath>
+ <fileset dir="libs">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+
+ </javac>
+
+ </target>
+
+ <target name="package" depends="compile">
+ <bnd
+ 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"
+ />
+ </target>
+
+</project>
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/metadata.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/metadata.xml?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,7 @@
+<ipojo>
+<component classname="spell.checker2.SpellCheck" name="spell.checker.SpellCheck">
+ <requires field="m_log"/>
+ <requires field="m_dictionary"/>
+ <provides/>
+</component>
+</ipojo>
\ No newline at end of file
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/spell.checker-v2.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/spell.checker-v2.bnd?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/spell.checker-v2.bnd (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/spell.checker-v2.bnd Fri Oct 17 10:04:04 2008
@@ -0,0 +1,2 @@
+Private-Package: spell.checker2
+Bundle-Version: 2.0
\ No newline at end of file
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/src/spell/checker2/SpellCheck.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/src/spell/checker2/SpellCheck.java?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/src/spell/checker2/SpellCheck.java (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker-v2/src/spell/checker2/SpellCheck.java Fri Oct 17 10:04:04 2008
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package spell.checker2;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.osgi.service.log.LogService;
+
+import spell.services.DictionaryService;
+import spell.services.SpellChecker;
+
+public class SpellCheck implements SpellChecker {
+
+ private LogService m_log;
+
+ private DictionaryService m_dictionary;
+
+ /**
+ * Implements SpellChecker.check(). Checks the given passage for misspelled words.
+ * @param passage the passage to spell check.
+ * @return An array of misspelled words or null if no words are misspelled.
+ */
+ public String[] check(String passage) {
+ // No misspelled words for an empty string.
+ if ((passage == null) || (passage.length() == 0)) { return null; }
+
+ List errorList = new ArrayList();
+
+ // Tokenize the passage using spaces and punctuation.
+ StringTokenizer st = new StringTokenizer(passage, " ,.!?;:");
+
+ // Loop through each word in the passage.
+ while (st.hasMoreTokens()) {
+ String word = st.nextToken();
+
+ // Check the current word.
+ if (! m_dictionary.checkWord(word)) {
+ // If the word is not correct, then add it
+ // to the incorrect word list.
+ errorList.add(word);
+ }
+ }
+
+ // Return null if no words are incorrect.
+ if (errorList.size() == 0) { return null; }
+
+ // Return the array of incorrect words
+ m_log.log(LogService.LOG_ERROR, "Wrong words : " + errorList);
+ return (String[]) errorList.toArray(new String[errorList.size()]);
+ }
+}
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 17 10:04:04 2008
@@ -0,0 +1 @@
+libs
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<project name="spell.checker.gui" 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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="buildclasspath">
+ <copy file="../spell.services/output/spell.services.jar" todir="${lib.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean, buildclasspath">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ classpath="libs/spell.services.jar"
+ />
+
+ </target>
+
+ <target name="package" depends="compile">
+ <bnd
+ 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"
+ />
+ </target>
+
+</project>
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,7 @@
+<ipojo>
+<component classname="spell.gui.SpellCheckerGui">
+ <requires field="m_checker"/>
+ <callback transition="validate" method="start"/>
+ <callback transition="invalidate" method="stop"/>
+</component>
+</ipojo>
\ No newline at end of file
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/spell.checker.gui.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/spell.checker.gui.bnd?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/spell.checker.gui.bnd (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/spell.checker.gui.bnd Fri Oct 17 10:04:04 2008
@@ -0,0 +1 @@
+Private-Package: spell.gui
\ No newline at end of file
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/src/spell/gui/SpellCheckerGui.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/src/spell/gui/SpellCheckerGui.java?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/src/spell/gui/SpellCheckerGui.java (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker.gui/src/spell/gui/SpellCheckerGui.java Fri Oct 17 10:04:04 2008
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package spell.gui;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+import spell.services.SpellChecker;
+
+/**
+ * A very simple Gui interacting with the CheckSpeller service
+
+ */
+public class SpellCheckerGui extends JFrame {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Swing component where the user write the passage to check.
+ */
+ private JTextField m_passage = null;
+
+ /**
+ * Check button
+ */
+ private JButton m_checkButton = null;
+
+ /**
+ * Area where the result is displayed.
+ */
+ private JLabel m_result = null;
+
+ /**
+ * Service dependency on the SpellChecker.
+ */
+ private SpellChecker m_checker;
+
+ /**
+ * Constructor.
+ * Initialize the GUI.
+ */
+ public SpellCheckerGui() {
+ super();
+ initComponents();
+ this.setTitle("Spellchecker Gui");
+ }
+
+ /**
+ * Initialize the Swing Gui.
+ */
+ private void initComponents() {
+ java.awt.GridBagConstraints gridBagConstraints;
+
+ m_checkButton = new javax.swing.JButton();
+ m_result = new javax.swing.JLabel();
+ m_passage = new javax.swing.JTextField();
+
+ setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); // Stop Felix...
+ getContentPane().setLayout(new java.awt.GridBagLayout());
+
+ m_checkButton.setText("Check");
+ m_checkButton.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ check();
+ }
+ });
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
+ getContentPane().add(m_checkButton, gridBagConstraints);
+
+ m_result.setPreferredSize(new java.awt.Dimension(175, 20));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 2;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
+ getContentPane().add(m_result, gridBagConstraints);
+
+ m_passage.setPreferredSize(new java.awt.Dimension(175, 20));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
+ getContentPane().add(m_passage, gridBagConstraints);
+
+ pack();
+ }
+
+ /**
+ * Check Button action.
+ * Collects the user input and checks it.
+ */
+ private void check() {
+ String[] result = m_checker.check(m_passage.getText());
+ if (result != null) {
+ m_result.setText(result.length + " word(s) are mispelled");
+ } else {
+ m_result.setText("All words are correct");
+ }
+ }
+
+ /**
+ * Start callback.
+ * This method will be called when the instance becomes valid.
+ * It set the Gui visibility to true.
+ */
+ public void start() {
+ this.setVisible(true);
+ }
+
+ /**
+ * Stop callback.
+ * This method will be called when the instance becomes invalid or stops.
+ * It deletes the Gui.
+ */
+ public void stop() {
+ this.dispose();
+ }
+}
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<project name="spell.checker" 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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="buildclasspath">
+ <copy file="../spell.services/output/spell.services.jar" todir="${lib.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean, buildclasspath">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ classpath="libs/spell.services.jar"
+ />
+
+ </target>
+
+ <target name="package" depends="compile">
+ <bnd
+ 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"
+ />
+ </target>
+
+</project>
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/metadata.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/metadata.xml?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,6 @@
+<ipojo>
+<component classname="spell.checker.SpellCheck">
+ <requires field="m_dictionary"/>
+ <provides/>
+</component>
+</ipojo>
\ No newline at end of file
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/spell.checker.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/spell.checker.bnd?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/spell.checker.bnd (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/spell.checker.bnd Fri Oct 17 10:04:04 2008
@@ -0,0 +1 @@
+Private-Package: spell.checker
\ No newline at end of file
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/src/spell/checker/SpellCheck.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/src/spell/checker/SpellCheck.java?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/src/spell/checker/SpellCheck.java (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.checker/src/spell/checker/SpellCheck.java Fri Oct 17 10:04:04 2008
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package spell.checker;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import spell.services.DictionaryService;
+import spell.services.SpellChecker;
+
+public class SpellCheck implements SpellChecker {
+
+ private DictionaryService m_dictionary;
+
+ /**
+ * Implements SpellChecker.check(). Checks the given passage for misspelled words.
+ * @param passage the passage to spell check.
+ * @return An array of misspelled words or null if no words are misspelled.
+ */
+ public String[] check(String passage) {
+ // No misspelled words for an empty string.
+ if ((passage == null) || (passage.length() == 0)) { return null; }
+
+ List errorList = new ArrayList();
+
+ // Tokenize the passage using spaces and punctuation.
+ StringTokenizer st = new StringTokenizer(passage, " ,.!?;:");
+
+ // Loop through each word in the passage.
+ while (st.hasMoreTokens()) {
+ String word = st.nextToken();
+
+ // Check the current word.
+ if (! m_dictionary.checkWord(word)) {
+ // If the word is not correct, then add it
+ // to the incorrect word list.
+ errorList.add(word);
+ }
+ }
+
+ // Return null if no words are incorrect.
+ if (errorList.size() == 0) { return null; }
+
+ // Return the array of incorrect words.
+ System.out.println("Wrong words:" + errorList);
+ return (String[]) errorList.toArray(new String[errorList.size()]);
+ }
+}
Propchange: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 17 10:04:04 2008
@@ -0,0 +1 @@
+libs
Added: 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=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/build.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/build.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<project name="spell.english" 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.223.jar"/>
+ <taskdef name="ipojo" classpath="../tasks/org.apache.felix.ipojo.ant-0.8.1.jar"
+ classname="org.apache.felix.ipojo.task.IPojoTask"/>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="buildclasspath">
+ <copy file="../spell.services/output/spell.services.jar" todir="${lib.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean, buildclasspath">
+ <mkdir dir="${output.dir}"/>
+ <mkdir dir="${build.dir}"/>
+
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ debug="on"
+ classpath="libs/spell.services.jar"
+ />
+
+ </target>
+
+ <target name="package" depends="compile">
+ <bnd
+ 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"
+ />
+ </target>
+
+</project>
Added: felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/metadata.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/metadata.xml?rev=705672&view=auto
==============================================================================
--- felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/metadata.xml (added)
+++ felix/sandbox/clement/ipojo-tutorials/composite.tutorial/spell.english/metadata.xml Fri Oct 17 10:04:04 2008
@@ -0,0 +1,5 @@
+<ipojo>
+<component classname="spell.english.EnglishDictionary">
+ <provides/>
+</component>
+</ipojo>
\ No newline at end of file