[Webfunds-commits] java/webfunds/client Client.java
Edwin Woudt
edwin@cypherpunks.ai
Mon, 12 Jun 2000 07:07:56 -0400 (AST)
edwin 00/06/12 07:07:56
Modified: . Tag: OPENPGP build.bat init.bat
webfunds/client Tag: OPENPGP Client.java
Removed: hotlava/crypto Tag: OPENPGP Provider.java Random.java
Log:
Fix merging errors.
Revision Changes Path
No revision
= Diff supressed due to Sticky Options =
No revision
= Diff supressed due to Sticky Options =
1.4.2.2 +0 -1 java/build.bat
Index: build.bat
===================================================================
RCS file: /home/webfunds/cvsroot/java/build.bat,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- build.bat 2000/05/27 02:58:53 1.4.2.1
+++ build.bat 2000/06/12 11:07:55 1.4.2.2
@@ -8,7 +8,6 @@
if "%javac%" == "" set javac=javac
%javac% -d ..\build sun\security\x509\*.java
-%javac% -d ..\build hotlava\crypto\*.java
%javac% -d ..\build webfunds\utils\*.java
%javac% -d ..\build webfunds\sox\*.java
%javac% -d ..\build webfunds\client\sun\*.java
1.3.4.2 +1 -1 java/init.bat
Index: init.bat
===================================================================
RCS file: /home/webfunds/cvsroot/java/init.bat,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- init.bat 2000/06/12 10:38:02 1.3.4.1
+++ init.bat 2000/06/12 11:07:55 1.3.4.2
@@ -1 +1 @@
-SET CLASSPATH=%CLASSPATH%;..\lib\cryptix.jar;..\lib\openpgp.jar;..\build
+SET CLASSPATH=..\lib\cryptix.jar;..\lib\openpgp.jar;..\build;%CLASSPATH%
No revision
= Diff supressed due to Sticky Options =
No revision
= Diff supressed due to Sticky Options =
1.22.2.3 +2 -1 java/webfunds/client/Client.java
Index: Client.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/Client.java,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -r1.22.2.2 -r1.22.2.3
--- Client.java 2000/06/12 10:38:03 1.22.2.2
+++ Client.java 2000/06/12 11:07:56 1.22.2.3
@@ -1,5 +1,5 @@
/*
- * $Id: Client.java,v 1.22.2.2 2000/06/12 10:38:03 edwin Exp $
+ * $Id: Client.java,v 1.22.2.3 2000/06/12 11:07:56 edwin Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -10,6 +10,7 @@
import java.io.*;
import java.net.*;
import java.security.*;
+import java.util.*;
import webfunds.client.sox.*;
import webfunds.client.sox.SOXWallet;