You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ra...@apache.org on 2007/05/02 02:21:20 UTC
svn commit: r534286 - in /xmlbeans/trunk: ./
src/xmlpublic/org/apache/xmlbeans/ test/src/xmlobject/schematypes/checkin/
Author: radup
Date: Tue May 1 17:21:19 2007
New Revision: 534286
URL: http://svn.apache.org/viewvc?view=rev&rev=534286
Log:
Contributed by Wing Yew Poon. Remove year zero (0000) from the system, so -0001 is 1 BC. Fix some javadoc comments. Add tests for addition and subtraction of durations.
Modified:
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDate.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateSpecification.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationSpecification.java
xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCalendar.java
xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java
xmlbeans/trunk/testbuild.xml
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDate.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDate.java?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDate.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDate.java Tue May 1 17:21:19 2007
@@ -143,6 +143,7 @@
{
_bits |= HAS_YEAR;
_CY = negyear ? -value : value;
+ if (_CY == 0) throw new IllegalArgumentException("year must not be zero");
}
else if (digits > 0)
throw new IllegalArgumentException("year must be four digits (may pad with zeroes, e.g., 0560)");
@@ -383,7 +384,7 @@
int y = calendar.get(Calendar.YEAR);
if (isSetEra && calendar instanceof GregorianCalendar)
if (calendar.get(Calendar.ERA) == GregorianCalendar.BC)
- y = 1 - y;
+ y = -y; //1 - y;
_bits |= HAS_YEAR;
_CY = y;
}
@@ -702,7 +703,7 @@
/**
* Returns the Julian date corresponding to this Gregorian date.
* The Julian date (JD) is a continuous count of days from
- * 1 January 4713 BC (= -4712 January 1).
+ * 1 January 4713 BC.
*/
public int getJulianDate()
{
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateBuilder.java Tue May 1 17:21:19 2007
@@ -158,7 +158,10 @@
{
_bits = HAS_YEAR | HAS_MONTH | HAS_DAY | HAS_TIME;
- _CY = year;
+ if (year == 0)
+ throw new IllegalArgumentException();
+
+ _CY = (year > 0 ? year : year + 1);
_M = month;
_D = day;
_h = hour;
@@ -206,7 +209,10 @@
{
_bits = HAS_TIMEZONE | HAS_YEAR | HAS_MONTH | HAS_DAY | HAS_TIME;
- _CY = year;
+ if (year == 0)
+ throw new IllegalArgumentException();
+
+ _CY = (year > 0 ? year : year + 1);
_M = month;
_D = day;
_h = hour;
@@ -295,7 +301,7 @@
* Gets the year. Should be a four-digit year specification.
*/
public final int getYear()
- { return _CY; }
+ { return (_CY > 0 ? _CY : _CY - 1); }
/**
* Gets the month-of-year. January is 1.
@@ -374,9 +380,11 @@
*/
public void setYear(int year)
{
- if (year < -4712 || year > 999999)
+ if (year < -4713 || year > 999999)
throw new IllegalArgumentException("year out of range");
- _bits |= HAS_YEAR; _CY = year;
+ if (year == 0)
+ throw new IllegalArgumentException("year cannot be 0");
+ _bits |= HAS_YEAR; _CY = (year > 0 ? year : year + 1);
}
/**
@@ -535,13 +543,22 @@
/* package */ static final boolean isValidGDate(GDateSpecification date)
{
+ if (date.hasYear() && date.getYear() == 0)
+ return false;
+
if (date.hasMonth() && (date.getMonth() < 1 || date.getMonth() > 12))
return false;
- if (date.hasDay() && (date.getDay() < 1 || date.getDay() > 31 ||
- date.getDay() > 28 && date.hasMonth() &&
- (date.hasYear() ? date.getDay() > _maxDayInMonthFor(date.getYear(), date.getMonth()) :
- date.getDay() > _maxDayInMonth(date.getMonth()))))
+ if (date.hasDay() &&
+ (date.getDay() < 1 || date.getDay() > 31 ||
+ date.getDay() > 28 &&
+ date.hasMonth() &&
+ (date.hasYear() ?
+ date.getDay() > _maxDayInMonthFor((date.getYear() > 0 ?
+ date.getYear() :
+ date.getYear() + 1),
+ date.getMonth()) :
+ date.getDay() > _maxDayInMonth(date.getMonth()))))
return false;
if (date.hasTime() && (date.getHour() < 0 || date.getHour() > 23 ||
@@ -803,10 +820,7 @@
// Add months and years
temp = _M + sign * month;
_M = _modulo(temp, 1, 13);
- boolean yearWasLessThanZero = _CY < 0;
_CY = _CY + sign * year + (int)_fQuotient(temp, 1, 13);
- if (yearWasLessThanZero && _CY>=0)
- _CY +=1;
// In new month, day may need to be pegged before proceeding
if (hasDay())
@@ -881,7 +895,7 @@
/**
* Returns the Julian date corresponding to this Gregorian date.
* The Julian date (JD) is a continuous count of days from
- * 1 January 4713 BC (= -4712 January 1).
+ * 1 January 4713 BC.
*/
public final int getJulianDate()
{
@@ -892,14 +906,14 @@
/**
* Sets the Gregorian date based on the given Julian date.
* The Julian date (JD) is a continuous count of days from
- * 1 January 4713 BC (= -4712 January 1).
+ * 1 January 4713 BC.
*
* @param julianday the julian day number
*/
public void setJulianDate(int julianday)
{
if (julianday < 0)
- throw new IllegalArgumentException("date before year -4712");
+ throw new IllegalArgumentException("date before year -4713");
int temp;
int qepoc;
@@ -980,7 +994,8 @@
public void setGDate(GDateSpecification gdate)
{
_bits = gdate.getFlags() & (HAS_TIMEZONE | HAS_YEAR | HAS_MONTH | HAS_DAY | HAS_TIME);
- _CY = gdate.getYear();
+ int year = gdate.getYear();
+ _CY = (year > 0 ? year : year + 1);
_M = gdate.getMonth();
_D = gdate.getDay();
_h = gdate.getHour();
@@ -1026,11 +1041,15 @@
throw new IllegalStateException("cannot do date math without a complete date");
// from http://aa.usno.navy.mil/faq/docs/JD_Formula.html
- int result = date.getDay()-32075+1461*(date.getYear()+4800+(date.getMonth()-14)/12)/4+
- 367*(date.getMonth()-2-(date.getMonth()-14)/12*12)/12-3*((date.getYear()+4900+(date.getMonth()-14)/12)/100)/4;
+ int day = date.getDay();
+ int month = date.getMonth();
+ int year = date.getYear();
+ year = (year > 0 ? year : year + 1);
+ int result = day-32075+1461*(year+4800+(month-14)/12)/4+
+ 367*(month-2-(month-14)/12*12)/12-3*((year+4900+(month-14)/12)/100)/4;
if (result < 0)
- throw new IllegalStateException("date too far in the past (year allowed to -4712)");
+ throw new IllegalStateException("date too far in the past (year allowed to -4713)");
return result;
}
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateSpecification.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateSpecification.java?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateSpecification.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDateSpecification.java Tue May 1 17:21:19 2007
@@ -154,7 +154,7 @@
/**
* Returns the Julian date corresponding to this Gregorian date.
* The Julian date (JD) is a continuous count of days from
- * 1 January 4713 BC (= -4712 January 1).
+ * 1 January 4713 BC.
*/
int getJulianDate();
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDuration.java Tue May 1 17:21:19 2007
@@ -321,10 +321,10 @@
/**
* Comparison to another GDuration.
* <ul>
- * <li>Returns -1 if this < date. (less-than)
- * <li>Returns 0 if this == date. (equal)
- * <li>Returns 1 if this > date. (greater-than)
- * <li>Returns 2 if this <> date. (incomparable)
+ * <li>Returns -1 if this < duration. (less-than)
+ * <li>Returns 0 if this == duration. (equal)
+ * <li>Returns 1 if this > duration. (greater-than)
+ * <li>Returns 2 if this <> duration. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
@@ -424,4 +424,4 @@
_sign * 11917049);
}
-}
\ No newline at end of file
+}
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationBuilder.java Tue May 1 17:21:19 2007
@@ -407,10 +407,10 @@
/**
* Comparison to another GDuration.
* <ul>
- * <li>Returns -1 if this < date. (less-than)
- * <li>Returns 0 if this == date. (equal)
- * <li>Returns 1 if this > date. (greater-than)
- * <li>Returns 2 if this <> date. (incomparable)
+ * <li>Returns -1 if this < duration. (less-than)
+ * <li>Returns 0 if this == duration. (equal)
+ * <li>Returns 1 if this > duration. (greater-than)
+ * <li>Returns 2 if this <> duration. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationSpecification.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationSpecification.java?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationSpecification.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/GDurationSpecification.java Tue May 1 17:21:19 2007
@@ -83,10 +83,10 @@
/**
* Comparison to another GDuration.
* <ul>
- * <li>Returns -1 if this < date. (less-than)
- * <li>Returns 0 if this == date. (equal)
- * <li>Returns 1 if this > date. (greater-than)
- * <li>Returns 2 if this <> date. (incomparable)
+ * <li>Returns -1 if this < duration. (less-than)
+ * <li>Returns 0 if this == duration. (equal)
+ * <li>Returns 1 if this > duration. (greater-than)
+ * <li>Returns 2 if this <> duration. (incomparable)
* </ul>
* Two instances are incomparable if they have different amounts
* of information.
Modified: xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCalendar.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCalendar.java?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCalendar.java (original)
+++ xmlbeans/trunk/src/xmlpublic/org/apache/xmlbeans/XmlCalendar.java Tue May 1 17:21:19 2007
@@ -107,7 +107,7 @@
* In particular, a year must be padded to at least four digits, so
* "98" is not a valid year, although "1998" and "0098" are both valid
* years, unambiguously 19 centuries separated from each other. A year
- * may also be preceded by a minus symbol: 0000 is 1 BC and -0001 is
+ * may also be preceded by a minus symbol: -0001 is 1 BC and -0002 is
* 2 BC.
*
* Finally a timezone is always allowed (yet optional) at the end.
@@ -145,15 +145,16 @@
if (date.hasYear())
{
- int y = date.getYear();
+ int y = date.getYear(); // is never 0
if (y > 0)
{
set(Calendar.ERA, GregorianCalendar.AD);
}
- else
+ else // y < 0
{
set(Calendar.ERA, GregorianCalendar.BC);
- y = 1 - y;
+ //y = 1 - y;
+ y = -y; // no need to add 1
}
set(Calendar.YEAR, y);
}
Modified: xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java (original)
+++ xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java Tue May 1 17:21:19 2007
@@ -137,6 +137,8 @@
"-9999999-02-28T00:00:00Z", // too long ago
"9999999-02-28T00:00:00Z", // too long from now
"9999999999999999999999999999999-02-28T00:00:00Z", // overflow?
+ "0000-01-01", // year zero
+ "0000-12-31T04:35:22.456", // year zero
"1996-00-28T00:00:00Z", // month
"1996-13-28T00:00:00Z", // month
"1996-02-00T00:00:00Z", // day
@@ -193,7 +195,7 @@
"1999-12-31T23:59:59.1234567890-14:00",
"1992-12-31T23:59:59.01-14:00",
"1965-12-31T23:59:59.000Z",
- "0000-12-31T04:35:22.456",
+ //"0000-12-31T04:35:22.456",
"1696-09-01T00:00:00Z",
"1697-02-01T00:00:00Z",
"1903-03-01T00:00:00Z",
@@ -251,12 +253,12 @@
"-0423-12-31T00:00:00-05:00",
};
- private static boolean hasTime(GDuration gd)
+ private boolean hasTime(GDuration gd)
{
return gd.getHour() != 0 || gd.getMinute() != 0 || gd.getSecond() != 0 || gd.getFraction().signum() != 0;
}
-
- public static void testGregorianCalendar()
+
+ public void testGregorianCalendar()
{
// this is a check of DST offsets
Date date = new GDate("2002-04-18T23:59:59Z").getDate();
@@ -269,7 +271,7 @@
Date gdd = gd.getDate();
Date gcd = gc.getTime();
Assert.assertEquals(gdd, gcd);
-
+
// set up 2/29, and read out Feb 29 in the year 1 BC.
Calendar gregcal = new GDate("--02-29").getCalendar();
Assert.assertEquals(29, gregcal.get(Calendar.DAY_OF_MONTH));
@@ -309,7 +311,7 @@
_testEmptyDuration(gdCopy);
}
- public static void testValidDuration()
+ public void testValidDuration()
{
for (int i = 0; i < validDurations.length; i++)
{
@@ -321,7 +323,7 @@
}
catch (IllegalArgumentException e)
{
- Assert.assertTrue("Problem with " + str + ": " + e.getMessage(), false);
+ Assert.fail("Problem with " + str + ": " + e.getMessage());
}
Assert.assertEquals(str, gd.toString());
@@ -336,7 +338,7 @@
}
catch (IllegalArgumentException e)
{
- Assert.assertTrue("Problem with " + str2 + ": " + e.getMessage(), false);
+ Assert.fail("Problem with " + str2 + ": " + e.getMessage());
}
// subtracting two ways works
@@ -351,7 +353,6 @@
gdb1.normalize();
Assert.assertEquals("Problem: " + gd + " and " + gd2, gdb.toString(), gdb1.toString());
-
// comparing is reversible
int comp1 = gd.compareToGDuration(gd2);
int comp2 = gd2.compareToGDuration(gd);
@@ -385,7 +386,7 @@
seen[comp2 + 1] = true;
}
- // subtraction should yeild the same result
+ // subtraction should yield the same result
if (comp1 != 2)
{
GDate date3 = date.add(diff);
@@ -405,7 +406,69 @@
}
}
- public static void testOrder()
+ private void _testAddAndSubtract(String date1, String date2,
+ String duration)
+ {
+ GDate gd1 = new GDate(date1);
+ GDate gd2 = new GDate(date2);
+ GDuration gdur = new GDuration(duration);
+ GDate gd = gd1.add(gdur);
+ System.out.println(date1 + " + " + duration + " = " + gd.toString());
+ assertEquals(gd2, gd);
+ gd = gd2.subtract(gdur);
+ System.out.println(date2 + " - " + duration + " = " + gd.toString());
+ assertEquals(gd1, gd);
+ }
+
+ private void _testAdd(String date1, String date2, String duration)
+ {
+ GDate gd1 = new GDate(date1);
+ GDate gd2 = new GDate(date2);
+ GDuration gdur = new GDuration(duration);
+ GDate gd = gd1.add(gdur);
+ System.out.println(date1 + " + " + duration + " = " + gd.toString());
+ assertEquals(gd2, gd);
+ }
+
+ private void _testSubtract(String date1, String date2, String duration)
+ {
+ GDate gd1 = new GDate(date1);
+ GDate gd2 = new GDate(date2);
+ GDuration gdur = new GDuration(duration);
+ GDate gd = gd2.subtract(gdur);
+ System.out.println(date2 + " - " + duration + " = " + gd.toString());
+ assertEquals(gd1, gd);
+ }
+
+ public void testAddAndSubtractDuration()
+ {
+ _testAddAndSubtract("1970-01-01", "1973-01-01", "P3Y");
+ _testAddAndSubtract("0001-01-01", "0004-01-01", "P3Y");
+ // there is no year 0, so 1 BCE + 3Y = 3 CE
+ _testAddAndSubtract("-0001-01-01", "0003-01-01", "P3Y");
+ _testAddAndSubtract("-0002-01-01", "0003-01-01", "P4Y");
+ _testAddAndSubtract("-0001-01-01", "0001-01-01", "P1Y");
+ _testSubtract("-0001-02-29", "0004-02-29", "P4Y");
+ _testSubtract("-0001-12-31", "0001-01-01", "P1D");
+ _testSubtract("-0002-12-31", "0001-12-31", "P731D");
+ _testAddAndSubtract("1970-01-01T00:00:00", "1973-02-01T01:30:45", "P3Y31DT1H30M45S");
+ _testAddAndSubtract("-0001-01-01T00:00:00", "0003-02-01T01:30:45", "P3Y31DT1H30M45S");
+ // addition and subtraction of duration is not necessarily symmetric
+ // if duration is not constant, i.e., contains a component that varies
+ // in length, such as month (or year)
+ _testAdd("2000-02-29", "2001-02-28", "P1Y");
+ _testSubtract("2000-02-28", "2001-02-28", "P1Y");
+ _testAddAndSubtract("1970-01-01T23:00:00", "1970-01-02T00:00:00", "PT1H");
+ _testAddAndSubtract("1970-01-01T00:00:00", "1969-12-31T23:00:00", "-PT1H");
+ _testAddAndSubtract("1970-01-01T00:00:00", "1969-12-31T22:59:59", "-PT1H1S");
+ _testAddAndSubtract("1971-02-02T01:01:01.1", "1970-01-01T00:00:00", "-P1Y1M1DT1H1M1.1S");
+ _testAdd("1970-01-01T00:00:00", "1968-11-29T22:58:58.9", "-P1Y1M1DT1H1M1.1S");
+ _testSubtract("1969-12-31T00:00:00", "1968-11-29T22:58:58.9", "-P1Y1M1DT1H1M1.1S");
+ _testAdd("0001-01-01T00:00:00", "-0002-11-29T22:58:58.9", "-P1Y1M1DT1H1M1.1S");
+ _testSubtract("0001-01-01T00:00:00", "-0002-11-29T22:58:58.9", "-P1Y1M2DT1H1M1.1S");
+ }
+
+ public void testOrder()
{
Assert.assertEquals(-1, new GDate("1998-08-26").compareToGDate(new GDate("2001-08-06")));
Assert.assertEquals(-1, new GDate("1970-12-20T04:14:22Z").compareToGDate(new GDate("1971-04-18T12:51:41Z")));
@@ -462,8 +525,8 @@
Assert.assertEquals(2, new GDate("23:59:59").compareToGDate(new GDate("00:00:00-10:00")));
Assert.assertEquals(1, new GDate("23:59:59").compareToGDate(new GDate("00:00:00+14:00")));
}
-
- public static void testAPI() throws Exception
+
+ public void testAPI() throws Exception
{
GDateBuilder builder = new GDateBuilder("1970-12-20T04:14:22Z");
builder.normalizeToTimeZone(1, 0, 0);
@@ -476,8 +539,7 @@
Assert.assertEquals("1970-12-20T04:59:22-05:00", builder.toString());
}
-
- public static void testFailure() throws Exception
+ public void testFailure() throws Exception
{
for (int i = 0; i < invalidDates.length; i++)
{
@@ -490,11 +552,11 @@
{
continue;
}
- Assert.assertTrue("Missing exception for GDate " + str, false);
+ Assert.fail("Missing exception for GDate " + str);
}
}
- public static void testSuccess() throws Exception
+ public void testSuccess() throws Exception
{
for (int i = 0; i < validDates.length; i++)
{
@@ -506,7 +568,7 @@
}
catch (IllegalArgumentException e)
{
- Assert.assertTrue("Problem with " + str + ": " + e.getMessage(), false);
+ Assert.fail("Problem with " + str + ": " + e.getMessage());
}
// must round-trip to string
@@ -531,7 +593,7 @@
Date date = gdate.getDate();
GDate gdate2 = new GDate(date);
Assert.assertEquals(gdate, gdate2);
-
+
// normalize to UTC fractions-of-seconds is 0 or 3 digits [not 000], stringrep must round-trip
if (gdate.getTimeZoneSign() == 0 && ((gdate.getFraction().scale() == 3 && gdate.getFraction().signum() != 0) || gdate.getFraction().scale() == 0))
{
@@ -543,7 +605,7 @@
// verify that going through gcal gives us the same thing
GregorianCalendar gcal = gdate.getCalendar();
Assert.assertEquals(date, gcal.getTime());
-
+
// double-check XmlCalendar constructor
gcal = new XmlCalendar(date);
Assert.assertEquals("Doing " + gdate, date, gcal.getTime());
Modified: xmlbeans/trunk/testbuild.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/testbuild.xml?view=diff&rev=534286&r1=534285&r2=534286
==============================================================================
--- xmlbeans/trunk/testbuild.xml (original)
+++ xmlbeans/trunk/testbuild.xml Tue May 1 17:21:19 2007
@@ -856,18 +856,18 @@
value="**/compile/scomp/checkin/**,**/tools/inst2xsd/checkin/**"/>
<antcall target="build"/>
<antcall target="run.junit"/>
- <antcall target="-compile.run.exluded"/>
+ <antcall target="-compile.run.excluded"/>
</target>
<!-- convenience target for just running compile tests -->
<target name="compile.run">
<property name="excludes"
value="**/compile/scomp/checkin/**,**/tools/inst2xsd/checkin/**"/>
- <antcall target="-compile.run.exluded"/>
+ <antcall target="-compile.run.excluded"/>
</target>
<!-- This test, for some reason, upon compilation,
affects other tests under Win jdk1.4-->
- <target name="-compile.run.exluded" depends="check.asserts">
+ <target name="-compile.run.excluded" depends="check.asserts">
<javac srcdir="${xbeans.test.src}"
destdir="${build.dir.test.src}"
includes="${excludes}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org