Mavenized the project. Upgraded to clojure 1.3.0.

31 files changed, 116 insertions, 54 deletions

diff --git a/.classpath b/.classpath
deleted file mode 100644
index b4dad6d..0000000
--- a/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/usr/share/icedtea-web/plugin.jar"/>
-	<classpathentry kind="lib" path="classes"/>
-	<classpathentry kind="lib" path="clojure-1.2.0.jar"/>
-	<classpathentry kind="lib" path="monads-1.3.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="accumulators-1.3.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="def-1.3.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="macro-utils-1.3.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="types-1.3.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="generic-1.3.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="json-1.3.0-SNAPSHOT.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index ae2eee6..0000000
--- a/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>gnunet</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>ccw.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>ccw.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/accumulators-1.3.0-SNAPSHOT.jar b/accumulators-1.3.0-SNAPSHOT.jar
deleted file mode 100644
index 1f994b9..0000000
--- a/accumulators-1.3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/clojure-1.2.0.jar b/clojure-1.2.0.jar
deleted file mode 100644
index b067bb0..0000000
--- a/clojure-1.2.0.jar
+++ /dev/null
diff --git a/def-1.3.0-SNAPSHOT.jar b/def-1.3.0-SNAPSHOT.jar
deleted file mode 100644
index 09fee12..0000000
--- a/def-1.3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/generic-1.3.0-SNAPSHOT.jar b/generic-1.3.0-SNAPSHOT.jar
deleted file mode 100644
index 7175c57..0000000
--- a/generic-1.3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/json-1.3.0-SNAPSHOT.jar b/json-1.3.0-SNAPSHOT.jar
deleted file mode 100644
index 013f3df..0000000
--- a/json-1.3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/macro-utils-1.3.0-SNAPSHOT.jar b/macro-utils-1.3.0-SNAPSHOT.jar
deleted file mode 100644
index 08117fb..0000000
--- a/macro-utils-1.3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/monads-1.3.0-SNAPSHOT.jar b/monads-1.3.0-SNAPSHOT.jar
deleted file mode 100644
index 40c91ef..0000000
--- a/monads-1.3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..d66407a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.gnu.clojure.gnunet</groupId>
+  <artifactId>gnunet</artifactId>
+  <version>0.1-SNAPSHOT</version>
+  <name>GNUnet</name>
+  <properties>
+    <clojure.version>1.3.0-master-SNAPSHOT</clojure.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>netscape</groupId>
+      <artifactId>javascript</artifactId>
+      <version>1.1</version>
+      <scope>system</scope>
+      <systemPath>/usr/share/icedtea-web/plugin.jar</systemPath>
+    </dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>clojure</artifactId>
+      <version>${clojure.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.clojure.contrib</groupId>
+      <artifactId>monads</artifactId>
+      <version>1.3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.clojure.contrib</groupId>
+      <artifactId>json</artifactId>
+      <version>1.3.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/clojure</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>com.theoryinpractise</groupId>
+        <artifactId>clojure-maven-plugin</artifactId>
+        <version>1.3.3</version>
+        <configuration>
+          <!--
+	  <compileDeclaredNamespaceOnly>true</compileDeclaredNamespaceOnly>
+	  <namespaces>	    
+	    <namespace>!.*</namespace>
+          </namespaces>
+          -->
+        </configuration>
+        <executions>
+          <execution>
+            <id>compile-clojure</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-clojure</id>
+            <phase>test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>clojure/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <additionalBuildcommands>
+            <buildcommand>ccw.builder</buildcommand>
+          </additionalBuildcommands>
+          <additionalProjectnatures>
+            <projectnature>ccw.nature</projectnature>
+          </additionalProjectnatures>
+        </configuration>  
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/org/gnu/clojure/gnunet/bloomfilter.clj b/src/main/clojure/org/gnu/clojure/gnunet/bloomfilter.clj
index c7b1531..c7b1531 100644
--- a/src/org/gnu/clojure/gnunet/bloomfilter.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/bloomfilter.clj
diff --git a/src/org/gnu/clojure/gnunet/core.clj b/src/main/clojure/org/gnu/clojure/gnunet/core.clj
index a9ee858..34e4a60 100644
--- a/src/org/gnu/clojure/gnunet/core.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/core.clj
@@ -323,7 +323,7 @@
                   (conj %
                     {:last-sequence-number-received seqnum
                      :last-packets-bitmap (.intValue
-                                            (bit-shift-left (bigint bitmap)
+                                            (bit-shift-left (biginteger bitmap)
                                               (- seqnum last-seqnum)))})))
            :when-not (.before (:timestamp message) (message-expiration))
            ;; TODO: update bandwidth tracking
diff --git a/src/org/gnu/clojure/gnunet/crypto.clj b/src/main/clojure/org/gnu/clojure/gnunet/crypto.clj
index a0e9808..0d824e3 100644
--- a/src/org/gnu/clojure/gnunet/crypto.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/crypto.clj
@@ -234,7 +234,7 @@
   "Generate a 2048 bit RSA keypair."
   [random]
   (let [rsa (KeyPairGenerator/getInstance "RSA")
-        spec (RSAKeyGenParameterSpec. 2048 (bigint 257))]
+        spec (RSAKeyGenParameterSpec. 2048 (biginteger 257))]
     (.initialize rsa spec random)
     (.generateKeyPair rsa)))
 
@@ -338,12 +338,12 @@
          -116 59 14 37 66 56 2]])))
   
 (defn fermat-compositeness-test
-  "Perform Fermat's Compositeness Test on the given bigint."
+  "Perform Fermat's Compositeness Test on the given BigInteger."
   [number]
-  (not (== 1 (.modPow (bigint 2) (dec number) number))))
+  (not (== 1 (.modPow (biginteger 2) (dec number) number))))
 
 (defn miller-rabin-compositeness-test
-  "Perform the Miller-Rabin Compositeness Test on the given bigint with the
+  "Perform the Miller-Rabin Compositeness Test on the given BigInteger with the
    given number of rounds. This version uses a witness of 2 for the first
    round."
   [n steps seed]
@@ -355,12 +355,13 @@
       (if (>= step steps)
         [false seed]
         (let [[x seed] (if (zero? step)
-                         [(bigint 2) seed]
+                         [(biginteger 2) seed]
                          (random-int (dec bit-length) seed))
               y (.modPow x q n)]
           (if (or (== 1 y) (== nminus1 y))
             (recur (inc step) seed)
-            (if (loop [g (next (take k (iterate #(.modPow % (bigint 2) n) y)))]
+            (if (loop [g (next
+                           (take k (iterate #(.modPow % (biginteger 2) n) y)))]
                   (cond
                     (nil? g) false
                     (== 1 (first g)) false
@@ -423,13 +424,13 @@
                                            [p q] (sort [p q])
                                            n (* p q)]
                                        [n p q seed])
-                             [(bigint 0) 0 0 seed])))
+                             [(biginteger 0) 0 0 seed])))
           t1 (dec p)
           t2 (dec q)
           phi (* t1 t2)
           g (.gcd t1 t2)
           f (quot phi g)
-          e (bigint (first (filter #(== 1 (.gcd phi (bigint %)))
+          e (biginteger (first (filter #(== 1 (.gcd phi (biginteger %)))
                              (iterate (partial + 2) 257))))]
       (let [private-key (try
                           (let [d (.modInverse e f)
diff --git a/src/org/gnu/clojure/gnunet/exception.clj b/src/main/clojure/org/gnu/clojure/gnunet/exception.clj
index 456bc05..456bc05 100644
--- a/src/org/gnu/clojure/gnunet/exception.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/exception.clj
diff --git a/src/org/gnu/clojure/gnunet/filesharing.clj b/src/main/clojure/org/gnu/clojure/gnunet/filesharing.clj
index c05c36c..c05c36c 100644
--- a/src/org/gnu/clojure/gnunet/filesharing.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/filesharing.clj
diff --git a/src/org/gnu/clojure/gnunet/hello.clj b/src/main/clojure/org/gnu/clojure/gnunet/hello.clj
index 6ad2b45..6ad2b45 100644
--- a/src/org/gnu/clojure/gnunet/hello.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/hello.clj
diff --git a/src/org/gnu/clojure/gnunet/hostlist.clj b/src/main/clojure/org/gnu/clojure/gnunet/hostlist.clj
index bd154e6..bd154e6 100644
--- a/src/org/gnu/clojure/gnunet/hostlist.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/hostlist.clj
diff --git a/src/org/gnu/clojure/gnunet/inet.clj b/src/main/clojure/org/gnu/clojure/gnunet/inet.clj
index 3ab6851..3ab6851 100644
--- a/src/org/gnu/clojure/gnunet/inet.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/inet.clj
diff --git a/src/org/gnu/clojure/gnunet/iostream.clj b/src/main/clojure/org/gnu/clojure/gnunet/iostream.clj
index fdc2fb9..fdc2fb9 100644
--- a/src/org/gnu/clojure/gnunet/iostream.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/iostream.clj
diff --git a/src/org/gnu/clojure/gnunet/message.clj b/src/main/clojure/org/gnu/clojure/gnunet/message.clj
index 124070f..44e31c8 100644
--- a/src/org/gnu/clojure/gnunet/message.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/message.clj
@@ -8,7 +8,7 @@
 (defn encode-int
   "Convert an integer to a sequence of bytes in network order."
   [x]
-  (let [big (bigint x)
+  (let [big (biginteger x)
         len (max 1 (bit-count-to-bytes (.bitLength big)))
         a (.toByteArray big)]
     (drop (- (alength a) len) a)))
@@ -27,7 +27,7 @@
 (defn encode-int64
   "Convert a 64-bit integer to a sequence of bytes in network order."
   [x]
-  (concat (encode-int32 (bit-shift-right (bigint x) 32))
+  (concat (encode-int32 (bit-and (bit-shift-right x 32) 0xFFFFFFFF))
     (encode-int32 (bit-and x 0xFFFFFFFF))))
 
 (defn decode-int
diff --git a/src/org/gnu/clojure/gnunet/metrics.clj b/src/main/clojure/org/gnu/clojure/gnunet/metrics.clj
index 3daad3b..3daad3b 100644
--- a/src/org/gnu/clojure/gnunet/metrics.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/metrics.clj
diff --git a/src/org/gnu/clojure/gnunet/parser.clj b/src/main/clojure/org/gnu/clojure/gnunet/parser.clj
index e931e90..e931e90 100644
--- a/src/org/gnu/clojure/gnunet/parser.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/parser.clj
diff --git a/src/org/gnu/clojure/gnunet/peer.clj b/src/main/clojure/org/gnu/clojure/gnunet/peer.clj
index adb7a2b..adb7a2b 100644
--- a/src/org/gnu/clojure/gnunet/peer.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/peer.clj
diff --git a/src/org/gnu/clojure/gnunet/primes.clj b/src/main/clojure/org/gnu/clojure/gnunet/primes.clj
index 1c143b4..1c143b4 100644
--- a/src/org/gnu/clojure/gnunet/primes.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/primes.clj
diff --git a/src/org/gnu/clojure/gnunet/tcp.clj b/src/main/clojure/org/gnu/clojure/gnunet/tcp.clj
index fac38e4..430dad8 100644
--- a/src/org/gnu/clojure/gnunet/tcp.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/tcp.clj
@@ -198,7 +198,7 @@
                     :send-queue send-queue
                     :remote-peer-id (:id remote-peer)
                     :received-bytes []})]
-              (do
+              (try
                 (.connect socket-channel address)
                 (.add send-queue
                   {:bytes (generate-welcome-message peer)
@@ -206,7 +206,12 @@
                 (update-selection-key-async! peer selection-key
                   SelectionKey/OP_CONNECT
                   (partial handle-socket-channel-selected! peer transport
-                    encoded-address)))))))
+                    encoded-address))
+                (catch Exception e
+                  (.add (:selector-continuations-queue peer)
+                    #(handle-disconnect! peer transport encoded-address
+                      selection-key))
+                  (.wakeup (:selector peer))))))))
       (.wakeup (:selector peer)))))
 
 (defn emit-messages-tcp!
diff --git a/src/org/gnu/clojure/gnunet/transport.clj b/src/main/clojure/org/gnu/clojure/gnunet/transport.clj
index 25d1511..25d1511 100644
--- a/src/org/gnu/clojure/gnunet/transport.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/transport.clj
diff --git a/src/org/gnu/clojure/gnunet/udp.clj b/src/main/clojure/org/gnu/clojure/gnunet/udp.clj
index 4c40d74..4c40d74 100644
--- a/src/org/gnu/clojure/gnunet/udp.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/udp.clj
diff --git a/src/org/gnu/clojure/gnunet/util.clj b/src/main/clojure/org/gnu/clojure/gnunet/util.clj
index 329df62..329df62 100644
--- a/src/org/gnu/clojure/gnunet/util.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunet/util.clj
diff --git a/src/org/gnu/clojure/gnunetapplet/applet.clj b/src/main/clojure/org/gnu/clojure/gnunetapplet/applet.clj
index 9b97b67..52c3c0d 100644
--- a/src/org/gnu/clojure/gnunetapplet/applet.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunetapplet/applet.clj
@@ -1,5 +1,5 @@
 (ns org.gnu.clojure.gnunetapplet.applet
-  (:use (clojure.contrib json monads)
+  (:use clojure.contrib.json
     [clojure.main :only (repl)]
     (org.gnu.clojure.gnunet crypto hostlist inet peer tcp transport)
     org.gnu.clojure.gnunetapplet.base64)
@@ -86,7 +86,7 @@
   [applet stdin stdout stderr]
   (.setContextClassLoader (Thread/currentThread)
     (.getClassLoader (.getClass applet)))
-  (declare *applet*)
+  (declare ^:dynamic *applet*)
   (with-bindings {#'*in* stdin
                   #'*out* stdout
                   #'*err* stderr
diff --git a/src/org/gnu/clojure/gnunetapplet/base64.clj b/src/main/clojure/org/gnu/clojure/gnunetapplet/base64.clj
index 9b6dfb3..9b6dfb3 100644
--- a/src/org/gnu/clojure/gnunetapplet/base64.clj
+++ b/src/main/clojure/org/gnu/clojure/gnunetapplet/base64.clj
diff --git a/types-1.3.0-SNAPSHOT.jar b/types-1.3.0-SNAPSHOT.jar
deleted file mode 100644
index 1b0392d..0000000
--- a/types-1.3.0-SNAPSHOT.jar
+++ /dev/null