# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430841 -7200
# Node ID 3282ef5328a84839e257cd31d067f782904b7284
# Parent  b01da7eb41dd5a79f5cbc1361de06f027f9d8a3a
Yet another example of spring autoconfiguration

diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/build.xml
--- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:07:17 2008 +0200
+++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:07:21 2008 +0200
@@ -36,6 +36,10 @@
             <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/spring-2.5.jar"/>
         </antcall>
         <antcall target="-build-one">
+            <param name="version" value="app-spring-scan"/>
+            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/spring-2.5.jar"/>
+        </antcall>
+        <antcall target="-build-one">
             <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>
@@ -61,6 +65,12 @@
             <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/spring-2.5.jar:../../libs/dist/commons-logging-1.1.jar"/>
             <param name="main" value="org.apidesign.anagram.app.spring.Main"/>
         </antcall>
+        <echo level="info" message="Running spring autoscan version"/>
+        <antcall target="-run-one">
+            <param name="version" value="app-spring-scan"/>
+            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/spring-2.5.jar:../../libs/dist/commons-logging-1.1.jar"/>
+            <param name="main" value="org.apidesign.anagram.app.springscan.Main"/>
+        </antcall>
         <echo level="info" message="Running registerGeneral version"/>
         <antcall target="-run-one">
             <param name="version" value="app-register-general"/>
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/nbproject/project.xml
--- a/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:07:17 2008 +0200
+++ b/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:07:21 2008 +0200
@@ -58,6 +58,12 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
+                    <label>src-app-spring-scan</label>
+                    <type>java</type>
+                    <location>src-app-spring-scan</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
                     <label>src-app-lookup</label>
                     <type>java</type>
                     <location>src-app-lookup</location>
@@ -135,6 +141,10 @@
                         <location>src-app-spring</location>
                     </source-folder>
                     <source-folder style="packages">
+                        <label>src-app-spring-scan</label>
+                        <location>src-app-spring-scan</location>
+                    </source-folder>
+                    <source-folder style="packages">
                         <label>src-app-lookup</label>
                         <location>src-app-lookup</location>
                     </source-folder>
@@ -201,6 +211,12 @@
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
+                <package-root>src-app-spring-scan</package-root>
+                <classpath mode="compile">src-api:src-scrambler-simple:src-word-static:src-gui:../../libs/dist/spring-2.5.jar</classpath>
+                <built-to>build/app-spring-scan/classes</built-to>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+            <compilation-unit>
                 <package-root>src-app-lookup</package-root>
                 <classpath mode="compile">src-api:src-scrambler-simple:src-word-static:src-gui:../../libs/dist/org-openide-util.jar</classpath>
                 <built-to>build/app-lookup/classes</built-to>
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java	Sat Jun 14 10:07:21 2008 +0200
@@ -0,0 +1,22 @@
+package org.apidesign.anagram.app.springscan;
+
+import org.apidesign.anagram.api.Scrambler;
+import org.apidesign.anagram.api.WordLibrary;
+import org.apidesign.anagram.gui.AnagramsWithConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/* This class shall be in its own module, not here, but because of the need
+ * to see the @Service annotation, I've put it here. The right solution would
+ * be to add dependency of the module providing super class on spring and
+ * use the annotation directly there.
+ */
+
+@Service("ui")
+public class AnagramsAnnotated extends AnagramsWithConstructor {
+    @Autowired
+    public AnagramsAnnotated(WordLibrary library, Scrambler scrambler) {
+        super(library, scrambler);
+    }
+
+}
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/Main.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/Main.java	Sat Jun 14 10:07:21 2008 +0200
@@ -0,0 +1,17 @@
+package org.apidesign.anagram.app.springscan;
+
+import org.apidesign.anagram.api.UI;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public final class Main {
+    private Main() { }
+    
+    public static void main(String[] args) throws Exception {
+        ApplicationContext context = new ClassPathXmlApplicationContext(
+            "org/apidesign/anagram/app/springscan/conf.xml"
+        );
+        UI ui = (UI)context.getBean("ui", UI.class);
+        ui.display();
+    }
+}
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java	Sat Jun 14 10:07:21 2008 +0200
@@ -0,0 +1,15 @@
+package org.apidesign.anagram.app.springscan;
+
+import org.apidesign.anagram.scramblersimple.SimpleScrambler;
+import org.springframework.stereotype.Service;
+
+/* This class shall be in its own module, not here, but because of the need
+ * to see the @Service annotation, I've put it here. The right solution would
+ * be to add dependency of the module providing super class on spring and
+ * use the annotation directly there.
+ */
+
+
+@Service
+public class SimpleScramblerAnnotated extends SimpleScrambler {
+}
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java	Sat Jun 14 10:07:21 2008 +0200
@@ -0,0 +1,15 @@
+package org.apidesign.anagram.app.springscan;
+
+import org.apidesign.anagram.wordstatic.StaticWordLibrary;
+import org.springframework.stereotype.Service;
+
+/* This class shall be in its own module, not here, but because of the need
+ * to see the @Service annotation, I've put it here. The right solution would
+ * be to add dependency of the module providing super class on spring and
+ * use the annotation directly there.
+ */
+
+
+@Service
+public class StaticWordLibraryAnnotated extends StaticWordLibrary {
+}
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml	Sat Jun 14 10:07:21 2008 +0200
@@ -0,0 +1,12 @@
+<?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">
+               
+     <context:component-scan base-package="org.apidesign.anagram.app"/>
+     
+</beans>
\ No newline at end of file
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/AnagramsWithConstructor.java
--- a/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/AnagramsWithConstructor.java	Sat Jun 14 10:07:17 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/AnagramsWithConstructor.java	Sat Jun 14 10:07:21 2008 +0200
@@ -3,7 +3,7 @@
 import org.apidesign.anagram.api.Scrambler;
 import org.apidesign.anagram.api.WordLibrary;
 
-public final class AnagramsWithConstructor extends Anagrams {
+public class AnagramsWithConstructor extends Anagrams {
     
     private final WordLibrary library;
     private final Scrambler scrambler;
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/src-scrambler-simple/org/apidesign/anagram/scramblersimple/SimpleScrambler.java
--- a/samples/componentinjection/anagram-modular/src-scrambler-simple/org/apidesign/anagram/scramblersimple/SimpleScrambler.java	Sat Jun 14 10:07:17 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-scrambler-simple/org/apidesign/anagram/scramblersimple/SimpleScrambler.java	Sat Jun 14 10:07:21 2008 +0200
@@ -3,7 +3,7 @@
 import java.util.Random;
 import org.apidesign.anagram.api.Scrambler;
 
-public final class SimpleScrambler implements Scrambler {
+public class SimpleScrambler implements Scrambler {
     private static final Random random = new Random();
 
     public String scramble(String word) {
diff -r b01da7eb41dd -r 3282ef5328a8 samples/componentinjection/anagram-modular/src-word-static/org/apidesign/anagram/wordstatic/StaticWordLibrary.java
--- a/samples/componentinjection/anagram-modular/src-word-static/org/apidesign/anagram/wordstatic/StaticWordLibrary.java	Sat Jun 14 10:07:17 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-word-static/org/apidesign/anagram/wordstatic/StaticWordLibrary.java	Sat Jun 14 10:07:21 2008 +0200
@@ -4,7 +4,7 @@
 import org.apidesign.anagram.api.WordLibrary;
 
 
-public final class StaticWordLibrary implements WordLibrary {
+public class StaticWordLibrary implements WordLibrary {
     private static String wordList[] = {
         "abstraction",
         "ambiguous",