# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213429946 -7200
# Node ID 130e099942d8edaccc2510e62e6d74f840200069
# Parent  019f1e9f7741cc72010a30b1f88f0e688fd5c08e
Merge: Geertjan's changes up to 4500

diff -r 019f1e9f7741 -r 130e099942d8 samples/messagedigest/build.xml
--- a/samples/messagedigest/build.xml	Sat Jun 14 09:52:26 2008 +0200
+++ b/samples/messagedigest/build.xml	Sat Jun 14 09:52:26 2008 +0200
@@ -9,28 +9,30 @@
             <param name="version" value="new-api"/>
         </antcall>
         <antcall target="-build-one">
-            <param name="version" value="new-spi"/>
+            <param name="version" value="bridge"/>
             <param name="cp" value="build/new-api/classes"/>
         </antcall>
-        <antcall target="-build-one">
-            <param name="version" value="bridge"/>
-            <param name="cp" value="build/new-api/classes:build/new-spi/classes"/>
-        </antcall>
         
         <antcall target="-build-one">
             <param name="version" value="test"/>
-            <param name="cp" value="build/new-api/classes:build/new-spi/classes:${junit.jar}"/>
+            <param name="cp" value="build/new-api/classes:${junit.jar}"/>
         </antcall>
     </target>
     
-    <target name="test" depends="build">
+    <target name="test">
+        <antcall target="-do-test">
+            <param name="nodebug" value="true"/>
+        </antcall>
+    </target>
+        
+    <target name="-do-test" depends="build">
         <echo level="info" message="Running the tests with bridge enabled. This should succeeds."/>
         <antcall target="-run-one">
-            <param name="test.cp" value="build/new-api/classes:build/new-spi/classes:build/bridge/classes"/>
+            <param name="test.cp" value="build/new-api/classes:build/bridge/classes"/>
         </antcall>
         <echo level="info" message="Running the tests without bridge module. This should fail."/>
         <antcall target="-run-one">
-            <param name="test.cp" value="build/new-api/classes:build/new-spi/classes"/>
+            <param name="test.cp" value="build/new-api/classes"/>
         </antcall>
     </target>
     
@@ -41,13 +43,25 @@
         
         <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
     </target>
+
+    <target name="-debug-one" if="netbeans.home" unless="nodebug">
+        <nbjpdastart addressproperty="jpda.address" name="MessageDigest and Bridges" transport="dt_socket" >
+            <sourcepath path="src-new-api:src-bridge:src-test:build/test/classes"/>
+            <classpath path="build/new-api/classes:build/bridge/classes:build/test/classes"/>
+        </nbjpdastart>
+        <property name="debug1" value="-Xdebug"/>
+        <property name="debug2" value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+    </target>
     
-    <target name="-run-one">
+    <target name="-run-one" depends="-debug-one">
+        <property name="debug1" value="-Dn1"/>
+        <property name="debug2" value="-Dn2"/>
+        <property name="include" value="**/*Test"/>
         <mkdir dir="build/testresults"/>
         <junit dir="build/test/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
             <batchtest todir="build/testresults">
                 <fileset dir="build/test/classes">
-                    <filename name="**/*Test.class"/>
+                    <filename name="${include}.class"/>
                 </fileset>
             </batchtest>
             <classpath>
@@ -57,6 +71,8 @@
             </classpath>
             <formatter type="brief" usefile="false"/>
             <formatter type="xml"/>
+            <jvmarg value="${debug1}"/>
+            <jvmarg value="${debug2}"/>
         </junit>
     </target>
     
@@ -70,6 +86,7 @@
             destdir="build/${version}/classes" 
             source="1.5" target="1.5"
             classpath="${cp}"
+            debug="true" debuglevel="lines,vars,source"
         />
         <copy todir="build/${version}/classes">
             <fileset dir="src-${version}">
diff -r 019f1e9f7741 -r 130e099942d8 samples/messagedigest/nbproject/project.xml
--- a/samples/messagedigest/nbproject/project.xml	Sat Jun 14 09:52:26 2008 +0200
+++ b/samples/messagedigest/nbproject/project.xml	Sat Jun 14 09:52:26 2008 +0200
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.ant.freeform</type>
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
-            <name>bridges</name>
+            <name>MessageDigest and Bridges</name>
         </general-data>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
             <!-- Do not use Project Properties customizer when editing this file manually. -->
@@ -17,12 +17,6 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>src-new-spi</label>
-                    <type>java</type>
-                    <location>src-new-spi</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
-                <source-folder>
                     <label>src-bridge</label>
                     <type>java</type>
                     <location>src-bridge</location>
@@ -34,6 +28,11 @@
                     <location>src-test</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>MessageDigest and Bridges</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -49,23 +48,45 @@
                     <target>clean</target>
                     <target>build</target>
                 </action>
+                <action name="debug.single">
+                    <target>-do-test</target>
+                    <context>
+                        <property>include</property>
+                        <folder>src-test</folder>
+                        <format>relative-path-noext</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
             </ide-actions>
+            <export>
+                <type>folder</type>
+                <location>build/bridge/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/new-api/classes</location>
+                <build-target>build</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>build/test/classes</location>
+                <build-target>build</build-target>
+            </export>
             <view>
                 <items>
                     <source-folder style="packages">
-                        <label>New API for Clients</label>
+                        <label>src-new-api</label>
                         <location>src-new-api</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>New API for Providers</label>
-                        <location>src-new-spi</location>
-                    </source-folder>
-                    <source-folder style="packages">
-                        <label>Bridge</label>
+                        <label>src-bridge</label>
                         <location>src-bridge</location>
                     </source-folder>
                     <source-folder style="packages">
-                        <label>Tests</label>
+                        <label>test</label>
                         <location>src-test</location>
                     </source-folder>
                     <source-file>
@@ -77,27 +98,27 @@
                     <ide-action name="rebuild"/>
                     <ide-action name="clean"/>
                     <ide-action name="test"/>
+                    <ide-action name="debug"/>
                 </context-menu>
             </view>
+            <subprojects/>
         </general-data>
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
             <compilation-unit>
                 <package-root>src-new-api</package-root>
+                <built-to>build/bridge/classes</built-to>
+                <built-to>build/new-api/classes</built-to>
+                <built-to>build/test/classes</built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
-                <package-root>src-new-spi</package-root>
+                <package-root>src-bridge</package-root>
                 <classpath mode="compile">src-new-api</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
-                <package-root>src-bridge</package-root>
-                <classpath mode="compile">src-new-api:src-new-spi</classpath>
-                <source-level>1.5</source-level>
-            </compilation-unit>
-            <compilation-unit>
                 <package-root>src-test</package-root>
-                <classpath mode="compile">src-api1.0:../libs/dist/junit-4.4.jar</classpath>
+                <classpath mode="compile">src-new-api:../libs/dist/junit-4.4.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
diff -r 019f1e9f7741 -r 130e099942d8 samples/messagedigest/src-bridge/org/apidesign/impl/security/extension/BridgeToOld.java
--- a/samples/messagedigest/src-bridge/org/apidesign/impl/security/extension/BridgeToOld.java	Sat Jun 14 09:52:26 2008 +0200
+++ b/samples/messagedigest/src-bridge/org/apidesign/impl/security/extension/BridgeToOld.java	Sat Jun 14 09:52:26 2008 +0200
@@ -19,23 +19,37 @@
  *
  * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
  */
-public class BridgeToOld extends Provider {
+// BEGIN: day.end.bridges.BridgeToOld
+public final class BridgeToOld extends Provider {
 
     public BridgeToOld() {
         super("spi.Digestor", 1.0, "");
         Security.addProvider(this);
     }
+
+    // BEGIN: day.end.bridges.cycle
+    private ThreadLocal<Boolean> searching = new ThreadLocal<Boolean>();
+    final boolean isSearching() {
+        return Boolean.TRUE.equals(searching.get());
+    }
     
     @Override
     public synchronized Service getService(String type, String algorithm) {
-        if ("MessageDigest".equals(type)) {
-            Digest dig = Digest.getInstance(algorithm);
-            if (dig != null) {
-                return new ServiceImpl(dig, this, type, algorithm, "", Collections.<String>emptyList(), Collections.<String,String>emptyMap());
+        Boolean prev = searching.get();
+        try {
+            searching.set(Boolean.TRUE);
+            if ("MessageDigest".equals(type)) {
+                Digest dig = Digest.getInstance(algorithm);
+                if (dig != null) {
+                    return new ServiceImpl(dig, this, type, algorithm, "", Collections.<String>emptyList(), Collections.<String,String>emptyMap());
+                }
             }
+            return null;
+        } finally {
+            searching.set(prev);
         }
-        return null;
     }
+    // END: day.end.bridges.cycle
 
     private static class ServiceImpl<Data> extends Service {
         Digest dig;
@@ -80,3 +94,4 @@
     }
 
 }
+// END: day.end.bridges.BridgeToOld
diff -r 019f1e9f7741 -r 130e099942d8 samples/messagedigest/src-new-api/org/apidesign/api/security/Digest.java
--- a/samples/messagedigest/src-new-api/org/apidesign/api/security/Digest.java	Sat Jun 14 09:52:26 2008 +0200
+++ b/samples/messagedigest/src-new-api/org/apidesign/api/security/Digest.java	Sat Jun 14 09:52:26 2008 +0200
@@ -2,28 +2,28 @@
 package org.apidesign.api.security;
 
 import java.nio.ByteBuffer;
-import org.apidesign.impl.security.friendapi.DigestImplementation;
-import org.apidesign.impl.security.friendapi.DigestProvider;
 import java.util.ServiceLoader;
+import org.apidesign.spi.security.Digestor;
 
-/** MessageDigest extends MessageDigestSpi, that means the javadoc
+/** Simplified version of a Digest class that allows to compute a fingerprint
+ * for buffer of data.
  *
- * @author Jaroslav Tulach
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
  */
 // BEGIN: day.end.bridges.Digest
 public final class Digest {
-    private final DigestImplementation impl;
+    private final DigestImplementation<?> impl;
     
     /** Factory method is better than constructor */
-    private Digest(DigestImplementation impl) {
+    private Digest(DigestImplementation<?> impl) {
         this.impl = impl;
     }
     
     /** Factory method to create digest for an algorithm.
      */
     public static Digest getInstance(String algorithm) {
-        for (DigestProvider dp : ServiceLoader.load(DigestProvider.class)) {
-            DigestImplementation impl = dp.create(algorithm);
+        for (Digestor<?> digestor : ServiceLoader.load(Digestor.class)) {
+            DigestImplementation<?> impl = DigestImplementation.create(digestor, algorithm);
             if (impl != null) {
                 return new Digest(impl);
             }
@@ -37,8 +37,7 @@
     //
     
     public byte[] digest(ByteBuffer bb) {
-        impl.update(bb);
-        return impl.digest();
+        return impl.digest(bb);
     }
 }
 // END: day.end.bridges.Digest
diff -r 019f1e9f7741 -r 130e099942d8 samples/messagedigest/src-test/test/CountingDigestor.java
--- a/samples/messagedigest/src-test/test/CountingDigestor.java	Sat Jun 14 09:52:26 2008 +0200
+++ b/samples/messagedigest/src-test/test/CountingDigestor.java	Sat Jun 14 09:52:26 2008 +0200
@@ -10,10 +10,10 @@
 
 /**
  *
- * @author jarda
+ * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
  */
+// BEGIN: day.end.bridges.CountingDigestor
 public final class CountingDigestor extends Digestor<int[]> {
-
     @Override
     protected byte[] digest(int[] data) {
         int i = data[0];
@@ -31,5 +31,5 @@
         data[0] += input.remaining();
         input.position(input.position() + input.remaining());
     }
-
 }
+// END: day.end.bridges.CountingDigestor
\ No newline at end of file
diff -r 019f1e9f7741 -r 130e099942d8 samples/messagedigest/src-test/test/OldAPIToNewAPITest.java
--- a/samples/messagedigest/src-test/test/OldAPIToNewAPITest.java	Sat Jun 14 09:52:26 2008 +0200
+++ b/samples/messagedigest/src-test/test/OldAPIToNewAPITest.java	Sat Jun 14 09:52:26 2008 +0200
@@ -43,6 +43,7 @@
 
     @Test
     public void generateHashUsingMessageDigest() throws Exception {
+        // BEGIN: day.end.bridges.BridgeToOldRegister
         // The java.security.Providers cannot be registered in META-INF/services
         // that is why one needs to either configure various properties or
         // make some dummy call that will initialize our bridge class.
@@ -51,6 +52,7 @@
         //
         // This is the call:
         Digest initialize = Digest.getInstance("MD5");
+        // END: day.end.bridges.BridgeToOldRegister
         
         MessageDigest md = MessageDigest.getInstance("cnt");
         byte[] res = md.digest(arr);