# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1226728423 -3600
# Node ID 60bb8519cb2d01b0963de1d92da7649f2f27b915
# Parent  9cbb8364c4aec971d6c5cfdb7b019ca0f8d1e874
Renaming the AServerInfo class to ServerConnector and spliting it into three separate classes.

diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/build.xml
--- a/samples/aserverinfo/build.xml	Sun Nov 09 16:20:01 2008 +0100
+++ b/samples/aserverinfo/build.xml	Sat Nov 15 06:53:43 2008 +0100
@@ -2,6 +2,11 @@
 <!-- You may freely edit this file. See commented blocks below for -->
 <!-- some examples of how to customize the build. -->
 <!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
 <project name="aserverinfo" default="default" basedir=".">
     <description>Builds, tests, and runs the project aserverinfo.</description>
     <import file="nbproject/build-impl.xml"/>
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/nbproject/build-impl.xml
--- a/samples/aserverinfo/nbproject/build-impl.xml	Sun Nov 09 16:20:01 2008 +0100
+++ b/samples/aserverinfo/nbproject/build-impl.xml	Sat Nov 15 06:53:43 2008 +0100
@@ -19,7 +19,7 @@
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="aserverinfo-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="aserverinfo-impl">
     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
     <!-- 
                 ======================
@@ -218,13 +218,13 @@
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-nbjpda">
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>
             <attribute default="${debug.classpath}" name="classpath"/>
             <attribute default="" name="stopclassname"/>
             <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -235,7 +235,9 @@
             <attribute default="${build.classes.dir}" name="dir"/>
             <sequential>
                 <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
                 </nbjpdareload>
             </sequential>
         </macrodef>
@@ -253,6 +255,12 @@
         <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
             <istrue value="${have-jdk-older-than-1.4}"/>
         </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
     </target>
     <target depends="-init-debug-args" name="-init-macrodef-debug">
         <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
@@ -262,7 +270,7 @@
             <sequential>
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
                     <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
@@ -279,12 +287,13 @@
     <target name="-init-macrodef-java">
         <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.classpath}" name="classpath"/>
             <element name="customize" optional="true"/>
             <sequential>
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
-                        <path path="${run.classpath}"/>
+                        <path path="@{classpath}"/>
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="run-sys-prop."/>
@@ -309,6 +318,13 @@
                 ===================
             -->
     <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
     </target>
@@ -329,7 +345,7 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
     <target name="-pre-compile-single">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
@@ -343,7 +359,7 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
     <!--
                 ====================
                 JAR BUILDING SECTION
@@ -427,6 +443,10 @@
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <j2seproject1:java classname="${run.class}"/>
     </target>
+    <target depends="init,-do-not-recompile,compile-test-single" name="run-test-with-main">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
+    </target>
     <!--
                 =================
                 DEBUGGING SECTION
@@ -435,6 +455,9 @@
     <target depends="init" if="netbeans.home" name="-debug-start-debugger">
         <j2seproject1:nbjpdastart name="${debug.class}"/>
     </target>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
+    </target>
     <target depends="init,compile" name="-debug-start-debuggee">
         <j2seproject3:debug>
             <customize>
@@ -452,6 +475,11 @@
         <j2seproject3:debug classname="${debug.class}"/>
     </target>
     <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
     <target depends="init" name="-pre-debug-fix">
         <fail unless="fix.includes">Must set fix.includes</fail>
         <property name="javac.includes" value="${fix.includes}.java"/>
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/nbproject/genfiles.properties
--- a/samples/aserverinfo/nbproject/genfiles.properties	Sun Nov 09 16:20:01 2008 +0100
+++ b/samples/aserverinfo/nbproject/genfiles.properties	Sat Nov 15 06:53:43 2008 +0100
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=c82747ea
-build.xml.script.CRC32=68215f8a
-build.xml.stylesheet.CRC32=be360661
+build.xml.script.CRC32=aee7ca48
+build.xml.stylesheet.CRC32=958a1d3e
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=c82747ea
-nbproject/build-impl.xml.script.CRC32=b22c6fb6
-nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
+nbproject/build-impl.xml.script.CRC32=1033418a
+nbproject/build-impl.xml.stylesheet.CRC32=84d9cdb5
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/src/org/apidesign/aserverinfo/AServerInfo.java
--- a/samples/aserverinfo/src/org/apidesign/aserverinfo/AServerInfo.java	Sun Nov 09 16:20:01 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-package org.apidesign.aserverinfo;
-
-import java.net.URL;
-import org.openide.util.Lookup;
-
-// BEGIN: aserverinfo.api
-public final class AServerInfo {
-    public String getName() {
-        return name == null ? "noname" : name.getName();
-    }
-    
-    public URL getURL() {
-        return url == null ? null : url.getURL();
-    }
-    
-    public void reset() {
-        if (reset != null) {
-            reset.reset();
-        }
-    }
-    
-    public void shutdown() {
-        if (shutdown != null) {
-            shutdown.shutdown();
-        }
-    }
-// FINISH: aserverinfo.api
-
-    //
-    // private part
-    //
-    
-    private final NameProvider name;
-    private final URLProvider url;
-    private final ResetHandler reset;
-    private final ShutdownHandler shutdown;
-
-    private AServerInfo(
-        NameProvider name, URLProvider url,
-        ResetHandler reset, ShutdownHandler shutdown
-    ) {
-        this.name = name;
-        this.url = url;
-        this.reset = reset;
-        this.shutdown = shutdown;
-    }
-
-    //
-    // factories
-    //
-
-    // BEGIN: aserverinfo.create
-    public interface NameProvider {
-        public String getName();
-    }
-    public interface URLProvider {
-        public URL getURL();
-    }
-    public interface ResetHandler {
-        public void reset();
-    }
-    
-    public static AServerInfo create(final Lookup interfaces) 
-    // END: aserverinfo.create
-    {
-        NameProvider nameP = new NameProvider() {
-            public String getName() {
-                NameProvider p = interfaces.lookup(NameProvider.class);
-                return p == null ? "noname" : p.getName();
-            }
-        };
-        URLProvider urlP = new URLProvider() {
-            public URL getURL() {
-                URLProvider p = interfaces.lookup(URLProvider.class);
-                return p == null ? null : p.getURL();
-            }
-        };
-        ResetHandler resetP = new ResetHandler() {
-            public void reset() {
-                ResetHandler h = interfaces.lookup(ResetHandler.class);
-                if (h != null) {
-                    h.reset();
-                }
-            }
-        };
-        
-        return new AServerInfo(nameP, urlP, resetP, null);
-    }
-    
-    // BEGIN: aserverinfo.regularcreate
-    public static AServerInfo create(
-        NameProvider nameProvider, 
-        URLProvider urlProvider, 
-        ResetHandler reset
-    )
-    // END: aserverinfo.regularcreate
-    {
-        return new AServerInfo(nameProvider, urlProvider, reset, null);
-    }
-    
-    // BEGIN: aserverinfo.regularcreate.withshutdown
-    /** @since 2.0 */
-    public interface ShutdownHandler {
-        public void shutdown();
-    }
-    
-    /** @since 2.0 */
-    public static AServerInfo create(
-        NameProvider nameProvider, 
-        URLProvider urlProvider, 
-        ResetHandler reset, 
-        ShutdownHandler shutdown
-    )
-    // END: aserverinfo.regularcreate.withshutdown
-    {
-        return new AServerInfo(nameProvider, urlProvider, reset, shutdown);
-    }
-
-    //
-    // cumulative factory methods
-    //
-    
-    // BEGIN: aserverinfo.cumulative.factory
-    public static AServerInfo empty() {
-        return new AServerInfo(null, null, null, null);
-    }
-    
-    public final AServerInfo nameProvider(final NameProvider np) {
-        return new AServerInfo(np, this.url, this.reset, this.shutdown);
-    }
-    // END: aserverinfo.cumulative.factory
-
-    public final AServerInfo urlProvider(final URLProvider up) {
-        return new AServerInfo(this.name, up, this.reset, this.shutdown);
-    }
-    public final AServerInfo reset(final ResetHandler h) {
-        return new AServerInfo(this.name, this.url, h, this.shutdown);
-    }
-    public final AServerInfo shutdown(final ShutdownHandler s) {
-        return new AServerInfo(this.name, this.url, this.reset, s);
-    }
-}
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/src/org/apidesign/aserverinfo/cummulativefactory/ServerConnector.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/aserverinfo/src/org/apidesign/aserverinfo/cummulativefactory/ServerConnector.java	Sat Nov 15 06:53:43 2008 +0100
@@ -0,0 +1,88 @@
+package org.apidesign.aserverinfo.cummulativefactory;
+
+import org.apidesign.aserverinfo.spi.NameProvider;
+import org.apidesign.aserverinfo.spi.ResetHandler;
+import org.apidesign.aserverinfo.spi.URLProvider;
+import java.net.URL;
+import org.apidesign.aserverinfo.spi.ShutdownHandler;
+
+// BEGIN: aserverinfo.api
+/** A class to connect to server, identify it and manipulate with
+ * it state. The <a href="http://apidesign.org">Practical API Design</a>
+ * book used to call it AServerInfo.
+ * <p>
+ */
+public final class ServerConnector {
+    public String getName() {
+        return name == null ? "noname" : name.getName();
+    }
+    
+    public URL getURL() {
+        return url == null ? null : url.getURL();
+    }
+    
+    public void reset() {
+        if (reset != null) {
+            reset.reset();
+        }
+    }
+
+    /** Additional method for API clients not available from first version.
+     * @since 2.0
+     */
+    public void shutdown() {
+        if (shutdown != null) {
+            shutdown.shutdown();
+        }
+    }
+// FINISH: aserverinfo.api
+
+    //
+    // cumulative factory methods
+    //
+    
+    // BEGIN: aserverinfo.cumulative.factory
+    public static ServerConnector empty() {
+        return new ServerConnector(null, null, null, null);
+    }
+    
+    public final ServerConnector nameProvider(NameProvider np) {
+        return new ServerConnector(np, this.url, this.reset, this.shutdown);
+    }
+
+    public final ServerConnector urlProvider(URLProvider up) {
+        return new ServerConnector(this.name, up, this.reset, this.shutdown);
+    }
+    public final ServerConnector reset(ResetHandler h) {
+        return new ServerConnector(this.name, this.url, h, this.shutdown);
+    }
+    /** All one needs to do when there is a need to add new
+     * style of creation is to add new <em>clonning</em> method.
+     * @param handler
+     * @return
+     * @since 2.0
+     */
+    public final ServerConnector shutdown(ShutdownHandler handler) {
+        return new ServerConnector(this.name, this.url, this.reset, handler);
+    }
+    // END: aserverinfo.cumulative.factory
+
+    //
+    // private part
+    //
+
+    private final NameProvider name;
+    private final URLProvider url;
+    private final ResetHandler reset;
+    private final ShutdownHandler shutdown;
+
+    private ServerConnector(
+        NameProvider name, URLProvider url,
+        ResetHandler reset, ShutdownHandler shutdown
+    ) {
+        this.name = name;
+        this.url = url;
+        this.reset = reset;
+        this.shutdown = shutdown;
+    }
+}
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/src/org/apidesign/aserverinfo/factories/ServerConnector.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/aserverinfo/src/org/apidesign/aserverinfo/factories/ServerConnector.java	Sat Nov 15 06:53:43 2008 +0100
@@ -0,0 +1,84 @@
+package org.apidesign.aserverinfo.factories;
+
+import org.apidesign.aserverinfo.spi.ShutdownHandler;
+import java.net.URL;
+import org.apidesign.aserverinfo.spi.NameProvider;
+import org.apidesign.aserverinfo.spi.ResetHandler;
+import org.apidesign.aserverinfo.spi.URLProvider;
+
+/** A class to connect to server, identify it and manipulate with
+ * it state. The <a href="http://apidesign.org">Practical API Design</a>
+ * book used to call it AServerInfo.
+ * <p>
+ */
+public final class ServerConnector {
+    public String getName() {
+        return name == null ? "noname" : name.getName();
+    }
+
+    public URL getURL() {
+        return url == null ? null : url.getURL();
+    }
+
+    public void reset() {
+        if (reset != null) {
+            reset.reset();
+        }
+    }
+
+    /** Additional method for API clients not available from first version.
+     * @since 2.0
+     */
+    public void shutdown() {
+        if (shutdown != null) {
+            shutdown.shutdown();
+        }
+    }
+
+    //
+    // factories
+    //
+    
+    // BEGIN: aserverinfo.regularcreate
+    public static ServerConnector create(
+        NameProvider nameProvider, 
+        URLProvider urlProvider, 
+        ResetHandler reset
+    )
+    // END: aserverinfo.regularcreate
+    {
+        return new ServerConnector(nameProvider, urlProvider, reset, null);
+    }
+    
+    /** @since 2.0 */
+    public static ServerConnector create(
+        NameProvider nameProvider, 
+        URLProvider urlProvider, 
+        ResetHandler reset, 
+        ShutdownHandler shutdown
+    )
+    // END: aserverinfo.regularcreate.withshutdown
+    {
+        return new ServerConnector(nameProvider, urlProvider, reset, shutdown);
+    }
+
+    //
+    // private part
+    //
+
+    private final NameProvider name;
+    private final URLProvider url;
+    private final ResetHandler reset;
+    private final ShutdownHandler shutdown;
+
+    private ServerConnector(
+        NameProvider name, URLProvider url,
+        ResetHandler reset, ShutdownHandler shutdown
+    ) {
+        this.name = name;
+        this.url = url;
+        this.reset = reset;
+        this.shutdown = shutdown;
+    }
+
+}
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/src/org/apidesign/aserverinfo/magicalbagfactory/ServerConnector.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/aserverinfo/src/org/apidesign/aserverinfo/magicalbagfactory/ServerConnector.java	Sat Nov 15 06:53:43 2008 +0100
@@ -0,0 +1,93 @@
+package org.apidesign.aserverinfo.magicalbagfactory;
+
+import java.net.URL;
+import org.apidesign.aserverinfo.spi.NameProvider;
+import org.apidesign.aserverinfo.spi.ResetHandler;
+import org.apidesign.aserverinfo.spi.ShutdownHandler;
+import org.apidesign.aserverinfo.spi.URLProvider;
+import org.openide.util.Lookup;
+
+/** A class to connect to server, identify it and manipulate with
+ * it state. The <a href="http://apidesign.org">Practical API Design</a>
+ * book used to call it AServerInfo.
+ * <p>
+ */
+public final class ServerConnector {
+    public String getName() {
+        return name == null ? "noname" : name.getName();
+    }
+
+    public URL getURL() {
+        return url == null ? null : url.getURL();
+    }
+
+    public void reset() {
+        if (reset != null) {
+            reset.reset();
+        }
+    }
+
+    /** Additional method for API clients not available from first version.
+     * @since 2.0
+     */
+    public void shutdown() {
+        if (shutdown != null) {
+            shutdown.shutdown();
+        }
+    }
+
+    //
+    // private part
+    //
+    
+    private final NameProvider name;
+    private final URLProvider url;
+    private final ResetHandler reset;
+    private final ShutdownHandler shutdown;
+
+    private ServerConnector(
+        NameProvider name, URLProvider url,
+        ResetHandler reset, ShutdownHandler shutdown
+    ) {
+        this.name = name;
+        this.url = url;
+        this.reset = reset;
+        this.shutdown = shutdown;
+    }
+
+    // BEGIN: aserverinfo.magicalbag.create
+    public static ServerConnector create(final Lookup interfaces) {
+        NameProvider nameP = new NameProvider() {
+            public String getName() {
+                NameProvider p = interfaces.lookup(NameProvider.class);
+                return p == null ? "noname" : p.getName();
+            }
+        };
+        URLProvider urlP = new URLProvider() {
+            public URL getURL() {
+                URLProvider p = interfaces.lookup(URLProvider.class);
+                return p == null ? null : p.getURL();
+            }
+        };
+        ResetHandler resetP = new ResetHandler() {
+            public void reset() {
+                ResetHandler h = interfaces.lookup(ResetHandler.class);
+                if (h != null) {
+                    h.reset();
+                }
+            }
+        };
+        // code present since version 2.0
+        ShutdownHandler shutH = new ShutdownHandler() {
+            public void shutdown() {
+                ShutdownHandler h = interfaces.lookup(ShutdownHandler.class);
+                if (h != null) {
+                    h.shutdown();
+                }
+            }
+        };
+        
+        return new ServerConnector(nameP, urlP, resetP, shutH);
+    }
+    // END: aserverinfo.magicalbag.create
+}
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/src/org/apidesign/aserverinfo/spi/NameProvider.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/aserverinfo/src/org/apidesign/aserverinfo/spi/NameProvider.java	Sat Nov 15 06:53:43 2008 +0100
@@ -0,0 +1,6 @@
+package org.apidesign.aserverinfo.spi;
+
+public interface NameProvider {
+
+    public String getName();
+}
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/src/org/apidesign/aserverinfo/spi/ResetHandler.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/aserverinfo/src/org/apidesign/aserverinfo/spi/ResetHandler.java	Sat Nov 15 06:53:43 2008 +0100
@@ -0,0 +1,6 @@
+package org.apidesign.aserverinfo.spi;
+
+public interface ResetHandler {
+
+    public void reset();
+}
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/src/org/apidesign/aserverinfo/spi/ShutdownHandler.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/aserverinfo/src/org/apidesign/aserverinfo/spi/ShutdownHandler.java	Sat Nov 15 06:53:43 2008 +0100
@@ -0,0 +1,15 @@
+package org.apidesign.aserverinfo.spi;
+
+/**
+ * Additional interface descrabing capability of a server connection
+ * introduced in subsequent version of the API to emulate evolution
+ * issues with various implementation of creational patterns.
+ *
+ * @since 2.0
+ * @see org.apidesign.aserverinfo.cloningfactory.ServerConnector
+ * @see org.apidesign.aserverinfo.factories.ServerConnector
+ * @see org.apidesign.aserverinfo.magicalbagfactory.ServerConnector
+ */
+public interface ShutdownHandler {
+    public void shutdown();
+}
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/src/org/apidesign/aserverinfo/spi/URLProvider.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/aserverinfo/src/org/apidesign/aserverinfo/spi/URLProvider.java	Sat Nov 15 06:53:43 2008 +0100
@@ -0,0 +1,8 @@
+package org.apidesign.aserverinfo.spi;
+
+import java.net.URL;
+
+public interface URLProvider {
+
+    public URL getURL();
+}
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/test/org/apidesign/aserverinfo/AServerInfoTest.java
--- a/samples/aserverinfo/test/org/apidesign/aserverinfo/AServerInfoTest.java	Sun Nov 09 16:20:01 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-package org.apidesign.aserverinfo;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.openide.util.Exceptions;
-
-public class AServerInfoTest {
-
-    public AServerInfoTest() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-    @Test
-    public void showUseOfCumulativeFactory() throws Exception {
-        Prov p = new Prov();
-        AServerInfo.NameProvider np = p;
-        AServerInfo.URLProvider up = p;
-        AServerInfo.ResetHandler res = p;
-        AServerInfo inf;
-        
-        // BEGIN: aserverinfo.cumulative.creation
-        inf = AServerInfo.empty().nameProvider(np).urlProvider(up).reset(res);
-        // END: aserverinfo.cumulative.creation
-        
-        assertEquals("API Design Server", inf.getName());
-        assertEquals("http://www.apidesign.org", inf.getURL().toExternalForm());
-        inf.reset();
-        assertEquals("Once reset", 1, p.resets);
-        
-    }
-    
-    @Test
-    public void showVerboseUseOfCumulativeFactory() throws Exception {
-        Prov prov = new Prov();
-        AServerInfo info;
-        
-        // BEGIN: aserverinfo.cumulative.creation.verbose
-        AServerInfo empty = AServerInfo.empty();
-        AServerInfo name = empty.nameProvider(prov);
-        AServerInfo urlAndName = name.urlProvider(prov);
-        info = urlAndName.reset(prov);
-        // END: aserverinfo.cumulative.creation.verbose
-        
-        assertEquals("API Design Server", info.getName());
-        assertEquals("http://www.apidesign.org", info.getURL().toExternalForm());
-        info.reset();
-        assertEquals("Once reset", 1, prov.resets);
-        
-    }
-    
-    
-    private static class Prov implements AServerInfo.NameProvider, AServerInfo.URLProvider, AServerInfo.ResetHandler {
-        int resets;
-
-        public String getName() {
-            return "API Design Server";
-        }
-
-        public URL getURL() {
-            try {
-                return new URL("http://www.apidesign.org");
-            } catch (MalformedURLException ex) {
-                Exceptions.printStackTrace(ex);
-                return null;
-            }
-        }
-
-        public void reset() {
-            resets++;
-        }
-
-    }
-        
-}
\ No newline at end of file
diff -r 9cbb8364c4ae -r 60bb8519cb2d samples/aserverinfo/test/org/apidesign/aserverinfo/test/ServerConnectorTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/aserverinfo/test/org/apidesign/aserverinfo/test/ServerConnectorTest.java	Sat Nov 15 06:53:43 2008 +0100
@@ -0,0 +1,89 @@
+package org.apidesign.aserverinfo.test;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.apidesign.aserverinfo.cummulativefactory.ServerConnector;
+import org.apidesign.aserverinfo.spi.NameProvider;
+import org.apidesign.aserverinfo.spi.ResetHandler;
+import org.apidesign.aserverinfo.spi.URLProvider;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.openide.util.Exceptions;
+
+public class ServerConnectorTest {
+
+    public ServerConnectorTest() {
+    }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+    @Test
+    public void showUseOfCumulativeFactory() throws Exception {
+        Prov p = new Prov();
+        NameProvider np = p;
+        URLProvider up = p;
+        ResetHandler res = p;
+        ServerConnector inf;
+        
+        // BEGIN: ServerConnector.cumulative.creation
+        inf = ServerConnector.empty().nameProvider(np).urlProvider(up).reset(res);
+        // END: ServerConnector.cumulative.creation
+        
+        assertEquals("API Design Server", inf.getName());
+        assertEquals("http://www.apidesign.org", inf.getURL().toExternalForm());
+        inf.reset();
+        assertEquals("Once reset", 1, p.resets);
+        
+    }
+    
+    @Test
+    public void showVerboseUseOfCumulativeFactory() throws Exception {
+        Prov prov = new Prov();
+        ServerConnector info;
+        
+        // BEGIN: ServerConnector.cumulative.creation.verbose
+        ServerConnector empty = ServerConnector.empty();
+        ServerConnector name = empty.nameProvider(prov);
+        ServerConnector urlAndName = name.urlProvider(prov);
+        info = urlAndName.reset(prov);
+        // END: ServerConnector.cumulative.creation.verbose
+        
+        assertEquals("API Design Server", info.getName());
+        assertEquals("http://www.apidesign.org", info.getURL().toExternalForm());
+        info.reset();
+        assertEquals("Once reset", 1, prov.resets);
+        
+    }
+    
+    
+    private static class Prov implements NameProvider, URLProvider, ResetHandler {
+        int resets;
+
+        public String getName() {
+            return "API Design Server";
+        }
+
+        public URL getURL() {
+            try {
+                return new URL("http://www.apidesign.org");
+            } catch (MalformedURLException ex) {
+                Exceptions.printStackTrace(ex);
+                return null;
+            }
+        }
+
+        public void reset() {
+            resets++;
+        }
+
+    }
+        
+}
\ No newline at end of file