0
@@ -172,6 +172,7 @@
0
         <zipfileset src="${build.lib.dir}/jline-0.9.91.jar"/>
0
         <zipfileset src="${build.lib.dir}/joni.jar"/>
0
         <zipfileset src="${build.lib.dir}/jna.jar"/>
0
+        <zipfileset src="${build.lib.dir}/joda-time-1.5.1.jar"/>
0
         <rule pattern="org.objectweb.asm.**" result="jruby.objectweb.asm.@1"/>
0
         <manifest>
0
           <attribute name="Built-By" value="${user.name}"/>
0
@@ -212,6 +213,7 @@
0
         <zipfileset src="${build.lib.dir}/backport-util-concurrent.jar"/>
0
         <zipfileset src="${build.lib.dir}/joni.jar"/>
0
         <zipfileset src="${build.lib.dir}/jna.jar"/>
0
+        <zipfileset src="${build.lib.dir}/joda-time-1.5.1.jar"/>
0
         <rule pattern="org.objectweb.asm.**" result="jruby.objectweb.asm.@1"/>
0
         <zipfileset dir="${basedir}" prefix="META-INF/jruby.home">
0
           <include name="bin/*"/>
0
@@ -927,6 +929,7 @@ test/externals/rubinius/spec/parser"/>
0
       <zipfileset src="${build.lib.dir}/jline-0.9.91.jar"/>
0
       <zipfileset src="${build.lib.dir}/joni.jar"/>
0
       <zipfileset src="${build.lib.dir}/jna.jar"/>
0
+      <zipfileset src="${build.lib.dir}/joda-time-1.5.1.jar"/>
0
       <zipfileset src="${nailgun.home}/nailgun-0.7.1.jar"/>
0
       <rule pattern="org.objectweb.asm.**" result="jruby.objectweb.asm.@1"/>
0
       <manifest>

0
@@ -36,10 +36,7 @@
0
  ***** END LICENSE BLOCK *****/
0
 package org.jruby;
0
 
0
-import java.text.SimpleDateFormat;
0
-import java.util.Calendar;
0
 import java.util.Date;
0
-import java.util.GregorianCalendar;
0
 import java.util.Locale;
0
 import java.util.TimeZone;
0
 import java.util.regex.Matcher;
0
@@ -56,16 +53,24 @@ import org.jruby.runtime.builtin.IRubyObject;
0
 import org.jruby.util.RubyDateFormat;
0
 import org.jruby.util.ByteList;
0
 
0
+import org.joda.time.DateTime;
0
+import org.joda.time.DateTimeZone;
0
+import org.joda.time.format.DateTimeFormat;
0
+import org.joda.time.format.DateTimeFormatter;
0
+
0
 /** The Time class.
0
  * 
0
  * @author chadfowler, jpetersen
0
  */
0
 public class RubyTime extends RubyObject {
0
     public static final String UTC = "UTC";
0
-  private Calendar cal;
0
+  private DateTime dt;
0
     private long usec;
0
+    private final static DateTimeFormatter ONE_DAY_CTIME_FORMATTER = DateTimeFormat.forPattern("EEE MMM  d HH:mm:ss yyyy");
0
+    private final static DateTimeFormatter TWO_DAY_CTIME_FORMATTER = DateTimeFormat.forPattern("EEE MMM dd HH:mm:ss yyyy");
0
 
0
-    private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("-", Locale.US);
0
+    private final static DateTimeFormatter TO_S_FORMATTER = DateTimeFormat.forPattern("EEE MMM dd HH:mm:ss Z yyyy");
0
+    private final static DateTimeFormatter TO_S_UTC_FORMATTER = DateTimeFormat.forPattern("EEE MMM dd HH:mm:ss 'UTC' yyyy");
0
 
0
     // There are two different popular TZ formats: legacy (AST+3:00:00, GMT-3), and
0
     // newer one (US/Pacific, America/Los_Angeles). This pattern is to detect
0
@@ -76,13 +81,13 @@ public class RubyTime extends RubyObject {
0
     
0
     private static final ByteList TZ_STRING = ByteList.create("TZ");
0
      
0
-    public static TimeZone getLocalTimeZone(Ruby runtime) {
0
+    public static DateTimeZone getLocalTimeZone(Ruby runtime) {
0
         // TODO: cache the RubyString "TZ" so it doesn't need to be recreated for each call?
0
         RubyString tzVar = runtime.newString(TZ_STRING);
0
         RubyHash h = ((RubyHash)runtime.getObject().fastGetConstant("ENV"));
0
         IRubyObject tz = h.op_aref(tzVar);
0
         if (tz == null || ! (tz instanceof RubyString)) {
0
-            return TimeZone.getDefault();
0
+            return DateTimeZone.getDefault();
0
         } else {
0
             String zone = tz.toString();
0
 
0
@@ -108,7 +113,9 @@ public class RubyTime extends RubyObject {
0
                     zone += minutes;
0
                 }
0
             }
0
-            return TimeZone.getTimeZone(zone);
0
+
0
+            zone = zone.replaceAll("GMT","Etc/GMT");
0
+            return DateTimeZone.forTimeZone(TimeZone.getTimeZone(zone));
0
         }
0
     }
0
     
0
@@ -116,17 +123,15 @@ public class RubyTime extends RubyObject {
0
         super(runtime, rubyClass);
0
     }
0
     
0
-    public RubyTime(Ruby runtime, RubyClass rubyClass, Calendar cal) {
0
+    public RubyTime(Ruby runtime, RubyClass rubyClass, DateTime dt) {
0
         super(runtime, rubyClass);
0
-        this.cal = cal;
0
+        this.dt = dt;
0
     }
0
     
0
     private static ObjectAllocator TIME_ALLOCATOR = new ObjectAllocator() {
0
         public IRubyObject allocate(Ruby runtime, RubyClass klass) {
0
-            RubyTime instance = new RubyTime(runtime, klass);
0
-            Calendar cal = Calendar.getInstance(getLocalTimeZone(runtime));
0
-            instance.setJavaCalendar(cal);
0
-            return instance;
0
+            DateTime dt = new DateTime(getLocalTimeZone(runtime));
0
+            return new RubyTime(runtime, klass, dt);
0
         }
0
     };
0
     
0
@@ -149,28 +154,20 @@ public class RubyTime extends RubyObject {
0
         return usec;
0
     }
0
     
0
-    public void updateCal(Calendar calendar) {
0
-        calendar.setTimeZone(cal.getTimeZone());
0
-        calendar.setTimeInMillis(getTimeInMillis());
0
+    public void updateCal(DateTime dt) {
0
+        this.dt = dt;
0
     }
0
     
0
     protected long getTimeInMillis() {
0
-        return cal.getTimeInMillis();  // For JDK 1.4 we can use "cal.getTimeInMillis()"
0
+        return dt.getMillis();  // For JDK 1.4 we can use "cal.getTimeInMillis()"
0
     }
0
     
0
     public static RubyTime newTime(Ruby runtime, long milliseconds) {
0
-        Calendar cal = Calendar.getInstance();
0
-        RubyTime time = new RubyTime(runtime, runtime.getTime(), cal);
0
-        
0
-        cal.setTimeInMillis(milliseconds);
0
-        
0
-        return time;
0
+        return newTime(runtime, new DateTime(milliseconds));
0
     }
0
     
0
-    public static RubyTime newTime(Ruby runtime, Calendar cal) {
0
-        RubyTime time = new RubyTime(runtime, runtime.getTime(), cal);
0
-        
0
-        return time;
0
+    public static RubyTime newTime(Ruby runtime, DateTime dt) {
0
+        return new RubyTime(runtime, runtime.getTime(), dt);
0
     }
0
 
0
     @JRubyMethod(name = "initialize_copy", required = 1)
0
@@ -181,7 +178,8 @@ public class RubyTime extends RubyObject {
0
         
0
         RubyTime originalTime = (RubyTime) original;
0
         
0
-        cal = (Calendar)(originalTime.cal.clone());
0
+        // We can just use dt, since it is immutable
0
+        dt = originalTime.dt;
0
         usec = originalTime.usec;
0
         
0
         return this;
0
@@ -189,51 +187,42 @@ public class RubyTime extends RubyObject {
0
 
0
     @JRubyMethod(name = "succ")
0
     public RubyTime succ() {
0
-        Calendar newCal = (Calendar)cal.clone();
0
-        newCal.add(Calendar.SECOND,1);
0
-        return newTime(getRuntime(),newCal);
0
+        return newTime(getRuntime(),dt.plusSeconds(1));
0
     }
0
 
0
     @JRubyMethod(name = {"gmtime", "utc"})
0
     public RubyTime gmtime() {
0
-        cal.setTimeZone(TimeZone.getTimeZone(UTC));
0
+        dt = new DateTime(dt.getMillis()).withZone(DateTimeZone.UTC);
0
         return this;
0
     }
0
 
0
     @JRubyMethod(name = "localtime")
0
     public RubyTime localtime() {
0
-        long dump = cal.getTimeInMillis();
0
-        cal = Calendar.getInstance(getLocalTimeZone(getRuntime()));
0
-        cal.setTimeInMillis(dump);
0
+        dt = dt.withZone(getLocalTimeZone(getRuntime()));
0
         return this;
0
     }
0
     
0
     @JRubyMethod(name = {"gmt?", "utc?", "gmtime?"})
0
     public RubyBoolean gmt() {
0
-        return getRuntime().newBoolean(cal.getTimeZone().getID().equals(UTC));
0
+        return getRuntime().newBoolean(dt.getZone().getID().equals("UTC"));
0
     }
0
     
0
     @JRubyMethod(name = {"getgm", "getutc"})
0
     public RubyTime getgm() {
0
-        Calendar newCal = (Calendar)cal.clone();
0
-        newCal.setTimeZone(TimeZone.getTimeZone(UTC));
0
-        return newTime(getRuntime(), newCal);
0
+        return newTime(getRuntime(), dt.withZone(DateTimeZone.UTC));
0
     }
0
 
0
     @JRubyMethod(name = "getlocal")
0
     public RubyTime getlocal() {
0
-        Calendar newCal = (Calendar)cal.clone();
0
-        newCal.setTimeZone(getLocalTimeZone(getRuntime()));
0
-        return newTime(getRuntime(), newCal);
0
+        return newTime(getRuntime(), dt.withZone(getLocalTimeZone(getRuntime())));
0
     }
0
 
0
     @JRubyMethod(name = "strftime", required = 1)
0
     public RubyString strftime(IRubyObject format) {
0
         final RubyDateFormat rubyDateFormat = new RubyDateFormat("-", Locale.US);
0
-        rubyDateFormat.setCalendar(cal);
0
         rubyDateFormat.applyPattern(format.toString());
0
-        String result = rubyDateFormat.format(cal.getTime());
0
-
0
+        rubyDateFormat.setDateTime(dt);
0
+        String result = rubyDateFormat.format(null);
0
         return getRuntime().newString(result);
0
     }
0
     
0
@@ -301,9 +290,7 @@ public class RubyTime extends RubyObject {
0
     time += adjustment;
0
 
0
     RubyTime newTime = new RubyTime(getRuntime(), getMetaClass());
0
-    newTime.cal = Calendar.getInstance();
0
-        newTime.cal.setTimeZone(cal.getTimeZone());
0
-    newTime.cal.setTime(new Date(time));
0
+    newTime.dt = new DateTime(time).withZone(dt.getZone());
0
         newTime.setUSec(micro);
0
 
0
     return newTime;
0
@@ -325,9 +312,7 @@ public class RubyTime extends RubyObject {
0
         time -= adjustment;
0
 
0
     RubyTime newTime = new RubyTime(getRuntime(), getMetaClass());
0
-    newTime.cal = Calendar.getInstance();
0
-        newTime.cal.setTimeZone(cal.getTimeZone());
0
-    newTime.cal.setTime(new Date(time));
0
+    newTime.dt = new DateTime(time).withZone(dt.getZone());
0
         newTime.setUSec(micro);
0
 
0
     return newTime;
0
@@ -388,26 +373,27 @@ public class RubyTime extends RubyObject {
0
 
0
     @JRubyMethod(name = {"asctime", "ctime"})
0
     public RubyString asctime() {
0
-        simpleDateFormat.setCalendar(cal);
0
-        if (cal.get(Calendar.DAY_OF_MONTH) < 10) {
0
-            simpleDateFormat.applyPattern("EEE MMM  d HH:mm:ss yyyy");
0
+        DateTimeFormatter simpleDateFormat;
0
+
0
+        if (dt.getDayOfMonth() < 10) {
0
+            simpleDateFormat = ONE_DAY_CTIME_FORMATTER;
0
         } else {
0
-            simpleDateFormat.applyPattern("EEE MMM dd HH:mm:ss yyyy");
0
+            simpleDateFormat = TWO_DAY_CTIME_FORMATTER;
0
         }
0
-        String result = simpleDateFormat.format(cal.getTime());
0
-
0
+        String result = simpleDateFormat.print(dt);
0
         return getRuntime().newString(result);
0
     }
0
 
0
     @JRubyMethod(name = {"to_s", "inspect"})
0
     public IRubyObject to_s() {
0
-        simpleDateFormat.setCalendar(cal);
0
-        if (cal.getTimeZone().getID().equals(UTC)) {
0
-            simpleDateFormat.applyPattern("EEE MMM dd HH:mm:ss 'UTC' yyyy");
0
+        DateTimeFormatter simpleDateFormat;
0
+        if (dt.getZone().equals(DateTimeZone.UTC)) {
0
+            simpleDateFormat = TO_S_UTC_FORMATTER;
0
         } else {
0
-            simpleDateFormat.applyPattern("EEE MMM dd HH:mm:ss Z yyyy");
0
+            simpleDateFormat = TO_S_FORMATTER;
0
         }
0
-        String result = simpleDateFormat.format(cal.getTime());
0
+
0
+        String result = simpleDateFormat.print(dt);
0
 
0
         return getRuntime().newString(result);
0
     }
0
@@ -432,14 +418,14 @@ public class RubyTime extends RubyObject {
0
 
0
     @JRubyMethod(name = {"usec", "tv_usec"})
0
     public RubyInteger usec() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.MILLISECOND) * 1000 + getUSec());
0
+        return getRuntime().newFixnum(dt.getMillisOfSecond() * 1000 + getUSec());
0
     }
0
 
0
     public void setMicroseconds(long mic) {
0
         long millis = getTimeInMillis() % 1000;
0
         long withoutMillis = getTimeInMillis() - millis;
0
         withoutMillis += (mic / 1000);
0
-        cal.setTimeInMillis(withoutMillis);
0
+        dt = dt.withMillis(withoutMillis);
0
         usec = mic % 1000;
0
     }
0
     
0
@@ -449,81 +435,81 @@ public class RubyTime extends RubyObject {
0
 
0
     @JRubyMethod(name = "sec")
0
     public RubyInteger sec() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.SECOND));
0
+        return getRuntime().newFixnum(dt.getSecondOfMinute());
0
     }
0
 
0
     @JRubyMethod(name = "min")
0
     public RubyInteger min() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.MINUTE));
0
+        return getRuntime().newFixnum(dt.getMinuteOfHour());
0
     }
0
 
0
     @JRubyMethod(name = "hour")
0
     public RubyInteger hour() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.HOUR_OF_DAY));
0
+        return getRuntime().newFixnum(dt.getHourOfDay());
0
     }
0
 
0
     @JRubyMethod(name = {"mday", "day"})
0
     public RubyInteger mday() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.DAY_OF_MONTH));
0
+        return getRuntime().newFixnum(dt.getDayOfMonth());
0
     }
0
 
0
     @JRubyMethod(name = {"month", "mon"})
0
     public RubyInteger month() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.MONTH) + 1);
0
+        return getRuntime().newFixnum(dt.getMonthOfYear());
0
     }
0
 
0
     @JRubyMethod(name = "year")
0
     public RubyInteger year() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.YEAR));
0
+        return getRuntime().newFixnum(dt.getYear());
0
     }
0
 
0
     @JRubyMethod(name = "wday")
0
     public RubyInteger wday() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.DAY_OF_WEEK) - 1);
0
+        return getRuntime().newFixnum((dt.getDayOfWeek()%7));
0
     }
0
 
0
     @JRubyMethod(name = "yday")
0
     public RubyInteger yday() {
0
-        return getRuntime().newFixnum(cal.get(Calendar.DAY_OF_YEAR));
0
+        return getRuntime().newFixnum(dt.getDayOfYear());
0
     }
0
 
0
     @JRubyMethod(name = {"gmt_offset", "gmtoff", "utc_offset"})
0
     public RubyInteger gmt_offset() {
0
-        int offset = cal.get(Calendar.ZONE_OFFSET);
0
-        
0
-        if (isdst().isTrue()) {
0
-            offset += cal.get(Calendar.DST_OFFSET);
0
-        }
0
+        int offset = dt.getZone().getOffsetFromLocal(dt.getMillis());
0
         
0
         return getRuntime().newFixnum((int)(offset/1000));
0
     }
0
 
0
     @JRubyMethod(name = {"isdst", "dst?"})
0
     public RubyBoolean isdst() {
0
-        return getRuntime().newBoolean(cal.getTimeZone().inDaylightTime(cal.getTime()));
0
+        return getRuntime().newBoolean(!dt.getZone().isStandardOffset(dt.getMillis()));
0
     }
0
 
0
     @JRubyMethod(name = "zone")
0
     public RubyString zone() {
0
-        return getRuntime().newString(cal.getTimeZone().getDisplayName(cal.get(Calendar.DST_OFFSET) != 0, TimeZone.SHORT));
0
+        String zone = dt.getZone().getShortName(dt.getMillis());
0
+        if(zone.equals("+00:00")) {
0
+            zone = "GMT";
0
+        }
0
+        return getRuntime().newString(zone);
0
     }
0
 
0
-    public void setJavaCalendar(Calendar cal) {
0
-        this.cal = cal;
0
+    public void setDateTime(DateTime dt) {
0
+        this.dt = dt;
0
     }
0
 
0
-    public Calendar getJavaCalendar() {
0
-        return this.cal;
0
+    public DateTime getDateTime() {
0
+        return this.dt;
0
     }
0
 
0
     public Date getJavaDate() {
0
-        return this.cal.getTime();
0
+        return this.dt.toDate();
0
     }
0
 
0
     @JRubyMethod(name = "hash")
0
     public RubyFixnum hash() {
0
       // modified to match how hash is calculated in 1.8.2
0
-        return getRuntime().newFixnum((int)(((cal.getTimeInMillis() / 1000) ^ microseconds()) << 1) >> 1);
0
+        return getRuntime().newFixnum((int)(((dt.getMillis() / 1000) ^ microseconds()) << 1) >> 1);
0
     }    
0
 
0
     @JRubyMethod(name = "_dump", optional = 1, frame = true)
0
@@ -535,18 +521,18 @@ public class RubyTime extends RubyObject {
0
 
0
     public RubyObject mdump(final IRubyObject[] args) {
0
         RubyTime obj = (RubyTime)args[0];
0
-        Calendar calendar = obj.gmtime().cal;
0
+        DateTime dt = obj.gmtime().dt;
0
         byte dumpValue[] = new byte[8];
0
         int pe = 
0
             0x1                                 << 31 |
0
-            (calendar.get(Calendar.YEAR)-1900)  << 14 |
0
-            calendar.get(Calendar.MONTH)        << 10 |
0
-            calendar.get(Calendar.DAY_OF_MONTH) << 5  |
0
-            calendar.get(Calendar.HOUR_OF_DAY);
0
+            (dt.getYear()-1900)                 << 14 |
0
+            dt.getMonthOfYear()                 << 10 |
0
+            dt.getDayOfMonth()                  << 5  |
0
+            dt.getHourOfDay();
0
         int se =
0
-            calendar.get(Calendar.MINUTE)       << 26 |
0
-            calendar.get(Calendar.SECOND)       << 20 |
0
-            calendar.get(Calendar.MILLISECOND);
0
+            dt.getMinuteOfHour()                << 26 |
0
+            dt.getSecondOfMinute()              << 20 |
0
+            dt.getMillisOfSecond();
0
 
0
         for(int i = 0; i < 4; i++) {
0
             dumpValue[i] = (byte)(pe & 0xFF);
0
@@ -568,10 +554,7 @@ public class RubyTime extends RubyObject {
0
     
0
     public static IRubyObject s_new(IRubyObject recv, IRubyObject[] args, Block block) {
0
         Ruby runtime = recv.getRuntime();
0
-        RubyTime time = new RubyTime(runtime, (RubyClass) recv);
0
-        GregorianCalendar cal = new GregorianCalendar();
0
-        cal.setTime(new Date());
0
-        time.setJavaCalendar(cal);
0
+        RubyTime time = new RubyTime(runtime, (RubyClass) recv, new DateTime());
0
         time.callInit(args,block);
0
         return time;
0
     }
0
@@ -587,12 +570,11 @@ public class RubyTime extends RubyObject {
0
     public static IRubyObject at(IRubyObject recv, IRubyObject[] args) {
0
         Ruby runtime = recv.getRuntime();
0
 
0
-        Calendar cal = Calendar.getInstance(getLocalTimeZone(runtime));
0
-        RubyTime time = new RubyTime(runtime, (RubyClass) recv, cal);
0
+        RubyTime time = new RubyTime(runtime, (RubyClass) recv, new DateTime(getLocalTimeZone(runtime)));
0
 
0
         if (args[0] instanceof RubyTime) {
0
             RubyTime other = (RubyTime) args[0];
0
-            other.updateCal(cal);
0
+            time.dt = other.dt;
0
             time.setUSec(other.getUSec());
0
         } else {
0
             long seconds = RubyNumeric.num2long(args[0]);
0
@@ -616,7 +598,7 @@ public class RubyTime extends RubyObject {
0
                 }
0
             }
0
             time.setUSec(microsecs);
0
-            cal.setTimeInMillis(seconds * 1000 + millisecs);
0
+            time.dt = time.dt.withMillis(seconds * 1000 + millisecs);
0
         }
0
 
0
         time.callInit(IRubyObject.NULL_ARRAY, Block.NULL_BLOCK);
0
@@ -641,9 +623,9 @@ public class RubyTime extends RubyObject {
0
 
0
     protected static RubyTime s_mload(IRubyObject recv, RubyTime time, IRubyObject from) {
0
         Ruby runtime = recv.getRuntime();
0
-        Calendar calendar = Calendar.getInstance();
0
-        calendar.clear();
0
-        calendar.setTimeZone(TimeZone.getTimeZone(RubyTime.UTC));
0
+
0
+        DateTime dt = new DateTime(DateTimeZone.UTC);
0
+
0
         byte[] fromAsBytes = null;
0
         fromAsBytes = from.convertToString().getBytes();
0
         if(fromAsBytes.length != 8) {
0
@@ -658,18 +640,18 @@ public class RubyTime extends RubyObject {
0
             s |= ((int)fromAsBytes[i] & 0xFF) << (8 * (i - 4));
0
         }
0
         if ((p & (1<<31)) == 0) {
0
-            calendar.setTimeInMillis(p * 1000L + s);
0
+            dt = dt.withMillis(p * 1000L + s);
0
         } else {
0
             p &= ~(1<<31);
0
-            calendar.set(Calendar.YEAR, ((p >>> 14) & 0xFFFF) + 1900);
0
-            calendar.set(Calendar.MONTH, ((p >>> 10) & 0xF));
0
-            calendar.set(Calendar.DAY_OF_MONTH, ((p >>> 5)  & 0x1F));
0
-            calendar.set(Calendar.HOUR_OF_DAY, (p & 0x1F));
0
-            calendar.set(Calendar.MINUTE, ((s >>> 26) & 0x3F));
0
-            calendar.set(Calendar.SECOND, ((s >>> 20) & 0x3F));
0
-            calendar.set(Calendar.MILLISECOND, (s & 0xFFFFF));
0
+            dt = dt.withYear(((p >>> 14) & 0xFFFF) + 1900);
0
+            dt = dt.withMonthOfYear(((p >>> 10) & 0xF));
0
+            dt = dt.withDayOfMonth(((p >>> 5)  & 0x1F));
0
+            dt = dt.withHourOfDay((p & 0x1F));
0
+            dt = dt.withMinuteOfHour(((s >>> 26) & 0x3F));
0
+            dt = dt.withSecondOfMinute(((s >>> 20) & 0x3F));
0
+            dt = dt.withMillisOfSecond((s & 0xFFFFF));
0
         }
0
-        time.setJavaCalendar(calendar);
0
+        time.setDateTime(dt);
0
         return time;
0
     }
0
     
0
@@ -706,7 +688,7 @@ public class RubyTime extends RubyObject {
0
         }
0
         
0
         int year = (int) RubyNumeric.num2long(args[0]);
0
-        int month = 0;
0
+        int month = 1;
0
         
0
         if (len > 1) {
0
             if (!args[1].isNil()) {
0
@@ -714,22 +696,22 @@ public class RubyTime extends RubyObject {
0
                     month = -1;
0
                     for (int i = 0; i < 12; i++) {
0
                         if (months[i].equalsIgnoreCase(args[1].toString())) {
0
-                            month = i;
0
+                            month = i+1;
0
                         }
0
                     }
0
                     if (month == -1) {
0
                         try {
0
-                            month = Integer.parseInt(args[1].toString()) - 1;
0
+                            month = Integer.parseInt(args[1].toString());
0
                         } catch (NumberFormatException nfExcptn) {
0
                             throw runtime.newArgumentError("Argument out of range.");
0
                         }
0
                     }
0
                 } else {
0
-                    month = (int)RubyNumeric.num2long(args[1]) - 1;
0
+                    month = (int)RubyNumeric.num2long(args[1]);
0
                 }
0
             }
0
-            if (0 > month || month > 11) {
0
-                throw runtime.newArgumentError("Argument out of range.");
0
+            if (1 > month || month > 12) {
0
+                throw runtime.newArgumentError("Argument out of range: for month: " + month);
0
             }
0
         }
0
 
0
@@ -754,30 +736,35 @@ public class RubyTime extends RubyObject {
0
             year += 1900;
0
         }
0
 
0
-        Calendar cal;
0
+        DateTime dt = new DateTime();
0
         if (gmt) {
0
-            cal = Calendar.getInstance(TimeZone.getTimeZone(RubyTime.UTC)); 
0
+            dt = dt.withZone(DateTimeZone.UTC);
0
         } else {
0
-            cal = Calendar.getInstance(RubyTime.getLocalTimeZone(runtime));
0
+            dt = dt.withZone(getLocalTimeZone(runtime));
0
         }
0
-        cal.set(year, month, int_args[0], int_args[1], int_args[2], int_args[3]);
0
-        cal.set(Calendar.MILLISECOND, 0);
0
 
0
-        RubyTime time = new RubyTime(runtime, (RubyClass) recv, cal);
0
+        dt = dt.withDate(year, month, int_args[0])
0
+            .withHourOfDay(int_args[1])
0
+            .withMinuteOfHour(int_args[2])
0
+            .withSecondOfMinute(int_args[3])
0
+            .withMillisOfSecond(0);
0
+
0
+        RubyTime time = new RubyTime(runtime, (RubyClass) recv, dt);
0
         // Ignores usec if 8 args (for compatibility with parsedate) or if not supplied.
0
         if (args.length != 8 && !args[6].isNil()) {
0
             int usec = int_args[4] % 1000;
0
             int msec = int_args[4] / 1000;
0
+
0
             if (int_args[4] < 0) {
0
                 msec -= 1;
0
                 usec += 1000;
0
             }
0
-            cal.add(Calendar.MILLISECOND, msec);
0
+            time.dt = dt.withMillis(dt.getMillis()+msec);
0
             time.setUSec(usec);
0
         }
0
 
0
         // Restrict to time_t for compatibility
0
-        long seconds = cal.getTimeInMillis() / 1000;
0
+        long seconds = dt.getMillis() / 1000;
0
         if (seconds > Integer.MAX_VALUE || seconds < Integer.MIN_VALUE) {
0
             throw runtime.newArgumentError("time out of range");
0
         }

0
@@ -34,7 +34,6 @@ import java.text.DateFormat;
0
 import java.text.DateFormatSymbols;
0
 import java.text.FieldPosition;
0
 import java.text.ParsePosition;
0
-import java.util.Calendar;
0
 import java.util.Date;
0
 import java.util.Iterator;
0
 import java.util.LinkedList;
0
@@ -42,6 +41,9 @@ import java.util.List;
0
 import java.util.Locale;
0
 import java.util.TimeZone;
0
 
0
+import org.joda.time.DateTime;
0
+import org.joda.time.DateTimeConstants;
0
+
0
 public class RubyDateFormat extends DateFormat {
0
   private static final long serialVersionUID = -250429218019023997L;
0
 
0
@@ -244,13 +246,16 @@ public class RubyDateFormat extends DateFormat {
0
         }
0
     }
0
 
0
+    private DateTime dt;
0
+
0
+    public void setDateTime(final DateTime dt) {
0
+        this.dt = dt;
0
+    }
0
+
0
     /**
0
      * @see DateFormat#format(Date, StringBuffer, FieldPosition)
0
      */
0
-    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
0
-        calendar.setTime(date);
0
-        calendar.setMinimalDaysInFirstWeek(1);
0
-        
0
+    public StringBuffer format(Date ignored, StringBuffer toAppendTo, FieldPosition fieldPosition) {
0
         Iterator iter = compiledPattern.iterator();
0
         while (iter.hasNext()) {
0
             Token token = (Token) iter.next();
0
@@ -260,40 +265,55 @@ public class RubyDateFormat extends DateFormat {
0
                     toAppendTo.append(token.getData());
0
                     break;
0
                 case FORMAT_WEEK_LONG:
0
-                    toAppendTo.append(formatSymbols.getWeekdays()[calendar.get(Calendar.DAY_OF_WEEK)]);
0
+                    // This is GROSS, but Java API's aren't ISO 8601 compliant at all
0
+                    int v = (dt.getDayOfWeek()+1)%8;
0
+                    if(v == 0) {
0
+                        v++;
0
+                    }
0
+                    toAppendTo.append(formatSymbols.getWeekdays()[v]);
0
                     break;
0
                 case FORMAT_WEEK_SHORT:
0
-                    toAppendTo.append(formatSymbols.getShortWeekdays()[calendar.get(Calendar.DAY_OF_WEEK)]);
0
+                    // This is GROSS, but Java API's aren't ISO 8601 compliant at all
0
+                    v = (dt.getDayOfWeek()+1)%8;
0
+                    if(v == 0) {
0
+                        v++;
0
+                    }
0
+                    toAppendTo.append(formatSymbols.getShortWeekdays()[v]);
0
                     break;
0
                 case FORMAT_MONTH_LONG:
0
-                    toAppendTo.append(formatSymbols.getMonths()[calendar.get(Calendar.MONTH)]);
0
+                    toAppendTo.append(formatSymbols.getMonths()[dt.getMonthOfYear()-1]);
0
                     break;
0
                 case FORMAT_MONTH_SHORT:
0
-                    toAppendTo.append(formatSymbols.getShortMonths()[calendar.get(Calendar.MONTH)]);
0
+                    toAppendTo.append(formatSymbols.getShortMonths()[dt.getMonthOfYear()-1]);
0
                     break;
0
                 case FORMAT_DAY:
0
-                    int value = calendar.get(Calendar.DAY_OF_MONTH);
0
+                    int value = dt.getDayOfMonth();
0
                     if (value < 10) {
0
                         toAppendTo.append('0');
0
                     }
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_DAY_S: 
0
-                    value = calendar.get(Calendar.DAY_OF_MONTH);
0
+                    value = dt.getDayOfMonth();
0
                     if (value < 10) {
0
                         toAppendTo.append(' ');
0
                     }
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_HOUR:
0
-                    value = calendar.get(Calendar.HOUR_OF_DAY);
0
+                    value = dt.getHourOfDay();
0
                     if (value < 10) {
0
                         toAppendTo.append('0');
0
                     }
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_HOUR_M:
0
-                    value = calendar.get(Calendar.HOUR);
0
+                    value = dt.getHourOfDay();
0
+
0
+                    if(value > 12) {
0
+                        value-=12;
0
+                    }
0
+
0
                     if(value == 0) {
0
                         toAppendTo.append("12");
0
                     } else {
0
@@ -304,7 +324,7 @@ public class RubyDateFormat extends DateFormat {
0
                     }
0
                     break;
0
                 case FORMAT_DAY_YEAR:
0
-                    value = calendar.get(Calendar.DAY_OF_YEAR);
0
+                    value = dt.getDayOfYear();
0
                     if (value < 10) {
0
                         toAppendTo.append("00");
0
                     } else if (value < 100) {
0
@@ -313,46 +333,46 @@ public class RubyDateFormat extends DateFormat {
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_MINUTES:
0
-                    value = calendar.get(Calendar.MINUTE);
0
+                    value = dt.getMinuteOfHour();
0
                     if (value < 10) {
0
                         toAppendTo.append('0');
0
                     }
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_MONTH:
0
-                    value = calendar.get(Calendar.MONTH) + 1;
0
+                    value = dt.getMonthOfYear();
0
                     if (value < 10) {
0
                         toAppendTo.append('0');
0
                     }
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_MERIDIAN:
0
-                    if (calendar.get(Calendar.AM_PM) == Calendar.AM) {
0
+                    if (dt.getHourOfDay() < 12) {
0
                         toAppendTo.append("AM");
0
                     } else {
0
                         toAppendTo.append("PM");
0
                     }
0
                     break;
0
                 case FORMAT_SECONDS:
0
-                    value = calendar.get(Calendar.SECOND);
0
+                    value = dt.getSecondOfMinute();
0
                     if (value < 10) {
0
                         toAppendTo.append('0');
0
                     }
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_WEEK_YEAR_M:
0
-                  formatWeekYear(Calendar.MONDAY, toAppendTo);
0
+                  formatWeekYear(java.util.Calendar.MONDAY, toAppendTo);
0
                     break;
0
                   // intentional fall-through
0
                 case FORMAT_WEEK_YEAR_S:
0
-                  formatWeekYear(Calendar.SUNDAY, toAppendTo);
0
+                  formatWeekYear(java.util.Calendar.SUNDAY, toAppendTo);
0
                     break;
0
                 case FORMAT_DAY_WEEK:
0
-                    value = calendar.get(Calendar.DAY_OF_WEEK) - 1;
0
+                    value = dt.getDayOfWeek() ;
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_YEAR_LONG:
0
-                    value = calendar.get(Calendar.YEAR);
0
+                    value = dt.getYear();
0
                     if (value < 10) {
0
                         toAppendTo.append("000");
0
                     } else if (value < 100) {
0
@@ -363,14 +383,14 @@ public class RubyDateFormat extends DateFormat {
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_YEAR_SHORT:
0
-                    value = calendar.get(Calendar.YEAR) % 100;
0
+                    value = dt.getYear() % 100;
0
                     if (value < 10) {
0
                         toAppendTo.append('0');
0
                     }
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_ZONE_OFF:
0
-                    value = calendar.getTimeZone().getOffset(calendar.getTimeInMillis());
0
+                    value = dt.getZone().getOffset(dt.getMillis());
0
                     if (value <= 0) {
0
                         toAppendTo.append('+');
0
                     } else {
0
@@ -388,7 +408,7 @@ public class RubyDateFormat extends DateFormat {
0
                     toAppendTo.append(value);
0
                     break;
0
                 case FORMAT_ZONE_ID:
0
-                    toAppendTo.append(calendar.getTimeZone().getDisplayName(calendar.get(Calendar.DST_OFFSET) != 0, TimeZone.SHORT));
0
+                    toAppendTo.append(dt.getZone().getShortName(dt.getMillis()));
0
                     break;
0
             }
0
         }
0
@@ -397,16 +417,16 @@ public class RubyDateFormat extends DateFormat {
0
     }
0
 
0
   private void formatWeekYear(int firstDayOfWeek, StringBuffer toAppendTo) {
0
+        java.util.Calendar calendar = dt.toGregorianCalendar();
0
     calendar.setFirstDayOfWeek(firstDayOfWeek);
0
-    int value = calendar.get(Calendar.WEEK_OF_YEAR);
0
-    if (calendar.get(Calendar.DAY_OF_WEEK) != firstDayOfWeek) {
0
+    int value = calendar.get(java.util.Calendar.WEEK_OF_YEAR);
0
+    if (calendar.get(java.util.Calendar.DAY_OF_WEEK) != firstDayOfWeek) {
0
       value--;
0
     }
0
     if (value < 10) {
0
         toAppendTo.append('0');
0
     }
0
     toAppendTo.append(value);
0
-    calendar.setFirstDayOfWeek(Calendar.SUNDAY);
0
   }
0
 
0
     /**

0
@@ -27,8 +27,6 @@
0
  ***** END LICENSE BLOCK *****/
0
 package org.jruby.yaml;
0
 
0
-import java.util.Date;
0
-import java.util.Calendar;
0
 import java.util.HashMap;
0
 import java.util.Iterator;
0
 import java.util.List;
0
@@ -62,6 +60,8 @@ import org.jruby.runtime.builtin.IRubyObject;
0
 
0
 import org.jruby.util.ByteList;
0
 
0
+import org.joda.time.DateTime;
0
+
0
 /**
0
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
0
  */
0
@@ -215,16 +215,14 @@ public class JRubyConstructor extends ConstructorImpl {
0
     }
0
 
0
     public static Object constructYamlTimestamp(final Constructor ctor, final Node node) {
0
-        Calendar c = (Calendar)SafeConstructorImpl.constructYamlTimestamp(ctor,node);
0
-        return org.jruby.RubyTime.newTime(((JRubyConstructor)ctor).runtime,c);
0
+        DateTime dt = (DateTime)SafeConstructorImpl.constructYamlTimestamp(ctor,node);
0
+        return org.jruby.RubyTime.newTime(((JRubyConstructor)ctor).runtime,dt);
0
     }
0
 
0
     public static Object constructYamlTimestampYMD(final Constructor ctor, final Node node) {
0
-        Date d = (Date)SafeConstructorImpl.constructYamlTimestamp(ctor,node);
0
-        Calendar c = Calendar.getInstance();
0
-        c.setTime(d);
0
+        DateTime dt = (DateTime)SafeConstructorImpl.constructYamlTimestamp(ctor,node);
0
         Ruby runtime = ((JRubyConstructor)ctor).runtime;
0
-        return runtime.fastGetClass("Date").callMethod(runtime.getCurrentContext(),"new",new IRubyObject[]{runtime.newFixnum(c.get(Calendar.YEAR)),runtime.newFixnum(c.get(Calendar.MONTH)+1),runtime.newFixnum(c.get(Calendar.DAY_OF_MONTH))});
0
+        return runtime.fastGetClass("Date").callMethod(runtime.getCurrentContext(),"new",new IRubyObject[]{runtime.newFixnum(dt.getYear()),runtime.newFixnum(dt.getMonthOfYear()),runtime.newFixnum(dt.getDayOfMonth())});
0
     }
0
 
0
     public static Object constructYamlInt(final Constructor ctor, final Node node) {

0
@@ -30,7 +30,6 @@ package org.jvyamlb;
0
 import java.io.FileInputStream;
0
 import java.io.InputStream;
0
 
0
-import java.util.Calendar;
0
 import java.util.HashMap;
0
 import java.util.HashSet;
0
 import java.util.Iterator;
0
@@ -47,6 +46,9 @@ import org.jvyamlb.util.Base64Coder;
0
 
0
 import org.jruby.util.ByteList;
0
 
0
+import org.joda.time.DateTime;
0
+import org.joda.time.DateTimeZone;
0
+
0
 /**
0
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
0
  */
0
@@ -169,18 +171,17 @@ public class SafeConstructorImpl extends BaseConstructorImpl {
0
             final String year_s = match.group(1);
0
             final String month_s = match.group(2);
0
             final String day_s = match.group(3);
0
-            final Calendar cal = Calendar.getInstance();
0
-            cal.clear();
0
+            DateTime dt = new DateTime(0,1,1,0,0,0,0);
0
             if(year_s != null) {
0
-                cal.set(Calendar.YEAR,Integer.parseInt(year_s));
0
+                dt = dt.withYear(Integer.parseInt(year_s));
0
             }
0
             if(month_s != null) {
0
-                cal.set(Calendar.MONTH,Integer.parseInt(month_s)-1); // Java's months are zero-based...
0
+                dt = dt.withMonthOfYear(Integer.parseInt(month_s));
0
             }
0
             if(day_s != null) {
0
-                cal.set(Calendar.DAY_OF_MONTH,Integer.parseInt(day_s));
0
+                dt = dt.withDayOfMonth(Integer.parseInt(day_s));
0
             }
0
-            return cal.getTime();
0
+            return dt;
0
         }
0
         match = TIMESTAMP_REGEXP.matcher(node.getValue().toString());
0
         if(!match.matches()) {
0
@@ -206,10 +207,9 @@ public class SafeConstructorImpl extends BaseConstructorImpl {
0
                 }
0
             }
0
         }
0
-        final Calendar cal = Calendar.getInstance();
0
-        cal.clear();
0
+        DateTime dt = new DateTime(0,1,1,0,0,0,0);
0
         if("Z".equalsIgnoreCase(utc)) {
0
-            cal.setTimeZone(java.util.TimeZone.getTimeZone("GMT"));
0
+            dt = dt.withZone(DateTimeZone.forID("Etc/GMT"));
0
         } else {
0
             if(timezoneh_s != null || timezonem_s != null) {
0
                 int zone = 0;
0
@@ -223,30 +223,29 @@ public class SafeConstructorImpl extends BaseConstructorImpl {
0
                 if(timezonem_s != null) {
0
                     zone += Integer.parseInt(timezonem_s)*60000;
0
                 }
0
-                cal.setTimeZone(java.util.TimeZone.getTimeZone("GMT"));
0
-                cal.set(Calendar.ZONE_OFFSET,sign*zone);
0
+                dt = dt.withZone(DateTimeZone.forOffsetMillis(sign*zone));
0
             }
0
         }
0
         if(year_s != null) {
0
-            cal.set(Calendar.YEAR,Integer.parseInt(year_s));
0
+            dt = dt.withYear(Integer.parseInt(year_s));
0
         }
0
         if(month_s != null) {
0
-            cal.set(Calendar.MONTH,Integer.parseInt(month_s)-1); // Java's months are zero-based...
0
+            dt = dt.withMonthOfYear(Integer.parseInt(month_s));
0
         }
0
         if(day_s != null) {
0
-            cal.set(Calendar.DAY_OF_MONTH,Integer.parseInt(day_s));
0
+            dt = dt.withDayOfMonth(Integer.parseInt(day_s));
0
         }
0
         if(hour_s != null) {
0
-            cal.set(Calendar.HOUR_OF_DAY,Integer.parseInt(hour_s));
0
+            dt = dt.withHourOfDay(Integer.parseInt(hour_s));
0
         }
0
         if(min_s != null) {
0
-            cal.set(Calendar.MINUTE,Integer.parseInt(min_s));
0
+            dt = dt.withMinuteOfHour(Integer.parseInt(min_s));
0
         }
0
         if(sec_s != null) {
0
-            cal.set(Calendar.SECOND,Integer.parseInt(sec_s));
0
+            dt = dt.withSecondOfMinute(Integer.parseInt(sec_s));
0
         }
0
-        cal.set(Calendar.MILLISECOND,usec/1000);
0
-        return cal;
0
+        dt = dt.withMillisOfSecond(usec/1000);
0
+        return dt;
0
     }
0
 
0
     public static Object constructYamlInt(final Constructor ctor, final Node node) {

0
@@ -27,7 +27,7 @@
0
  ***** END LICENSE BLOCK *****/
0
 package org.jvyamlb;
0
 
0
-import java.util.Date;
0
+import org.joda.time.DateTime;
0
 
0
 import org.jruby.util.ByteList;
0
 
0
@@ -37,12 +37,12 @@ import org.jruby.util.ByteList;
0
 public class TestBean {
0
     private ByteList name;
0
     private int age;
0
-    private Date born;
0
+    private DateTime born;
0
 
0
     public TestBean() {
0
     }
0
 
0
-    public TestBean(final ByteList name, final int age, final Date born) {
0
+    public TestBean(final ByteList name, final int age, final DateTime born) {
0
         this.name = name;
0
         this.age = age;
0
         this.born = born;
0
@@ -56,7 +56,7 @@ public class TestBean {
0
         return age;
0
     }
0
 
0
-    public Date getBorn() {
0
+    public DateTime getBorn() {
0
         return born;
0
     }
0
 
0
@@ -68,7 +68,7 @@ public class TestBean {
0
         this.age = age;
0
     }
0
 
0
-    public void setBorn(final Date born) {
0
+    public void setBorn(final DateTime born) {
0
         this.born = born;
0
     }
0
 

0
@@ -110,11 +110,8 @@ public class YAMLLoadTest extends TestCase {
0
     }
0
 
0
     public void testJavaBeanLoad() throws Exception {
0
-        final java.util.Calendar cal = java.util.Calendar.getInstance();
0
-        cal.clear();
0
-        cal.set(1982,5-1,3); // Java's months are zero-based...
0
-        
0
-        final TestBean expected = new TestBean(s("Ola Bini"), 24, cal.getTime());
0
+        org.joda.time.DateTime dt = new org.joda.time.DateTime(1982,5,3,0,0,0,0);
0
+        final TestBean expected = new TestBean(s("Ola Bini"), 24, dt);
0
         assertEquals(expected, YAML.load(s("--- !java/object:org.jvyamlb.TestBean\nname: Ola Bini\nage: 24\nborn: 1982-05-03\n")));
0
     }
0
 }// YAMLLoadTest