diff options
author | Adam Young <ayoung@redhat.com> | 2011-12-02 17:21:55 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-12-02 17:22:32 -0500 |
commit | 4982426d746fcac1b381c8d6f0498ecdfc4110b8 (patch) | |
tree | f70c1179fdc9e6ce10ba31c72ab22497359f0f61 /pki/base/common/src/com/netscape/cms/servlet | |
parent | 1f775b2e89af6e09fa56ea218ed92dc3dccaeb79 (diff) | |
download | pki-4982426d746fcac1b381c8d6f0498ecdfc4110b8.tar.gz pki-4982426d746fcac1b381c8d6f0498ecdfc4110b8.tar.xz pki-4982426d746fcac1b381c8d6f0498ecdfc4110b8.zip |
Revert "Remove Deprecated Date Functions"
This reverts commit d7d71804b885118e74928e413a8e7fb91b78706c.
It was commited by mistake. It changes the Certificate Geenrate code, and requires a unit test
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet')
3 files changed, 22 insertions, 33 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java index f32d6c189..649d70169 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java @@ -19,7 +19,6 @@ package com.netscape.cms.servlet.cert; import java.io.IOException; -import java.util.Calendar; import java.util.Date; import java.util.Enumeration; import java.util.Locale; @@ -348,9 +347,8 @@ public class Monitor extends CMSServlet { int hour = Integer.parseInt(z.substring(8, 10)); int minute = Integer.parseInt(z.substring(10, 12)); int second = Integer.parseInt(z.substring(12, 14)); - Calendar calendar= Calendar.getInstance(); - calendar.set(year, month, date, hour, minute, second); - d = calendar.getTime(); + + d = new Date(year, month, date, hour, minute, second); } catch (NumberFormatException nfe) { } } else if (z != null && z.length() > 1 && z.charAt(0) == '-') { // -5 @@ -367,25 +365,21 @@ public class Monitor extends CMSServlet { } String DateToZString(Date d) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(d); - - - String time = "" + (calendar.get(Calendar.YEAR)); - int i = calendar.get(Calendar.MONTH) + 1; + String time = "" + (d.getYear() + 1900); + int i = d.getMonth() + 1; if (i < 10) time += "0"; time += i; - i = calendar.get(Calendar.DAY_OF_MONTH); + i = d.getDate(); if (i < 10) time += "0"; time += i; - i = calendar.get(Calendar.HOUR_OF_DAY); + i = d.getHours(); if (i < 10) time += "0"; time += i; - i = calendar.get(Calendar.MINUTE); + i = d.getMinutes(); if (i < 10) time += "0"; time += i; - i = calendar.get(Calendar.SECOND); + i = d.getSeconds(); if (i < 10) time += "0"; time += i + "Z"; return time; diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java index 1ea07bfff..86fa0dc57 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java @@ -19,7 +19,6 @@ package com.netscape.cms.servlet.cert; import java.io.IOException; -import java.util.Calendar; import java.util.Date; import java.util.Enumeration; import java.util.Locale; @@ -598,20 +597,20 @@ public class RemoteAuthConfig extends CMSServlet { } private String makeInstanceName() { - Calendar now = Calendar.getInstance(); - int y = now.get(Calendar.YEAR); + Date now = new Date(); + int y = 1900 + now.getYear(); String name = "R" + y; - if (now.get(Calendar.MONTH) < 10) name += "0"; - name += now.get(Calendar.MONTH); - if (now.get(Calendar.DAY_OF_MONTH) < 10) name += "0"; - name += now.get(Calendar.DAY_OF_MONTH); - if (now.get(Calendar.HOUR_OF_DAY) < 10) name += "0"; - name += now.get(Calendar.HOUR_OF_DAY); - if (now.get(Calendar.MINUTE) < 10) name += "0"; - name += now.get(Calendar.MINUTE); - if (now.get(Calendar.SECOND) < 10) name += "0"; - name += now.get(Calendar.SECOND); + if (now.getMonth() < 10) name += "0"; + name += now.getMonth(); + if (now.getDate() < 10) name += "0"; + name += now.getDate(); + if (now.getHours() < 10) name += "0"; + name += now.getHours(); + if (now.getMinutes() < 10) name += "0"; + name += now.getMinutes(); + if (now.getSeconds() < 10) name += "0"; + name += now.getSeconds(); return name; } } diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java index 3420aaee0..811c5f107 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.math.BigInteger; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import java.util.Calendar; import java.util.Date; import java.util.Enumeration; import java.util.Vector; @@ -191,11 +190,8 @@ public class RenewalServlet extends CMSServlet { if (beginYear != -1 && beginMonth != -1 && beginDate != -1 && endYear != -1 && endMonth != -1 && endDate != -1) { - Calendar calendar = Calendar.getInstance(); - calendar.set(beginYear, beginMonth, beginDate); - notBefore = calendar.getTime(); - calendar.set(endYear, endMonth, endDate); - notAfter = calendar.getTime(); + notBefore = new Date(beginYear, beginMonth, beginDate); + notAfter = new Date(endYear, endMonth, endDate); } } // coming from client else { |