1.1 --- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:07:55 2008 +0200
     1.2 +++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:07:58 2008 +0200
     1.3 @@ -90,7 +90,7 @@
     1.4      <target name="-libraries">
     1.5          <ant dir="../../libs/"/>
     1.6          
     1.7 -        <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
     1.8 +        <property name="junit.jar" location="../../libs/dist/junit-4.4.jar"/>
     1.9      </target>
    1.10  
    1.11      <target name="-run-one">

     2.1 --- a/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:07:55 2008 +0200
     2.2 +++ b/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:07:58 2008 +0200
     2.3 @@ -10,6 +10,11 @@
     2.4              <properties/>
     2.5              <folders>
     2.6                  <source-folder>
     2.7 +                    <label>Anagram Modular</label>
     2.8 +                    <location>.</location>
     2.9 +                    <encoding>UTF-8</encoding>
    2.10 +                </source-folder>
    2.11 +                <source-folder>
    2.12                      <label>src-api</label>
    2.13                      <type>java</type>
    2.14                      <location>src-api</location>
    2.15 @@ -70,8 +75,15 @@
    2.16                      <encoding>UTF-8</encoding>
    2.17                  </source-folder>
    2.18                  <source-folder>
    2.19 -                    <label>Anagram Modular</label>
    2.20 -                    <location>.</location>
    2.21 +                    <label>src-app-serviceloader</label>
    2.22 +                    <type>java</type>
    2.23 +                    <location>src-app-serviceloader</location>
    2.24 +                    <encoding>UTF-8</encoding>
    2.25 +                </source-folder>
    2.26 +                <source-folder>
    2.27 +                    <label>src-test</label>
    2.28 +                    <type>java</type>
    2.29 +                    <location>src-test</location>
    2.30                      <encoding>UTF-8</encoding>
    2.31                  </source-folder>
    2.32              </folders>
    2.33 @@ -106,6 +118,56 @@
    2.34                  <location>build/api/classes</location>
    2.35                  <build-target>build</build-target>
    2.36              </export>
    2.37 +            <export>
    2.38 +                <type>folder</type>
    2.39 +                <location>build/word-static/classes</location>
    2.40 +                <build-target>build</build-target>
    2.41 +            </export>
    2.42 +            <export>
    2.43 +                <type>folder</type>
    2.44 +                <location>build/scrambler-simple/classes</location>
    2.45 +                <build-target>build</build-target>
    2.46 +            </export>
    2.47 +            <export>
    2.48 +                <type>folder</type>
    2.49 +                <location>build/gui/classes</location>
    2.50 +                <build-target>build</build-target>
    2.51 +            </export>
    2.52 +            <export>
    2.53 +                <type>folder</type>
    2.54 +                <location>build/app-register/classes</location>
    2.55 +                <build-target>build</build-target>
    2.56 +            </export>
    2.57 +            <export>
    2.58 +                <type>folder</type>
    2.59 +                <location>build/app-register/classes</location>
    2.60 +                <build-target>build</build-target>
    2.61 +            </export>
    2.62 +            <export>
    2.63 +                <type>folder</type>
    2.64 +                <location>build/app-property/classes</location>
    2.65 +                <build-target>build</build-target>
    2.66 +            </export>
    2.67 +            <export>
    2.68 +                <type>folder</type>
    2.69 +                <location>build/app-spring/classes</location>
    2.70 +                <build-target>build</build-target>
    2.71 +            </export>
    2.72 +            <export>
    2.73 +                <type>folder</type>
    2.74 +                <location>build/app-spring-scan/classes</location>
    2.75 +                <build-target>build</build-target>
    2.76 +            </export>
    2.77 +            <export>
    2.78 +                <type>folder</type>
    2.79 +                <location>build/app-lookup/classes</location>
    2.80 +                <build-target>build</build-target>
    2.81 +            </export>
    2.82 +            <export>
    2.83 +                <type>folder</type>
    2.84 +                <location>build/app-serviceloader/classes</location>
    2.85 +                <build-target>build</build-target>
    2.86 +            </export>
    2.87              <view>
    2.88                  <items>
    2.89                      <source-folder style="packages">
    2.90 @@ -148,6 +210,14 @@
    2.91                          <label>src-app-lookup</label>
    2.92                          <location>src-app-lookup</location>
    2.93                      </source-folder>
    2.94 +                    <source-folder style="packages">
    2.95 +                        <label>src-app-serviceloader</label>
    2.96 +                        <location>src-app-serviceloader</location>
    2.97 +                    </source-folder>
    2.98 +                    <source-folder style="packages">
    2.99 +                        <label>src-test</label>
   2.100 +                        <location>src-test</location>
   2.101 +                    </source-folder>
   2.102                      <source-file>
   2.103                          <location>build.xml</location>
   2.104                      </source-file>
   2.105 @@ -223,6 +293,12 @@
   2.106                  <source-level>1.5</source-level>
   2.107              </compilation-unit>
   2.108              <compilation-unit>
   2.109 +                <package-root>src-app-serviceloader</package-root>
   2.110 +                <classpath mode="compile">src-api:src-scrambler-simple:src-word-static:src-gui</classpath>
   2.111 +                <built-to>build/app-serviceloader/classes</built-to>
   2.112 +                <source-level>1.5</source-level>
   2.113 +            </compilation-unit>
   2.114 +            <compilation-unit>
   2.115                  <package-root>src-test</package-root>
   2.116                  <classpath mode="compile">src-new-api:../libs/dist/junit-4.4.jar</classpath>
   2.117                  <source-level>1.5</source-level>

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/samples/componentinjection/anagram-modular/src-app-serviceloader/org/apidesign/anagram/app/serviceloader/AnagramsWithServiceLoader.java	Sat Jun 14 10:07:58 2008 +0200
     3.3 @@ -0,0 +1,24 @@
     3.4 +package org.apidesign.anagram.app.serviceloader;
     3.5 +
     3.6 +import org.apidesign.anagram.api.Scrambler;
     3.7 +import org.apidesign.anagram.api.WordLibrary;
     3.8 +import org.apidesign.anagram.gui.Anagrams;
     3.9 +
    3.10 +// BEGIN: anagram.serviceloader.Anagrams
    3.11 +class AnagramsWithServiceLoader extends Anagrams {
    3.12 +
    3.13 +    public AnagramsWithServiceLoader() {
    3.14 +    }
    3.15 +
    3.16 +    @Override
    3.17 +    protected WordLibrary getWordLibrary() {
    3.18 +        return java.util.ServiceLoader.load(WordLibrary.class).iterator().next();
    3.19 +    }
    3.20 +
    3.21 +    @Override
    3.22 +    protected Scrambler getScrambler() {
    3.23 +        return java.util.ServiceLoader.load(Scrambler.class).iterator().next();
    3.24 +    }
    3.25 +
    3.26 +}
    3.27 +// END: anagram.serviceloader.Anagrams

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/samples/componentinjection/anagram-modular/src-app-serviceloader/org/apidesign/anagram/app/serviceloader/Main.java	Sat Jun 14 10:07:58 2008 +0200
     4.3 @@ -0,0 +1,12 @@
     4.4 +package org.apidesign.anagram.app.serviceloader;
     4.5 +
     4.6 +import org.apidesign.anagram.api.UI;
     4.7 +
     4.8 +public final class Main {
     4.9 +    private Main() { }
    4.10 +    
    4.11 +    public static void main(String[] args) throws Exception {
    4.12 +        UI ui = new AnagramsWithServiceLoader();
    4.13 +        ui.display();
    4.14 +    }
    4.15 +}