1.1 --- a/samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java	Sat Jun 14 10:08:12 2008 +0200
     1.2 +++ b/samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java	Sat Jun 14 10:08:14 2008 +0200
     1.3 @@ -1,12 +1,10 @@
     1.4  package org.netbeans.apifest.boolcircuit;
     1.5  
     1.6 -import java.util.Stack;
     1.7 -
     1.8  /**
     1.9   */ 
    1.10 -//BEGIN: apifest.day2.stackbasedsolution.Circuit2
    1.11 +// BEGIN: apifest.day2.stackbasedsolution.Circuit2
    1.12  public interface Circuit2 extends Circuit {
    1.13      public double evaluate (double ... input) 
    1.14      throws IllegalArgumentException;
    1.15  }
    1.16 -//END: apifest.day2.stackbasedsolution.Circuit2
    1.17 +// END: apifest.day2.stackbasedsolution.Circuit2

     2.1 --- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:12 2008 +0200
     2.2 +++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:14 2008 +0200
     2.3 @@ -43,10 +43,6 @@
     2.4              <param name="version" value="app-lookup"/>
     2.5              <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
     2.6          </antcall>
     2.7 -        <antcall target="-build-one">
     2.8 -            <param name="version" value="app-serviceloader"/>
     2.9 -            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
    2.10 -        </antcall>
    2.11          
    2.12      </target>
    2.13      
    2.14 @@ -87,11 +83,6 @@
    2.15              <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/org-openide-util.jar"/>
    2.16              <param name="main" value="org.apidesign.anagram.app.lookup.Main"/>
    2.17          </antcall>
    2.18 -        <antcall target="-run-one">
    2.19 -            <param name="version" value="app-serviceloader"/>
    2.20 -            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
    2.21 -            <param name="main" value="org.apidesign.anagram.app.serviceloader.Main"/>
    2.22 -        </antcall>
    2.23      </target>
    2.24      
    2.25      <!-- support methods -->
    2.26 @@ -99,13 +90,11 @@
    2.27      <target name="-libraries">
    2.28          <ant dir="../../libs/"/>
    2.29          
    2.30 -        <property name="junit.jar" location="../../libs/dist/junit-4.4.jar"/>
    2.31 +        <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
    2.32      </target>
    2.33  
    2.34      <target name="-run-one">
    2.35 -        <java classpath="${cp}:build/${version}/classes" classname="${main}">
    2.36 -            <jvmarg value="-Danagram.version=${version}"/>
    2.37 -        </java>
    2.38 +        <java classpath="${cp}:build/${version}/classes" classname="${main}"/>
    2.39      </target>
    2.40      
    2.41      <target name="-build-one">

     3.1 --- a/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:08:12 2008 +0200
     3.2 +++ b/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:08:14 2008 +0200
     3.3 @@ -10,11 +10,6 @@
     3.4              <properties/>
     3.5              <folders>
     3.6                  <source-folder>
     3.7 -                    <label>Anagram Modular</label>
     3.8 -                    <location>.</location>
     3.9 -                    <encoding>UTF-8</encoding>
    3.10 -                </source-folder>
    3.11 -                <source-folder>
    3.12                      <label>src-api</label>
    3.13                      <type>java</type>
    3.14                      <location>src-api</location>
    3.15 @@ -75,15 +70,8 @@
    3.16                      <encoding>UTF-8</encoding>
    3.17                  </source-folder>
    3.18                  <source-folder>
    3.19 -                    <label>src-app-serviceloader</label>
    3.20 -                    <type>java</type>
    3.21 -                    <location>src-app-serviceloader</location>
    3.22 -                    <encoding>UTF-8</encoding>
    3.23 -                </source-folder>
    3.24 -                <source-folder>
    3.25 -                    <label>src-test</label>
    3.26 -                    <type>java</type>
    3.27 -                    <location>src-test</location>
    3.28 +                    <label>Anagram Modular</label>
    3.29 +                    <location>.</location>
    3.30                      <encoding>UTF-8</encoding>
    3.31                  </source-folder>
    3.32              </folders>
    3.33 @@ -118,56 +106,6 @@
    3.34                  <location>build/api/classes</location>
    3.35                  <build-target>build</build-target>
    3.36              </export>
    3.37 -            <export>
    3.38 -                <type>folder</type>
    3.39 -                <location>build/word-static/classes</location>
    3.40 -                <build-target>build</build-target>
    3.41 -            </export>
    3.42 -            <export>
    3.43 -                <type>folder</type>
    3.44 -                <location>build/scrambler-simple/classes</location>
    3.45 -                <build-target>build</build-target>
    3.46 -            </export>
    3.47 -            <export>
    3.48 -                <type>folder</type>
    3.49 -                <location>build/gui/classes</location>
    3.50 -                <build-target>build</build-target>
    3.51 -            </export>
    3.52 -            <export>
    3.53 -                <type>folder</type>
    3.54 -                <location>build/app-register/classes</location>
    3.55 -                <build-target>build</build-target>
    3.56 -            </export>
    3.57 -            <export>
    3.58 -                <type>folder</type>
    3.59 -                <location>build/app-register/classes</location>
    3.60 -                <build-target>build</build-target>
    3.61 -            </export>
    3.62 -            <export>
    3.63 -                <type>folder</type>
    3.64 -                <location>build/app-property/classes</location>
    3.65 -                <build-target>build</build-target>
    3.66 -            </export>
    3.67 -            <export>
    3.68 -                <type>folder</type>
    3.69 -                <location>build/app-spring/classes</location>
    3.70 -                <build-target>build</build-target>
    3.71 -            </export>
    3.72 -            <export>
    3.73 -                <type>folder</type>
    3.74 -                <location>build/app-spring-scan/classes</location>
    3.75 -                <build-target>build</build-target>
    3.76 -            </export>
    3.77 -            <export>
    3.78 -                <type>folder</type>
    3.79 -                <location>build/app-lookup/classes</location>
    3.80 -                <build-target>build</build-target>
    3.81 -            </export>
    3.82 -            <export>
    3.83 -                <type>folder</type>
    3.84 -                <location>build/app-serviceloader/classes</location>
    3.85 -                <build-target>build</build-target>
    3.86 -            </export>
    3.87              <view>
    3.88                  <items>
    3.89                      <source-folder style="packages">
    3.90 @@ -210,14 +148,6 @@
    3.91                          <label>src-app-lookup</label>
    3.92                          <location>src-app-lookup</location>
    3.93                      </source-folder>
    3.94 -                    <source-folder style="packages">
    3.95 -                        <label>src-app-serviceloader</label>
    3.96 -                        <location>src-app-serviceloader</location>
    3.97 -                    </source-folder>
    3.98 -                    <source-folder style="packages">
    3.99 -                        <label>src-test</label>
   3.100 -                        <location>src-test</location>
   3.101 -                    </source-folder>
   3.102                      <source-file>
   3.103                          <location>build.xml</location>
   3.104                      </source-file>
   3.105 @@ -293,12 +223,6 @@
   3.106                  <source-level>1.5</source-level>
   3.107              </compilation-unit>
   3.108              <compilation-unit>
   3.109 -                <package-root>src-app-serviceloader</package-root>
   3.110 -                <classpath mode="compile">src-api:src-scrambler-simple:src-word-static:src-gui</classpath>
   3.111 -                <built-to>build/app-serviceloader/classes</built-to>
   3.112 -                <source-level>1.5</source-level>
   3.113 -            </compilation-unit>
   3.114 -            <compilation-unit>
   3.115                  <package-root>src-test</package-root>
   3.116                  <classpath mode="compile">src-new-api:../libs/dist/junit-4.4.jar</classpath>
   3.117                  <source-level>1.5</source-level>

     4.1 --- a/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java	Sat Jun 14 10:08:12 2008 +0200
     4.2 +++ b/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java	Sat Jun 14 10:08:14 2008 +0200
     4.3 @@ -5,7 +5,6 @@
     4.4  import org.apidesign.anagram.gui.Anagrams;
     4.5  import org.openide.util.Lookup;
     4.6  
     4.7 -// BEGIN: anagram.lookup.Anagrams
     4.8  class AnagramsWithLookup extends Anagrams {
     4.9  
    4.10      public AnagramsWithLookup() {
    4.11 @@ -22,4 +21,3 @@
    4.12      }
    4.13  
    4.14  }
    4.15 -// END: anagram.lookup.Anagrams

     5.1 --- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java	Sat Jun 14 10:08:12 2008 +0200
     5.2 +++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
     5.3 @@ -12,12 +12,11 @@
     5.4   * use the annotation directly there.
     5.5   */
     5.6  
     5.7 -// BEGIN: anagram.spring.autowire.Anagrams
     5.8  @Service("ui")
     5.9  public class AnagramsAnnotated extends AnagramsWithConstructor {
    5.10      @Autowired
    5.11      public AnagramsAnnotated(WordLibrary library, Scrambler scrambler) {
    5.12          super(library, scrambler);
    5.13      }
    5.14 +
    5.15  }
    5.16 -// END: anagram.spring.autowire.Anagrams

     6.1 --- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java	Sat Jun 14 10:08:12 2008 +0200
     6.2 +++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
     6.3 @@ -9,10 +9,7 @@
     6.4   * use the annotation directly there.
     6.5   */
     6.6  
     6.7 -// BEGIN: anagram.spring.autowire.Scrambler
     6.8 +
     6.9  @Service
    6.10  public class SimpleScramblerAnnotated extends SimpleScrambler {
    6.11 -    public SimpleScramblerAnnotated() {
    6.12 -    }
    6.13  }
    6.14 -// END: anagram.spring.autowire.Scrambler

     7.1 --- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java	Sat Jun 14 10:08:12 2008 +0200
     7.2 +++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
     7.3 @@ -10,10 +10,6 @@
     7.4   */
     7.5  
     7.6  
     7.7 -// BEGIN: anagram.spring.autowire.WordLibrary
     7.8  @Service
     7.9  public class StaticWordLibraryAnnotated extends StaticWordLibrary {
    7.10 -    public StaticWordLibraryAnnotated() {
    7.11 -    }
    7.12  }
    7.13 -// END: anagram.spring.autowire.WordLibrary

     8.1 --- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml	Sat Jun 14 10:08:12 2008 +0200
     8.2 +++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml	Sat Jun 14 10:08:14 2008 +0200
     8.3 @@ -1,14 +1,12 @@
     8.4  <?xml version="1.0" encoding="UTF-8"?>
     8.5 - <!-- BEGIN: anagram.spring.autowire.xml -->
     8.6 -<beans 
     8.7 -  xmlns="http://www.springframework.org/schema/beans"
     8.8 -  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     8.9 -  xmlns:context="http://www.springframework.org/schema/context"
    8.10 -  xsi:schemaLocation="http://www.springframework.org/schema/beans 
    8.11 -    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
    8.12 -    http://www.springframework.org/schema/context
    8.13 -    http://www.springframework.org/schema/context/spring-context-2.5.xsd"
    8.14 ->
    8.15 +<beans xmlns="http://www.springframework.org/schema/beans"
    8.16 +       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    8.17 +       xmlns:context="http://www.springframework.org/schema/context"
    8.18 +       xsi:schemaLocation="http://www.springframework.org/schema/beans 
    8.19 +           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
    8.20 +           http://www.springframework.org/schema/context
    8.21 +           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
    8.22 +               
    8.23       <context:component-scan base-package="org.apidesign.anagram.app"/>
    8.24 -</beans>
    8.25 - <!-- END: anagram.spring.autowire.xml -->
    8.26 +     
    8.27 +</beans>
    8.28 \ No newline at end of file

     9.1 --- a/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/Main.java	Sat Jun 14 10:08:12 2008 +0200
     9.2 +++ b/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/Main.java	Sat Jun 14 10:08:14 2008 +0200
     9.3 @@ -6,8 +6,7 @@
     9.4  
     9.5  public final class Main {
     9.6      private Main() { }
     9.7 -
     9.8 -    // BEGIN: anagram.spring.main
     9.9 +    
    9.10      public static void main(String[] args) throws Exception {
    9.11          ApplicationContext context = new ClassPathXmlApplicationContext(
    9.12              "org/apidesign/anagram/app/spring/conf.xml"
    9.13 @@ -15,5 +14,4 @@
    9.14          UI ui = (UI)context.getBean("ui", UI.class);
    9.15          ui.display();
    9.16      }
    9.17 -    // END: anagram.spring.main
    9.18  }

    10.1 --- a/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/conf.xml	Sat Jun 14 10:08:12 2008 +0200
    10.2 +++ b/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/conf.xml	Sat Jun 14 10:08:14 2008 +0200
    10.3 @@ -1,24 +1,10 @@
    10.4  <?xml version="1.0" encoding="UTF-8"?>
    10.5 -<!-- BEGIN: anagram.spring.xml -->
    10.6  <beans xmlns="http://www.springframework.org/schema/beans"
    10.7         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    10.8         xsi:schemaLocation="http://www.springframework.org/schema/beans 
    10.9 -       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
   10.10 ->
   10.11 +       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
   10.12  
   10.13 -    <bean 
   10.14 -        id="wordLibrary" 
   10.15 -        class="org.apidesign.anagram.wordstatic.StaticWordLibrary"
   10.16 -    />
   10.17 -    <bean 
   10.18 -        id="scrambler" 
   10.19 -        class="org.apidesign.anagram.scramblersimple.SimpleScrambler"
   10.20 -    />
   10.21 -    <bean 
   10.22 -        id="ui" 
   10.23 -        class="org.apidesign.anagram.gui.AnagramsWithConstructor" 
   10.24 -        autowire="autodetect"
   10.25 -    />
   10.26 -</beans>
   10.27 -<!-- END: anagram.spring.xml -->
   10.28 -
   10.29 +    <bean id="wordLibrary" class="org.apidesign.anagram.wordstatic.StaticWordLibrary"/>
   10.30 +    <bean id="scrambler" class="org.apidesign.anagram.scramblersimple.SimpleScrambler"/>
   10.31 +    <bean id="ui" class="org.apidesign.anagram.gui.AnagramsWithConstructor" autowire="autodetect"/>
   10.32 +</beans>
   10.33 \ No newline at end of file

    11.1 --- a/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:12 2008 +0200
    11.2 +++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:14 2008 +0200
    11.3 @@ -14,14 +14,6 @@
    11.4      public Anagrams() {
    11.5          initComponents();        
    11.6          getRootPane().setDefaultButton(guessButton);
    11.7 -        
    11.8 -        String version = System.getProperty("anagram.version");
    11.9 -        if (version != null) {
   11.10 -            if (version.startsWith("app-")) {
   11.11 -                version = version.substring(4);
   11.12 -            }
   11.13 -            setTitle("Anagrams - " + version + " version");
   11.14 -        }
   11.15      }
   11.16      
   11.17      protected abstract WordLibrary getWordLibrary();

    12.1 --- a/samples/composition/src-test/api/ArithmeticaTest.java	Sat Jun 14 10:08:12 2008 +0200
    12.2 +++ b/samples/composition/src-test/api/ArithmeticaTest.java	Sat Jun 14 10:08:14 2008 +0200
    12.3 @@ -22,7 +22,7 @@
    12.4          super.tearDown();
    12.5      }
    12.6  
    12.7 -    //BEGIN: design.composition.arith.test
    12.8 +    // BEGIN: design.composition.arith.test
    12.9      public void testSumTwo() {
   12.10          Arithmetica instance = new Arithmetica();
   12.11          assertEquals("+", 5, instance.sumTwo(3, 2));
   12.12 @@ -40,6 +40,6 @@
   12.13          assertEquals("sum(1,1)=1", 1, instance.sumRange(1, 1));
   12.14          assertEquals("sum(10,1)=55", 55, instance.sumRange(10, 1));
   12.15      }
   12.16 -    //END: design.composition.arith.test
   12.17 +    // END: design.composition.arith.test
   12.18  
   12.19  }

    13.1 --- a/samples/composition/src-test/api/Factorial.java	Sat Jun 14 10:08:12 2008 +0200
    13.2 +++ b/samples/composition/src-test/api/Factorial.java	Sat Jun 14 10:08:14 2008 +0200
    13.3 @@ -4,7 +4,7 @@
    13.4   * Arithmetica methods to do multiplication instead of
    13.5   * addition.
    13.6   */
    13.7 -//BEGIN: design.composition.arith.factorial
    13.8 +// BEGIN: design.composition.arith.factorial
    13.9  public final class Factorial extends Arithmetica {
   13.10      public static int factorial(int n) {
   13.11          return new Factorial().sumRange(1, n);
   13.12 @@ -14,5 +14,5 @@
   13.13          return one * second;
   13.14      }
   13.15  }
   13.16 -//END: design.composition.arith.factorial
   13.17 +// END: design.composition.arith.factorial
   13.18  

    14.1 --- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 10:08:12 2008 +0200
    14.2 +++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 10:08:14 2008 +0200
    14.3 @@ -20,7 +20,7 @@
    14.4      }
    14.5  /* The above code is here to let us simulate different behaviours of the append
    14.6   * method. In reality, the class would just subclass BufferedWriter, as shown bellow:
    14.7 -BEGIN: writer.CryptoWriter
    14.8 + BEGIN: writer.CryptoWriter
    14.9  public class CryptoWriter extends BufferedWriter {
   14.10      public CryptoWriter(Writer out) {
   14.11          super(out);

    15.1 --- a/samples/libs/build.xml	Sat Jun 14 10:08:12 2008 +0200
    15.2 +++ b/samples/libs/build.xml	Sat Jun 14 10:08:14 2008 +0200
    15.3 @@ -25,6 +25,16 @@
    15.4              <param name="library.include" value="**/org-netbeans-insane.jar"/>
    15.5              <param name="url" value="http://deadlock.netbeans.org/hudson/job/javadoc-nbms/lastSuccessfulBuild/artifact/nbbuild/nbms/ide9/org-netbeans-insane.nbm"/>
    15.6          </antcall>
    15.7 +        <antcall target="-library-from-zip">
    15.8 +            <param name="library" value="spring-2.5"/>
    15.9 +            <param name="library.include" value="**/*spring*.jar"/>
   15.10 +            <param name="url" value="http://deadlock.netbeans.org/hudson/job/javadoc-nbms/lastSuccessfulBuild/artifact/nbbuild/nbms/java2/org-netbeans-libs-springframework.nbm"/>
   15.11 +        </antcall>
   15.12 +        <antcall target="-library-from-zip">
   15.13 +            <param name="library" value="commons-logging-1.1"/>
   15.14 +            <param name="library.include" value="**/*commons*logg*.jar"/>
   15.15 +            <param name="url" value="http://deadlock.netbeans.org/hudson/job/javadoc-nbms/lastSuccessfulBuild/artifact/nbbuild/nbms/ide9/org-netbeans-libs-commons_logging.nbm"/>
   15.16 +        </antcall>
   15.17      </target>
   15.18      
   15.19      <!-- support methods -->