summaryrefslogtreecommitdiff
path: root/packages/classpath/files/sun-security-getproperty_0.96.1.patch
blob: 6af03e75ea28e2c9f8b5437f66222c00594bb6f2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
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
91
92
93
94
95
96
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
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
Index: gnu/classpath/debug/Simple1LineFormatter.java
===================================================================
--- gnu/classpath/debug/Simple1LineFormatter.java.orig	2006-07-11 18:03:59.000000000 +0200
+++ gnu/classpath/debug/Simple1LineFormatter.java	2008-06-04 11:14:14.000000000 +0200
@@ -38,8 +38,6 @@
 
 package gnu.classpath.debug;
 
-import gnu.java.security.action.GetPropertyAction;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.security.AccessController;
@@ -51,6 +49,8 @@
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * A simple 1-line formatter to use instead of the 2-line SimpleFormatter used
  * by default in the JDK logging handlers.
Index: gnu/classpath/debug/SystemLogger.java
===================================================================
--- gnu/classpath/debug/SystemLogger.java.orig	2006-12-10 21:25:41.000000000 +0100
+++ gnu/classpath/debug/SystemLogger.java	2008-06-04 11:14:14.000000000 +0200
@@ -38,13 +38,13 @@
 
 package gnu.classpath.debug;
 
-import gnu.java.security.action.GetPropertyAction;
-
 import java.security.AccessController;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import sun.security.action.GetPropertyAction;
+
 public final class SystemLogger extends Logger
 {
   public static final SystemLogger SYSTEM = new SystemLogger();
Index: gnu/java/security/PolicyFile.java
===================================================================
--- gnu/java/security/PolicyFile.java.orig	2006-07-11 18:03:59.000000000 +0200
+++ gnu/java/security/PolicyFile.java	2008-06-04 11:14:50.000000000 +0200
@@ -39,7 +39,6 @@
 
 import gnu.classpath.debug.Component;
 import gnu.classpath.debug.SystemLogger;
-import gnu.java.security.action.GetPropertyAction;
 
 import java.io.File;
 import java.io.IOException;
@@ -72,6 +71,8 @@
 import java.util.StringTokenizer;
 import java.util.logging.Logger;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * An implementation of a {@link java.security.Policy} object whose
  * permissions are specified by a <em>policy file</em>.
Index: gnu/java/security/action/GetPropertyAction.java
===================================================================
--- gnu/java/security/action/GetPropertyAction.java	2006-12-10 21:25:42.000000000 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/* GetPropertyAction.java
-   Copyright (C) 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.security.action;
-
-import java.security.PrivilegedAction;
-
-/**
- * PrivilegedAction implementation that calls System.getProperty() with
- * the property name passed to its constructor.
- *
- * Example of use:
- * <code>
- * GetPropertyAction action = new GetPropertyAction("http.proxyPort");
- * String port = AccessController.doPrivileged(action);
- * </code>
- */
-public class GetPropertyAction implements PrivilegedAction<String>
-{
-  String name;
-  String value = null;
-
-  public GetPropertyAction()
-  {
-  }
-  
-  public GetPropertyAction(String propName)
-  {
-    setParameters(propName);
-  }
-
-  public GetPropertyAction(String propName, String defaultValue)
-  {
-    setParameters(propName, defaultValue);
-  }
-  
-  public String run()
-  {
-    return System.getProperty(name, value);
-  }
-  
-  public GetPropertyAction setParameters(String propName)
-  {
-    this.name = propName;
-    this.value = null;
-    return this;
-  }
-
-  public GetPropertyAction setParameters(String propName, String defaultValue)
-  {
-    this.name = propName;
-    this.value = defaultValue;
-    return this;
-  }
-}
Index: gnu/java/security/key/dss/DSSKey.java
===================================================================
--- gnu/java/security/key/dss/DSSKey.java.orig	2006-08-05 05:23:27.000000000 +0200
+++ gnu/java/security/key/dss/DSSKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -39,7 +39,6 @@
 package gnu.java.security.key.dss;
 
 import gnu.java.security.Registry;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.util.FormatUtil;
 
 import java.math.BigInteger;
@@ -49,6 +48,8 @@
 import java.security.interfaces.DSAParams;
 import java.security.spec.DSAParameterSpec;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * A base asbtract class for both public and private DSS (Digital Signature
  * Standard) keys. It encapsulates the three DSS numbers: <code>p</code>,
Index: gnu/java/security/key/dss/DSSPrivateKey.java
===================================================================
--- gnu/java/security/key/dss/DSSPrivateKey.java.orig	2006-07-11 18:04:00.000000000 +0200
+++ gnu/java/security/key/dss/DSSPrivateKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -40,7 +40,6 @@
 
 import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.key.IKeyPairCodec;
 
 import java.math.BigInteger;
@@ -48,6 +47,8 @@
 import java.security.PrivateKey;
 import java.security.interfaces.DSAPrivateKey;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * An object that embodies a DSS (Digital Signature Standard) private key.
  * 
Index: gnu/java/security/key/dss/DSSPublicKey.java
===================================================================
--- gnu/java/security/key/dss/DSSPublicKey.java.orig	2006-07-11 18:04:00.000000000 +0200
+++ gnu/java/security/key/dss/DSSPublicKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -39,7 +39,6 @@
 package gnu.java.security.key.dss;
 
 import gnu.java.security.Registry;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.key.IKeyPairCodec;
 
 import java.math.BigInteger;
@@ -47,6 +46,8 @@
 import java.security.PublicKey;
 import java.security.interfaces.DSAPublicKey;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * An object that embodies a DSS (Digital Signature Standard) public key.
  * 
Index: gnu/java/security/key/rsa/GnuRSAKey.java
===================================================================
--- gnu/java/security/key/rsa/GnuRSAKey.java.orig	2006-07-11 18:04:00.000000000 +0200
+++ gnu/java/security/key/rsa/GnuRSAKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -39,7 +39,6 @@
 package gnu.java.security.key.rsa;
 
 import gnu.java.security.Registry;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.util.FormatUtil;
 
 import java.math.BigInteger;
@@ -47,6 +46,8 @@
 import java.security.Key;
 import java.security.interfaces.RSAKey;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * A base asbtract class for both public and private RSA keys.
  */
Index: gnu/java/security/key/rsa/GnuRSAPrivateKey.java
===================================================================
--- gnu/java/security/key/rsa/GnuRSAPrivateKey.java.orig	2006-07-11 18:04:00.000000000 +0200
+++ gnu/java/security/key/rsa/GnuRSAPrivateKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -39,7 +39,6 @@
 package gnu.java.security.key.rsa;
 
 import gnu.java.security.Configuration;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.Registry;
 import gnu.java.security.key.IKeyPairCodec;
 
@@ -49,6 +48,8 @@
 import java.security.interfaces.RSAPrivateCrtKey;
 import java.security.interfaces.RSAPrivateKey;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * An object that embodies an RSA private key.
  * <p>
Index: gnu/java/security/key/rsa/GnuRSAPublicKey.java
===================================================================
--- gnu/java/security/key/rsa/GnuRSAPublicKey.java.orig	2006-07-11 18:04:00.000000000 +0200
+++ gnu/java/security/key/rsa/GnuRSAPublicKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -39,7 +39,6 @@
 package gnu.java.security.key.rsa;
 
 import gnu.java.security.Registry;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.key.IKeyPairCodec;
 
 import java.math.BigInteger;
@@ -47,6 +46,8 @@
 import java.security.PublicKey;
 import java.security.interfaces.RSAPublicKey;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * An object that encapsulates an RSA public key.
  * <p>
Index: gnu/javax/crypto/key/dh/GnuDHKey.java
===================================================================
--- gnu/javax/crypto/key/dh/GnuDHKey.java.orig	2006-07-11 18:03:59.000000000 +0200
+++ gnu/javax/crypto/key/dh/GnuDHKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -39,7 +39,6 @@
 package gnu.javax.crypto.key.dh;
 
 import gnu.java.security.Registry;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.util.FormatUtil;
 
 import java.math.BigInteger;
@@ -49,6 +48,8 @@
 import javax.crypto.interfaces.DHKey;
 import javax.crypto.spec.DHParameterSpec;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * A base asbtract class for both public and private Diffie-Hellman keys. It
  * encapsulates the two DH numbers: <code>p</code>, and <code>g</code>.
Index: gnu/javax/crypto/key/dh/GnuDHPrivateKey.java
===================================================================
--- gnu/javax/crypto/key/dh/GnuDHPrivateKey.java.orig	2006-07-11 18:03:59.000000000 +0200
+++ gnu/javax/crypto/key/dh/GnuDHPrivateKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -40,7 +40,6 @@
 
 import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.key.IKeyPairCodec;
 
 import java.math.BigInteger;
@@ -48,6 +47,8 @@
 
 import javax.crypto.interfaces.DHPrivateKey;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * An implementation of the Diffie-Hellman private key.
  * <p>
Index: gnu/javax/crypto/key/dh/GnuDHPublicKey.java
===================================================================
--- gnu/javax/crypto/key/dh/GnuDHPublicKey.java.orig	2006-07-11 18:03:59.000000000 +0200
+++ gnu/javax/crypto/key/dh/GnuDHPublicKey.java	2008-06-04 11:14:14.000000000 +0200
@@ -39,7 +39,6 @@
 package gnu.javax.crypto.key.dh;
 
 import gnu.java.security.Registry;
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.key.IKeyPairCodec;
 
 import java.math.BigInteger;
@@ -47,6 +46,8 @@
 
 import javax.crypto.interfaces.DHPublicKey;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * An implementation of the Diffie-Hellman public key.
  * <p>
Index: gnu/javax/crypto/sasl/plain/PasswordFile.java
===================================================================
--- gnu/javax/crypto/sasl/plain/PasswordFile.java.orig	2006-07-11 18:03:59.000000000 +0200
+++ gnu/javax/crypto/sasl/plain/PasswordFile.java	2008-06-04 11:14:14.000000000 +0200
@@ -38,7 +38,6 @@
 
 package gnu.javax.crypto.sasl.plain;
 
-import gnu.java.security.action.GetPropertyAction;
 import gnu.javax.crypto.sasl.NoSuchUserException;
 import gnu.javax.crypto.sasl.UserAlreadyExistsException;
 
@@ -56,6 +55,8 @@
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * A representation of a Plain password file.
  */
Index: gnu/javax/net/ssl/provider/X509TrustManagerFactory.java
===================================================================
--- gnu/javax/net/ssl/provider/X509TrustManagerFactory.java.orig	2006-12-10 21:25:43.000000000 +0100
+++ gnu/javax/net/ssl/provider/X509TrustManagerFactory.java	2008-06-04 11:14:14.000000000 +0200
@@ -66,11 +66,12 @@
 import javax.net.ssl.TrustManagerFactorySpi;
 import javax.net.ssl.X509TrustManager;
 
-import gnu.java.security.action.GetPropertyAction;
 import gnu.java.security.x509.X509CertPath;
 import gnu.javax.net.ssl.NullManagerParameters;
 import gnu.javax.net.ssl.StaticTrustAnchors;
 
+import sun.security.action.GetPropertyAction;
+
 /**
  * This class implements a {@link javax.net.ssl.TrustManagerFactory} engine
  * for the ``JessieX509'' algorithm.
Index: gnu/xml/aelfred2/XmlParser.java
===================================================================
--- gnu/xml/aelfred2/XmlParser.java.orig	2007-09-21 20:05:21.000000000 +0200
+++ gnu/xml/aelfred2/XmlParser.java	2008-06-04 11:14:14.000000000 +0200
@@ -53,8 +53,6 @@
 
 package gnu.xml.aelfred2;
 
-import gnu.java.security.action.GetPropertyAction;
-
 import java.io.BufferedInputStream;
 import java.io.CharConversionException;
 import java.io.EOFException;
@@ -74,6 +72,7 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import sun.security.action.GetPropertyAction;
 
 /**
  * Parse XML documents and return parse events through call-backs.
Index: sun/security/action/GetPropertyAction.java
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ sun/security/action/GetPropertyAction.java	2008-06-04 11:14:14.000000000 +0200
@@ -0,0 +1,92 @@
+/* GetPropertyAction.java
+   Copyright (C) 2004, 2008 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package sun.security.action;
+
+import java.security.PrivilegedAction;
+
+/**
+ * PrivilegedAction implementation that calls System.getProperty() with
+ * the property name passed to its constructor.
+ *
+ * Example of use:
+ * <code>
+ * GetPropertyAction action = new GetPropertyAction("http.proxyPort");
+ * String port = AccessController.doPrivileged(action);
+ * </code>
+ *
+ * Note: Usage of this class is discouraged as it is not a part of the 
+ * J2SE API.
+ */
+public class GetPropertyAction implements PrivilegedAction<String>
+{
+  String name;
+  String value = null;
+
+  public GetPropertyAction()
+  {
+  }
+  
+  public GetPropertyAction(String propName)
+  {
+    setParameters(propName);
+  }
+
+  public GetPropertyAction(String propName, String defaultValue)
+  {
+    setParameters(propName, defaultValue);
+  }
+  
+  public String run()
+  {
+    return System.getProperty(name, value);
+  }
+  
+  public GetPropertyAction setParameters(String propName)
+  {
+    this.name = propName;
+    this.value = null;
+    return this;
+  }
+
+  public GetPropertyAction setParameters(String propName, String defaultValue)
+  {
+    this.name = propName;
+    this.value = defaultValue;
+    return this;
+  }
+}