I cleaned up the NewDriver a little bit (the constructor is
completely unnecessary), and separated the Base64Encoder out
from AuthManager.java.
The reason for splitting Base64Encoder is to make it easier to
store and embed keys in the generated configuration files for
the SSL TrustStore and KeyStore that I will be adding.
? org/apache/jmeter/protocol/http/util/Base64Encoder.java
Index: org/apache/jmeter/NewDriver.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/NewDriver.java,v
retrieving revision 1.6
diff -u -b -r1.6 NewDriver.java
--- org/apache/jmeter/NewDriver.java 2001/07/26 00:34:43 1.6
+++ org/apache/jmeter/NewDriver.java 2001/08/29 13:42:58
@@ -71,14 +71,6 @@
public class NewDriver
{
-
- /************************************************************
- * Constructor for the NewDriver object
- ***********************************************************/
- public NewDriver()
- {
- }
-
/************************************************************
* The main program for the NewDriver class
*
@@ -91,7 +83,6 @@
JMeterUtils.getProperties(args[0]);
}
- NewDriver newDriver1 = new NewDriver();
JMeterTreeModel treeModel = new JMeterTreeModel();
JMeterTreeListener treeLis = new JMeterTreeListener(treeModel);
MainFrame main = new MainFrame(ActionRouter.getInstance(),
Index: org/apache/jmeter/protocol/http/control/AuthManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/AuthManager.java,v
retrieving revision 1.11
diff -u -b -r1.11 AuthManager.java
--- org/apache/jmeter/protocol/http/control/AuthManager.java 2001/08/28 21:28:32
1.11
+++ org/apache/jmeter/protocol/http/control/AuthManager.java 2001/08/29 13:43:11
@@ -394,106 +394,3 @@
}
}
-/************************************************************
- * This class provides an implementation of Base64 encoding without relying on
- * the the sun.* packages.
- *
- *@author $Author: mstover1 $
- *@created $Date: 2001/08/28 21:28:32 $
- *@version $Revision: 1.11 $
- ***********************************************************/
-
-class Base64Encoder
-{
-
- private final static char[] pem_array = {65, 66, 67, 68, 69, 70, 71, 72, 73,
74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 97, 98, 99, 100,
- 101, 102, 103, 104, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 43, 47};
- private final static char eq = 61;
-
- /************************************************************
- * !ToDo (Constructor description)
- ***********************************************************/
- public Base64Encoder()
- {
- }
-
- /************************************************************
- * !ToDo (Method description)
- *
- *@param s !ToDo (Parameter description)
- *@return !ToDo (Return description)
- ***********************************************************/
- public final static String encode(String s)
- {
- return encode(s.getBytes());
- }
-
- /************************************************************
- * !ToDo (Method description)
- *
- *@param bs !ToDo (Parameter description)
- *@return !ToDo (Return description)
- ***********************************************************/
- public final static String encode(byte[] bs)
- {
- StringBuffer out = new StringBuffer("");
- int bl = bs.length;
- for (int i = 0; i < bl; i += 3)
- {
- out.append(encodeAtom(bs, i, (bl - i)));
- }
- return out.toString();
- }
-
- /************************************************************
- * !ToDo (Method description)
- *
- *@param b !ToDo (Parameter description)
- *@param strt !ToDo (Parameter description)
- *@param left !ToDo (Parameter description)
- *@return !ToDo (Return description)
- ***********************************************************/
- public final static String encodeAtom(byte[] b, int strt, int left)
- {
- StringBuffer out = new StringBuffer("");
- if (left == 1)
- {
- byte b1 = b[strt];
- int k = 0;
- out.append(String.valueOf(pem_array[b1 >>> 2 & 63]));
- out.append(String.valueOf(pem_array[(b1 << 4 & 48) + (k >>> 4
& 15)]));
- out.append(String.valueOf(eq));
- out.append(String.valueOf(eq));
- return out.toString();
- }
- if (left == 2)
- {
- byte b2 = b[strt];
- byte b4 = b[strt + 1];
- int l = 0;
- out.append(String.valueOf(pem_array[b2 >>> 2 & 63]));
- out.append(String.valueOf(pem_array[(b2 << 4 & 48) + (b4 >>> 4
& 15)]));
- out.append(String.valueOf(pem_array[(b4 << 2 & 60) + (l >>> 6
& 3)]));
- out.append(String.valueOf(eq));
- return out.toString();
- }
- byte b3 = b[strt];
- byte b5 = b[strt + 1];
- byte b6 = b[strt + 2];
- out.append(String.valueOf(pem_array[b3 >>> 2 & 63]));
- out.append(String.valueOf(pem_array[(b3 << 4 & 48) + (b5 >>> 4 &
15)]));
- out.append(String.valueOf(pem_array[(b5 << 2 & 60) + (b6 >>> 6 & 3)]));
- out.append(String.valueOf(pem_array[b6 & 63]));
- return out.toString();
- }
-
- static
- {
- }
-}
-
Base64Encoder.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
