# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430898 -7200
# Node ID 128db998ee1c09d0fbaac5dae982eac5b21a7f69
# Parent  ce3b323add4032ea823ba069fa5d339d84aaf5ca
Merge: Work done on the spring and lookup is not in trunk

diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/build.xml
--- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:18 2008 +0200
@@ -43,6 +43,10 @@
             <param name="version" value="app-lookup"/>
             <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
         </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="app-serviceloader"/>
+            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
+        </antcall>
         
     </target>
     
@@ -83,6 +87,11 @@
             <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/org-openide-util.jar"/>
             <param name="main" value="org.apidesign.anagram.app.lookup.Main"/>
         </antcall>
+        <antcall target="-run-one">
+            <param name="version" value="app-serviceloader"/>
+            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
+            <param name="main" value="org.apidesign.anagram.app.serviceloader.Main"/>
+        </antcall>
     </target>
     
     <!-- support methods -->
@@ -90,11 +99,13 @@
     <target name="-libraries">
         <ant dir="../../libs/"/>
         
-        <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
+        <property name="junit.jar" location="../../libs/dist/junit-4.4.jar"/>
     </target>
 
     <target name="-run-one">
-        <java classpath="${cp}:build/${version}/classes" classname="${main}"/>
+        <java classpath="${cp}:build/${version}/classes" classname="${main}">
+            <jvmarg value="-Danagram.version=${version}"/>
+        </java>
     </target>
     
     <target name="-build-one">
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/nbproject/project.xml
--- a/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:08:18 2008 +0200
@@ -10,6 +10,11 @@
             <properties/>
             <folders>
                 <source-folder>
+                    <label>Anagram Modular</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
                     <label>src-api</label>
                     <type>java</type>
                     <location>src-api</location>
@@ -70,8 +75,15 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>Anagram Modular</label>
-                    <location>.</location>
+                    <label>src-app-serviceloader</label>
+                    <type>java</type>
+                    <location>src-app-serviceloader</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>src-test</label>
+                    <type>java</type>
+                    <location>src-test</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
             </folders>
@@ -106,6 +118,56 @@
                 <location>build/api/classes</location>
                 <build-target>build</build-target>
             </export>
+            <export>
+                <type>folder</type>
+                <location>build/word-static/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/scrambler-simple/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/gui/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/app-register/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/app-register/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/app-property/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/app-spring/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/app-spring-scan/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/app-lookup/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/app-serviceloader/classes</location>
+                <build-target>build</build-target>
+            </export>
             <view>
                 <items>
                     <source-folder style="packages">
@@ -148,6 +210,14 @@
                         <label>src-app-lookup</label>
                         <location>src-app-lookup</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>src-app-serviceloader</label>
+                        <location>src-app-serviceloader</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>src-test</label>
+                        <location>src-test</location>
+                    </source-folder>
                     <source-file>
                         <location>build.xml</location>
                     </source-file>
@@ -223,6 +293,12 @@
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
+                <package-root>src-app-serviceloader</package-root>
+                <classpath mode="compile">src-api:src-scrambler-simple:src-word-static:src-gui</classpath>
+                <built-to>build/app-serviceloader/classes</built-to>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+            <compilation-unit>
                 <package-root>src-test</package-root>
                 <classpath mode="compile">src-new-api:../libs/dist/junit-4.4.jar</classpath>
                 <source-level>1.5</source-level>
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java
--- a/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java	Sat Jun 14 10:08:18 2008 +0200
@@ -5,6 +5,7 @@
 import org.apidesign.anagram.gui.Anagrams;
 import org.openide.util.Lookup;
 
+// BEGIN: anagram.lookup.Anagrams
 class AnagramsWithLookup extends Anagrams {
 
     public AnagramsWithLookup() {
@@ -21,3 +22,4 @@
     }
 
 }
+// END: anagram.lookup.Anagrams
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java
--- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java	Sat Jun 14 10:08:18 2008 +0200
@@ -12,11 +12,12 @@
  * use the annotation directly there.
  */
 
+// BEGIN: anagram.spring.autowire.Anagrams
 @Service("ui")
 public class AnagramsAnnotated extends AnagramsWithConstructor {
     @Autowired
     public AnagramsAnnotated(WordLibrary library, Scrambler scrambler) {
         super(library, scrambler);
     }
-
 }
+// END: anagram.spring.autowire.Anagrams
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java
--- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java	Sat Jun 14 10:08:18 2008 +0200
@@ -9,7 +9,10 @@
  * use the annotation directly there.
  */
 
-
+// BEGIN: anagram.spring.autowire.Scrambler
 @Service
 public class SimpleScramblerAnnotated extends SimpleScrambler {
+    public SimpleScramblerAnnotated() {
+    }
 }
+// END: anagram.spring.autowire.Scrambler
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java
--- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java	Sat Jun 14 10:08:18 2008 +0200
@@ -10,6 +10,10 @@
  */
 
 
+// BEGIN: anagram.spring.autowire.WordLibrary
 @Service
 public class StaticWordLibraryAnnotated extends StaticWordLibrary {
+    public StaticWordLibraryAnnotated() {
+    }
 }
+// END: anagram.spring.autowire.WordLibrary
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml
--- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml	Sat Jun 14 10:08:18 2008 +0200
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-               
+ <!-- BEGIN: anagram.spring.autowire.xml -->
+<beans 
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans 
+    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    http://www.springframework.org/schema/context
+    http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+>
      <context:component-scan base-package="org.apidesign.anagram.app"/>
-     
-</beans>
\ No newline at end of file
+</beans>
+ <!-- END: anagram.spring.autowire.xml -->
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/Main.java
--- a/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/Main.java	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/Main.java	Sat Jun 14 10:08:18 2008 +0200
@@ -6,7 +6,8 @@
 
 public final class Main {
     private Main() { }
-    
+
+    // BEGIN: anagram.spring.main
     public static void main(String[] args) throws Exception {
         ApplicationContext context = new ClassPathXmlApplicationContext(
             "org/apidesign/anagram/app/spring/conf.xml"
@@ -14,4 +15,5 @@
         UI ui = (UI)context.getBean("ui", UI.class);
         ui.display();
     }
+    // END: anagram.spring.main
 }
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/conf.xml
--- a/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/conf.xml	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/conf.xml	Sat Jun 14 10:08:18 2008 +0200
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- BEGIN: anagram.spring.xml -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans 
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+>
 
-    <bean id="wordLibrary" class="org.apidesign.anagram.wordstatic.StaticWordLibrary"/>
-    <bean id="scrambler" class="org.apidesign.anagram.scramblersimple.SimpleScrambler"/>
-    <bean id="ui" class="org.apidesign.anagram.gui.AnagramsWithConstructor" autowire="autodetect"/>
-</beans>
\ No newline at end of file
+    <bean 
+        id="wordLibrary" 
+        class="org.apidesign.anagram.wordstatic.StaticWordLibrary"
+    />
+    <bean 
+        id="scrambler" 
+        class="org.apidesign.anagram.scramblersimple.SimpleScrambler"
+    />
+    <bean 
+        id="ui" 
+        class="org.apidesign.anagram.gui.AnagramsWithConstructor" 
+        autowire="autodetect"
+    />
+</beans>
+<!-- END: anagram.spring.xml -->
+
diff -r ce3b323add40 -r 128db998ee1c samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java
--- a/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:14 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:18 2008 +0200
@@ -14,6 +14,14 @@
     public Anagrams() {
         initComponents();        
         getRootPane().setDefaultButton(guessButton);
+        
+        String version = System.getProperty("anagram.version");
+        if (version != null) {
+            if (version.startsWith("app-")) {
+                version = version.substring(4);
+            }
+            setTitle("Anagrams - " + version + " version");
+        }
     }
     
     protected abstract WordLibrary getWordLibrary();