Commit Graph

756 Commits

Author SHA1 Message Date
Christine Lu
06729a6505 Added tag jdk8-b102 for changeset 558ea2ab19f7 2013-08-08 10:10:37 -07:00
Lana Steuck
996e25a950 Merge 2013-08-06 10:02:36 -07:00
Chris Hegarty
8a6d887ff6 Merge 2013-08-02 11:10:59 +01:00
Christine Lu
fb7619310c Added tag jdk8-b101 for changeset 68d2718ced89 2013-08-01 04:56:16 -07:00
Joe Wang
d590d5e7d8 8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
Reviewed-by: lancea, alanb, dfuchs, mullan
2013-07-31 10:54:46 -07:00
Joe Wang
298bc01387 8014530: Better digital signature processing
Reviewed-by: alanb, dfuchs, mullan, lancea
2013-07-31 00:37:01 -07:00
Chris Hegarty
2846fd8194 Merge 2013-07-29 14:07:44 +01:00
Lana Steuck
6c3d986602 Merge 2013-07-26 14:01:00 -07:00
Joe Wang
5bf75c1ff9 8021148: Regression in SAXParserImpl in 7u40 b34 (NPE)
Reviewed-by: chegar, lancea, dfuchs
2013-07-25 13:02:37 -07:00
Christine Lu
236ff41145 Added tag jdk8-b100 for changeset 80bb0bd17234 2013-07-25 03:18:56 -07:00
Lana Steuck
c47454aac9 Merge 2013-07-22 17:29:05 -07:00
Chris Hegarty
d638c1ca04 Merge 2013-07-22 14:02:14 +01:00
Christine Lu
96677c909a Added tag jdk8-b99 for changeset 830a3a26d45b 2013-07-18 03:38:19 -07:00
Daniel Fuchs
dee5d80756 8013502: Improve stream factories
Reviewed-by: joehw, mullan, lancea
2013-07-17 18:46:28 +02:00
Joe Wang
8b314fcc50 8017298: Better XML support
Reviewed-by: alanb, dfuchs, mullan, lancea
2013-07-17 09:31:39 -07:00
Lana Steuck
b29a60f222 Merge 2013-07-17 00:34:12 -07:00
Joe Wang
b9c256373a 8012425: Transform TransformerFactory
Reviewed-by: alanb, dfuchs, mullan
2013-07-16 14:06:04 -07:00
Joe Wang
7c99d52918 8020430: NullPointerException in xml sqe nightly result on 2013-07-12
Reviewed-by: chegar, lancea
2013-07-12 11:12:40 -07:00
David Katleman
3900da3ac2 Added tag jdk8-b98 for changeset 4d6d050bc7d5 2013-07-11 10:13:44 -07:00
Joe Wang
255a9b3dd1 8016648: FEATURE_SECURE_PROCESSING set to true or false causes SAXParseException to be thrown
Jaxp 1.5 feature update

Reviewed-by: alanb, dfuchs, lancea
2013-07-09 16:34:52 -07:00
Christine Lu
a3d4e7121c Added tag jdk8-b97 for changeset 611e21a147b1 2013-07-04 01:00:34 -07:00
David Katleman
46026ae61c Merge 2013-07-02 15:55:36 -07:00
David Katleman
96d8c85b80 8019347: JDK8 b96 source with GPL header errors
Reviewed-by: iris, alanb, lancea
2013-06-28 16:25:51 -07:00
David Katleman
b2d8996d7f Added tag jdk8-b96 for changeset ca76027384ab 2013-06-27 13:40:25 -07:00
Lana Steuck
7afa2387bd Merge 2013-06-24 14:27:05 -07:00
David Katleman
a982ab708a Added tag jdk8-b95 for changeset 1db35290f46d 2013-06-20 10:17:08 -07:00
Michael Fang
3957195309 8016824: jdk8 l10n resource file translation update 3 - jaxp
Reviewed-by: joehw
2013-06-18 22:52:18 -07:00
Joe Wang
f320f80d13 8016133: Regression: diff. behavior with user-defined SAXParser
Reviewed-by: chegar, dfuchs
2013-06-17 12:47:02 -07:00
Lana Steuck
c470fbe806 Merge 2013-06-16 22:32:56 -07:00
Rob McKenna
9dd2251abc 8016701: JAXP Build failure
Reviewed-by: darcy, wetmore, alanb, chegar
2013-06-15 09:26:42 +01:00
Aleksej Efimov
e6d0dba36c 8015978: Incorrect transformation of XPath expression "string(-0)"
Reviewed-by: darcy, joehw
2013-06-14 15:14:49 +04:00
David Katleman
5924aa4ae1 Added tag jdk8-b94 for changeset a825382915a9 2013-06-13 09:48:45 -07:00
Lana Steuck
aec2c692b5 Merge 2013-06-10 16:59:58 -07:00
Joe Wang
b914f8d6be 8016153: Property http://javax.xml.XMLConstants/property/accessExternalDTD is not recognized
Reviewed-by: lancea, dfuchs
2013-06-10 14:42:57 -07:00
Joe Wang
e89bdfbdc3 8015016: Improve JAXP 1.5 error message
Reviewed-by: lancea
2013-06-06 15:03:55 -07:00
Daniel Fuchs
45c882ac0a 8013434: Xalan and Xerces internal ObjectFactory need rework
With this changeset, DTMManager and XSLTCDTMManager will always use their own default implementation.

Reviewed-by: joehw, alanb
2013-06-06 20:47:13 +02:00
David Katleman
a273490f39 Added tag jdk8-b93 for changeset 3ea33579af2b 2013-06-06 09:54:40 -07:00
Aleksej Efimov
53ae44836c 8009579: Xpathexception does not honor initcause()
Reviewed-by: alanb, dholmes, joehw
2013-06-06 20:40:43 +04:00
Joe Wang
53ba53a941 8015630: Remove default restriction settings of jaxp 1.5 properties in JDK8
Reviewed-by: alanb
2013-06-04 09:35:12 -07:00
Lana Steuck
6806594310 Merge 2013-06-03 23:19:23 -07:00
Lana Steuck
ea244da844 Merge 2013-06-03 16:09:15 -07:00
David Katleman
a979b3188f Added tag jdk8-b92 for changeset d2f0e76ff056 2013-05-30 10:58:08 -07:00
Lana Steuck
d37a547b02 Merge 2013-05-29 16:57:42 -07:00
David Katleman
d1eabf07b1 8015525: JDK8 b91 source with GPL header errors
Reviewed-by: dholmes, lancea
2013-05-29 10:15:19 -07:00
David Katleman
5ae68c32a2 Added tag jdk8-b91 for changeset e4e0796ef6c5 2013-05-23 10:47:45 -07:00
Lana Steuck
9430535189 Merge 2013-05-22 09:54:10 -07:00
Joe Wang
ed440d1096 8012683: Remove unused, obsolete ObjectFactory classes
Reviewed-by: lancea
2013-05-20 23:46:51 -07:00
Joe Wang
80041e51d1 8014891: Redundant setting of external access properties in setFeatures
Reviewed-by: lancea
2013-05-20 16:11:49 -07:00
Lana Steuck
c47e363601 Merge 2013-05-17 10:07:23 -07:00
Daniel Fuchs
98c17c258e 8013900: More warnings compiling jaxp
Some internal implementation classes in Jaxp were redefining equals() without redefining hashCode(). This patch adds hashCode() methods that are consistent with equals().

Reviewed-by: chegar, joehw
2013-05-17 10:40:21 +02:00
David Katleman
9ffa292377 Added tag jdk8-b90 for changeset f96a31ce35e6 2013-05-16 12:14:49 -07:00
Joe Wang
8620b1e2d7 8014333: javadoc error in JAXP 1.5 patch
Reviewed-by: lancea
2013-05-10 09:23:22 -07:00
Lana Steuck
45e4cc2b02 Merge 2013-05-09 14:23:39 -07:00
David Katleman
9e98214983 Added tag jdk8-b89 for changeset e3e2d366215b 2013-05-09 10:03:59 -07:00
Joe Wang
f0330c4199 8011653: Upgrade JDK8 to JAXP 1.5
Reviewed-by: alanb, dfuchs
2013-05-08 23:38:03 -07:00
Lana Steuck
543e9aaba0 Merge 2013-05-08 22:12:51 -07:00
Lana Steuck
fd799b4af7 Merge 2013-05-06 11:41:40 -07:00
Daniel Fuchs
c76e4b0e46 8008738: Issue in com.sun.org.apache.xml.internal.serializer.Encodings causes some JCK tests to fail intermittently
Encodings.java sometimes creates EncodingInfo objects whose java names are not recognized by the Charset API. This patch fixes that issue.

Reviewed-by: joehw, alanb
2013-05-06 18:50:16 +02:00
David Katleman
864cbe9a70 Added tag jdk8-b88 for changeset a53cf0f890db 2013-05-02 13:35:16 -07:00
Lana Steuck
876bc1c753 Merge 2013-04-30 17:50:05 -07:00
David Katleman
6a018e8d70 Added tag jdk8-b87 for changeset ed19c1288d5b 2013-04-25 09:24:11 -07:00
Lana Steuck
2426d317ce Merge 2013-04-23 15:03:19 -07:00
Lana Steuck
1a02bb2353 Merge 2013-04-23 09:27:01 -07:00
Daniel Fuchs
911f441787 8010495: Update JAXP NetBeans project - add support for generating javadoc
Make it possible to use NetBeans to edit the jaxp sources and to generate a preview of the associated javadoc.

Reviewed-by: joehw, alanb
2013-04-19 17:22:36 +02:00
David Katleman
1026125334 Added tag jdk8-b86 for changeset 6733de0488b4 2013-04-18 10:30:19 -07:00
Daniel Fuchs
9a94591b8e 8005954: JAXP Plugability Layer should use java.util.ServiceLoader
This fix replaces manual processing of files under META-INF/services in JAXP factories by calls to java.util.ServiceLoader.

Reviewed-by: alanb, joehw, mchung
2013-04-17 15:23:19 +02:00
Chris Hegarty
b10f2efea3 Merge 2013-04-12 10:20:32 +01:00
David Katleman
0e4fa44bde Added tag jdk8-b85 for changeset cacf7ffa3281 2013-04-11 09:40:07 -07:00
David Katleman
0f87989600 Added tag jdk8-b84 for changeset 545ba3c9bf47 2013-04-04 19:05:21 -07:00
David Katleman
65616fa742 Added tag jdk8-b83 for changeset 8ca744a5d6f4 2013-03-28 10:54:36 -07:00
David Katleman
fd6ca911a5 Added tag jdk8-b82 for changeset 11e0f924d1ba 2013-03-21 10:43:06 -07:00
Lana Steuck
bca41270b5 Merge 2013-03-14 19:33:29 -07:00
David Katleman
8d2d630525 Added tag jdk8-b81 for changeset 4f3da455d5f5 2013-03-14 15:00:26 -07:00
Lana Steuck
697213ff2f Merge 2013-03-12 18:22:55 -07:00
David Katleman
b67e4eeabf Added tag jdk8-b80 for changeset 81737a0a6546 2013-03-07 11:17:45 -08:00
David Katleman
14d7f14432 Added tag jdk8-b79 for changeset 1f581fc39f6b 2013-02-28 10:42:23 -08:00
Edvard Wendelin
d02f5d5667 Merge 2013-02-25 07:22:09 +01:00
David Katleman
fbc01baf4a Added tag jdk8-b78 for changeset 909304be06a3 2013-02-21 11:13:04 -08:00
Edvard Wendelin
14b0e4eb6f Merge 2013-02-19 21:45:15 +01:00
Joe Wang
8b12f5abcc 6657673: Issues with JAXP
Reviewed-by: alanb, lancea, ahgross, mullan
2013-02-18 11:33:35 -08:00
David Katleman
827f8f788b Added tag jdk8-b77 for changeset bd0373289b63 2013-02-14 11:43:52 -08:00
Lana Steuck
b21082a545 Merge 2013-02-11 16:12:53 -08:00
David Katleman
b0b7e821de Added tag jdk8-b76 for changeset 503de5a7b5ef 2013-02-07 12:32:59 -08:00
David Katleman
67dea32d8c Merge 2013-02-05 18:54:24 -08:00
Eric McCorkle
3d09f6b621 8007389: Remove uses of _ as identifier in jaxp
Reviewed-by: lancea, joehw
2013-02-05 14:56:34 +00:00
David Katleman
34d99c6b39 Added tag jdk8-b75 for changeset 504959da18bb 2013-01-31 17:04:37 -08:00
Fredrik Öhrström
ba0917c531 8006872: Stop creating four jars with identical content in the new build system
Reviewed-by: erikj
2013-01-31 14:02:44 +01:00
Lana Steuck
d6e0250020 Merge 2013-01-26 18:25:33 -08:00
David Katleman
23ff2911e3 Added tag jdk8-b74 for changeset 6ab75b6a0432 2013-01-24 16:48:57 -08:00
Lana Steuck
8e565b0c0e Merge 2013-01-20 23:37:21 -08:00
David Katleman
d67df37b2b Merge 2013-01-16 22:17:36 -08:00
Lana Steuck
65b346ba67 Merge 2013-01-16 12:06:39 -08:00
David Katleman
41ec1cb065 Added tag jdk8-b73 for changeset 4c46a5207766 2013-01-16 11:59:54 -08:00
David Katleman
43cad4a619 Merge 2013-01-15 10:07:22 -08:00
David Buck
8f70550080 8003147: port fix for BCEL bug 39695
Added support for Local Variable Type Table so that BCEL library can be used to modify methods with generics-related debug data without violating class file format

Reviewed-by: lancea
2013-01-10 20:26:00 -08:00
David Katleman
09e823e002 Added tag jdk8-b72 for changeset c65f0fb0d9de 2013-01-10 09:55:43 -08:00
David Katleman
70ec9b9666 Merge 2013-01-08 13:14:42 -08:00
Erik Joelsson
24f8d04828 8005575: build-infra: Three JCK tests fails on Solaris with new RE Autoconf-Based build
Reviewed-by: ohair
2013-01-04 11:31:16 +01:00
David Katleman
98f5be72c4 Added tag jdk8-b71 for changeset c27887135b51 2013-01-03 12:44:46 -08:00
Lana Steuck
5294fa2499 Merge 2012-12-28 18:31:52 -08:00
Joe Wang
c04f299d28 8005473: Warnings compiling jaxp
Clean up compiling warnings.

Reviewed-by: weijun, chegar, forax
2012-12-27 18:17:58 -08:00
David Katleman
1ca719243f Added tag jdk8-b70 for changeset 6ca279338b6b 2012-12-27 12:15:03 -08:00
David Katleman
8cbd71d7bf Merge 2012-12-26 14:23:58 -08:00
David Katleman
fb31951ddf 8004982: JDK8 source with GPL header errors
Reviewed-by: ohair
2012-12-20 16:23:11 -08:00
David Katleman
11dfefe252 Added tag jdk8-b69 for changeset 2d4530f2c281 2012-12-20 09:18:07 -08:00
Joe Wang
9ee412031f 8003261: static field is public but not final
Add final to fVersion field, and make it a non-compile time constant.

Reviewed-by: hawtin, lancea, dholmes, chegar
2012-12-18 21:11:43 -08:00
Lana Steuck
7aab781edb Merge 2012-12-16 22:05:19 -08:00
Joe Wang
fd69767808 8003260: [findbug] some fields should be package protected
Change public or protected mutable static fields to private or package private.

Reviewed-by: lancea
2012-12-14 13:24:34 -08:00
David Katleman
892ca4947b Added tag jdk8-b68 for changeset 0447ec5a0e8c 2012-12-13 09:05:29 -08:00
Joe Wang
d1398dfca7 8001235: Improve JAXP HTTP handling
Reviewed-by: lancea, skoivu
2012-12-12 15:19:19 -08:00
David Katleman
8afda75ade Added tag jdk8-b67 for changeset 11084bacb67d 2012-12-06 12:04:27 -08:00
David Katleman
cc7b34ea06 Added tag jdk8-b66 for changeset bc221bce9150 2012-11-29 11:30:24 -08:00
David Katleman
18602b4eed Added tag jdk8-b65 for changeset d94c92ed588c 2012-11-15 15:39:35 -08:00
David Katleman
a049fb10b2 Added tag jdk8-b64 for changeset 13b36a0b5705 2012-11-08 11:51:20 -08:00
David Katleman
876b26e99a Added tag jdk8-b63 for changeset 590a9a630b02 2012-11-01 14:11:44 -07:00
David Katleman
259b13360c Merge 2012-10-31 18:30:51 -07:00
Kelly O'Hair
4a59eea32b 8000992: Update new build-infra makefiles
Build-infra project integration. Multiple authors on this work: erikj and ihse primarily, also changes from ohair, tbell, and dholmes. Special credit to ohstrom for his smartjavac work.

Reviewed-by: erikj, ihse, dholmes, tbell
2012-10-26 14:25:17 -07:00
Lana Steuck
5d67b08f40 Merge 2012-10-25 20:07:46 -07:00
David Katleman
8ca6d2e3fb Added tag jdk8-b62 for changeset 6fc9f2af5e0d 2012-10-25 09:53:35 -07:00
Lana Steuck
cb7543fafd Merge 2012-10-23 09:41:02 -07:00
David Katleman
0f95eb5efc Added tag jdk8-b61 for changeset 877dd5308e32 2012-10-18 11:08:30 -07:00
Lana Steuck
c691ebd027 Merge 2012-10-12 14:50:07 -07:00
David Katleman
6380aca7b2 Added tag jdk8-b60 for changeset 77de918f1de3 2012-10-11 09:49:41 -07:00
Joe Wang
0b25975fcd 8000172: 2 SAX features does not work properly
When external dtd is not loaded, skippedEntity event should be reported for entity references.

Reviewed-by: lancea
2012-10-09 14:19:11 -07:00
David Katleman
56e12ecc3a Added tag jdk8-b59 for changeset e31f9b0d349f 2012-10-04 14:35:10 -07:00
David Katleman
b62f8968fe Added tag jdk8-b58 for changeset 63e6a7c76188 2012-09-27 11:24:55 -07:00
David Katleman
1672690b20 Added tag jdk8-b57 for changeset 61be07ec4655 2012-09-20 13:44:47 -07:00
David Katleman
84e2bbbb3c Merge 2012-09-19 15:45:48 -07:00
Kelly O'Hair
28f46567e4 7197849: Update new build-infra makefiles
Reviewed-by: ihse, erikj, ohrstrom, tbell
2012-09-18 11:29:37 -07:00
David Katleman
9500be57ff Added tag jdk8-b56 for changeset 5cc92e17f3ec 2012-09-13 13:15:34 -07:00
David Katleman
76b8a9a6b7 Added tag jdk8-b55 for changeset b5d27d05eea2 2012-09-06 17:27:44 -07:00
Lana Steuck
955d253fed Merge 2012-08-30 20:10:34 -07:00
David Katleman
6b75da0827 Added tag jdk8-b54 for changeset 3799d28d324f 2012-08-30 10:27:15 -07:00
Lana Steuck
b78fd98dc7 Merge 2012-08-27 10:55:57 -07:00
David Katleman
badee55a59 Added tag jdk8-b53 for changeset e18b2f956052 2012-08-23 12:27:41 -07:00
Joe Wang
5d2e65169c 7191547: XMLEventFactory.newFactory(String factoryId, ClassLoader loader) does not work as expected
Similar to the patch for 6756677 for XMLInputFactory and XMLOutputFactory, this patch fixes an error in XMLEventFactory where factoryId was taken as factory class.

Reviewed-by: lancea
2012-08-17 09:49:42 -07:00
David Katleman
664534610e Added tag jdk8-b52 for changeset 249b4f59d330 2012-08-16 11:43:18 -07:00
David Katleman
fd4e1e725f Added tag jdk8-b51 for changeset f333428be769 2012-08-09 18:01:36 -07:00
David Katleman
1b9d38a123 Added tag jdk8-b50 for changeset c0935ebf58d0 2012-08-02 15:35:03 -07:00
Christine Lu
2197a8fbd0 Added tag jdk8-b49 for changeset 23117496a054 2012-07-26 16:48:26 -07:00
Lana Steuck
10bd761f06 Merge 2012-07-24 11:05:30 -07:00
Christine Lu
6140c462db Added tag jdk8-b48 for changeset ff4cbdd893ef 2012-07-23 12:38:21 -07:00
Lana Steuck
052400a120 Merge 2012-07-16 17:02:36 -07:00
Joe Wang
fec1de491b 7183760: DocumentBuilder.parse(String uri) is not IPv6 enabled
Removing the hack of using escapeNonUSAscii. this is the same patch as 7166896 for 7u8.

Reviewed-by: psandoz, lancea
2012-07-12 21:06:52 -07:00
David Katleman
ebbf572261 Added tag jdk8-b47 for changeset 6ab81ecbfa0d 2012-07-12 16:48:13 -07:00
Lana Steuck
9d1c32d9fa Merge 2012-07-10 11:40:47 -07:00
David Katleman
cb0f1fed69 Added tag jdk8-b46 for changeset b5166f281c42 2012-07-05 18:44:22 -07:00
Lana Steuck
4bdc9c4528 Merge 2012-07-03 18:24:03 -07:00
David Katleman
6af718bb7f Added tag jdk8-b45 for changeset a21c904ee700 2012-06-28 09:32:52 -07:00
Lana Steuck
73e8d2923d Merge 2012-06-26 22:47:23 -07:00
Joe Wang
6b5a5ca0e2 7166896: DocumentBuilder.parse(String uri) is not IPv6 enabled. It throws MalformedURLException
Skip the added international character handling for general paths

Reviewed-by: lancea
2012-06-26 15:28:21 -07:00
Lana Steuck
6b961cfac1 Merge 2012-06-26 10:27:51 -07:00
Lana Steuck
7281232239 Merge 2012-06-25 21:37:34 -07:00
David Katleman
df2b1220d4 Added tag jdk8-b44 for changeset b52db8219e73 2012-06-21 17:07:57 -07:00
Lana Steuck
89add82f07 Merge 2012-06-17 21:29:12 -07:00
David Katleman
9842dda872 Added tag jdk8-b43 for changeset d382060bd755 2012-06-14 13:14:21 -07:00
David Katleman
3401d40d52 Merge 2012-06-13 16:53:25 -07:00
Joe Wang
94d67fa6a5 7144423: StAX EventReader swallows the cause of error
Make sure the cause of the error is properly reported

Reviewed-by: lancea, psandoz
2012-06-12 10:23:49 -07:00
Joe Wang
e881068530 7157610: NullPointerException occurs when parsing XML doc
Recovers what was the original disallow-doctype-decl, reporting error when disallow-doctype-decl is true, and change everything else that was added for SupportDTD to be governed by a new flag 'fSupportDTD'.

Reviewed-by: lancea
2012-06-11 15:47:01 -07:00
Lana Steuck
58f22a5049 Merge 2012-06-08 12:01:24 -07:00
Joe Wang
478e52def4 7157608: One feature is not recognized
Adding feature standard-uri-conformant into the recognized list

Reviewed-by: psandoz
2012-06-08 11:28:29 -07:00
Erik Joelsson
55e52f1b6d 7170079: Adjustments to build-infra makefiles
Co-authored-by: Jonas Oreland <jonas.oreland@oracle.com>
Co-authored-by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
Co-authored-by: Torbjorn Granat <torbjorn.granat@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Reviewed-by: ohair, ohrstrom, ihse, jonas
2012-06-07 20:30:41 -07:00
Joe Wang
aca1037e9f 7151118: Regressions on 7u4 b11 comp. 7u4 b06 on specjvm2008.xml.transform subbenchmark
Roll back XalanJ-2271 that caused the regression

Reviewed-by: lancea
2012-06-07 13:47:53 -07:00
Abhijit Saha
65214699fa Merge 2012-06-07 12:30:22 -07:00
Christine Lu
7bd0bb92de Added tag jdk8-b42 for changeset 8fc801f2ef62 2012-06-07 12:10:26 -07:00
Christine Lu
2349d985f7 Added tag jdk8-b41 for changeset 1ef14f73e385 2012-06-01 14:12:20 -07:00
David Katleman
a0c3e086d9 Added tag jdk8-b40 for changeset aaf5a4412dd3 2012-05-24 16:15:45 -07:00
Abhijit Saha
1b16739a2d Merge 2012-05-21 14:51:03 -07:00
David Katleman
b57dfbffa8 Added tag jdk8-b39 for changeset a70d185bcc77 2012-05-17 06:20:35 -07:00
David Katleman
74f10135f5 Added tag jdk8-b38 for changeset 426adeeabf00 2012-05-10 10:25:08 -07:00
David Katleman
c1e2bb79f8 Added tag jdk8-b37 for changeset 19c92373018b 2012-05-09 13:07:49 -07:00
Abhijit Saha
a84e7fc733 Merge 2012-05-08 07:30:48 -07:00
David Katleman
6f383ae89d Merge 2012-05-02 15:47:08 -07:00
Kelly O'Hair
e0e7eb6c44 7165312: Fix jaxp source movement for new build-infra
Reviewed-by: ohrstrom
2012-04-30 16:03:40 -07:00
David Katleman
4149bc3c4a Added tag jdk8-b36 for changeset 69a997cbdf15 2012-04-26 14:06:27 -07:00
Lana Steuck
e4e2e9efec Merge 2012-04-23 16:55:12 -07:00
David Katleman
8e5fedeb45 Added tag jdk8-b35 for changeset 4bca4ac90e85 2012-04-19 12:18:53 -07:00
Lana Steuck
9e2a9c561e Merge 2012-04-18 10:20:19 -07:00
Joe Wang
db4db38876 7160380: Sync JDK8 with JAXP 1.4.5
Bring JDK8 up to date to what we have in 7u4

Reviewed-by: lancea, mullan
2012-04-17 11:17:59 -07:00
David Katleman
a1a5bd99c1 Added tag jdk8-b34 for changeset 664a26130786 2012-04-12 09:35:15 -07:00
Joe Wang
60663487f6 7160496: Rename JDK8 JAXP source directory
Moving src/share/classes to src

Reviewed-by: ohair
2012-04-12 08:38:26 -07:00
David Katleman
f7eeff71a4 Merge 2012-04-11 14:08:06 -07:00
Joe Wang
dcfcdd72ce 7157609: Issues with loop
Reviewed-by: hawtin, lancea, asaha
2012-04-10 13:59:21 -07:00
Fredrik Ohstrom
2c8ab7122b 7074397: Build infrastructure changes (makefile re-write)
New makefiles transition, old and new living side by side for now.

Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com>
Co-authored-by: Torbjorn Granat <torbjorn.granat@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Reviewed-by: ohair, jjg, dholmes, ohrstrom, erikj, ihse, tgranat, ykantser
2012-04-10 08:13:29 -07:00
David Katleman
380bf4c7a9 Added tag jdk8-b33 for changeset e8ae2b095548 2012-04-05 13:04:52 -07:00
Christine Lu
1a6c31bc2b Added tag jdk8-b32 for changeset b8b4c42fef3c 2012-03-29 13:02:18 -07:00
David Katleman
2372340c55 Added tag jdk8-b31 for changeset 3de32ba5241d 2012-03-22 12:41:18 -07:00
David Katleman
400aa66520 Added tag jdk8-b30 for changeset a32dddd6ba7c 2012-03-15 15:16:15 -07:00
David Katleman
545c4a7aa7 Added tag jdk8-b29 for changeset c7420b6abb44 2012-03-08 20:34:54 -08:00
David Katleman
1741706a00 Merge 2012-03-07 13:46:18 -08:00
Kelly O'Hair
13c4ad8e20 7150324: Stop using drop bundles in jaxp
Reviewed-by: prr, joehw
2012-03-04 11:55:34 -08:00
David Katleman
0ca13f7ff6 Added tag jdk8-b28 for changeset afee4474f087 2012-03-01 12:23:19 -08:00
David Katleman
076a67b1bf Added tag jdk8-b27 for changeset 4506e41cb329 2012-02-23 12:03:16 -08:00
David Katleman
6a8b78d6db Added tag jdk8-b26 for changeset 1d96f9313a4b 2012-02-16 13:01:32 -08:00
David Katleman
3cc3ab97ed Added tag jdk8-b25 for changeset 6d836b7888ea 2012-02-09 12:55:56 -08:00
David Katleman
1f03218e56 Added tag jdk8-b24 for changeset abbbbaf35c96 2012-02-02 09:39:32 -08:00
David Katleman
c4b15b06e6 Added tag jdk8-b23 for changeset 939aca1c5dac 2012-01-26 18:23:24 -08:00
David Katleman
1599f28a1f Added tag jdk8-b22 for changeset 99a092d22c70 2012-01-20 13:08:44 -08:00
David Katleman
25236e8d34 Added tag jdk8-b21 for changeset bcda986cbc2e 2012-01-13 10:05:41 -08:00
David Katleman
f33bdc967a Added tag jdk8-b20 for changeset 4296421cf07a 2012-01-05 08:42:36 -08:00
David Katleman
da097641d1 Added tag jdk8-b19 for changeset 5d3d2bd1dfd1 2011-12-29 15:14:40 -08:00
Lana Steuck
08c6d2dba6 Merge 2011-12-23 16:36:33 -08:00
Christine Lu
1fba5dd495 Added tag jdk8-b18 for changeset 9bdd4ab27689 2011-12-22 19:00:26 -08:00
Lana Steuck
c81bf9bf17 Merge 2011-12-15 19:49:53 -08:00
David Katleman
8d7fa09ac3 Merge 2011-12-15 15:54:22 -08:00
David Katleman
d71f8f6c11 Added tag jdk8-b16 for changeset 235fd08346ca 2011-12-15 15:47:25 -08:00
David Katleman
c5b3a96b64 Added tag jdk8-b17 for changeset 235fd08346ca 2011-12-15 12:16:26 -08:00
Kelly O'Hair
bf884c6dff 7119829: Adjust default jprt testing configuration
Reviewed-by: alanb
2011-12-12 08:12:38 -08:00
Kelly O'Hair
877c60e798 7117110: Remove target 1.5 from jaxp and jaxws repo builds for mac
Reviewed-by: alanb
2011-12-12 08:12:20 -08:00
David Katleman
569c7fb353 Merge 2011-12-07 13:02:34 -08:00
David Katleman
58672f238e 7117162: jdk8/jaxws/Makefile default DROPS_DIR should set to jdk8-drops
Reviewed-by: ohair, xdono, mchung
2011-12-06 08:43:27 -08:00
David Katleman
c66f24bf21 Added tag jdk8-b15 for changeset ab11a4dcb014 2011-12-01 10:33:22 -08:00
David Katleman
4246239742 Added tag jdk8-b14 for changeset 8f64d0e75d9e 2011-11-17 10:45:59 -08:00
David Katleman
fc6d47bc5c Added tag jdk8-b13 for changeset 5002669612fc 2011-11-10 11:46:28 -08:00
David Katleman
ab91a77f0c Added tag jdk8-b12 for changeset 043062d0d76a 2011-11-03 10:32:23 -07:00
David Katleman
96ca36886a Added tag jdk8-b11 for changeset 1c9f26d85678 2011-10-27 13:54:37 -07:00
David Katleman
45d8e3cd09 Added tag jdk8-b10 for changeset e99452c9ff04 2011-10-20 10:32:43 -07:00
David Katleman
7a7270c0bd Added tag jdk8-b09 for changeset 072884311758 2011-10-13 10:35:39 -07:00
David Katleman
6d08c900c4 Added tag jdk8-b08 for changeset c6ec1d396a6f 2011-10-06 14:01:33 -07:00
David Katleman
34db0587a4 Added tag jdk8-b07 for changeset dff0b2eda2a8 2011-09-29 18:53:48 -07:00
David Katleman
0761734777 Added tag jdk8-b06 for changeset 301b3b8fc6aa 2011-09-22 16:02:05 -07:00
Suchen Chien
a3ac3c7ae5 Added tag jdk8-b05 for changeset af07bf5ee3ea 2011-09-15 18:53:21 -07:00
Suchen Chien
5a6cbc47b8 Added tag jdk8-b04 for changeset 6332e6ee2b55 2011-09-08 16:59:33 -07:00
Suchen Chien
a481e029fa Added tag jdk8-b03 for changeset 7a7c32801316 2011-09-01 13:54:31 -07:00
Suchen Chien
db1cefbdf4 Added tag jdk8-b02 for changeset 201b3cac405d 2011-08-25 17:18:06 -07:00
Christine Lu
5cd44b95ad Added tag jdk8-b01 for changeset 1df939041fc6 2011-08-18 18:55:17 -07:00
Kelly O'Hair
59802b7329 7069993: Adjust make/jprt.properties file for jdk8
Reviewed-by: katleman
2011-07-22 17:34:49 -07:00
Suchen Chien
38f899e9b3 Merge 2011-06-27 14:10:24 -07:00
Suchen Chien
9d5df3c087 Added tag jdk7-b147 for changeset f2a6a84060f0 2011-06-27 13:21:26 -07:00
Lana Steuck
4f3dac70dd Merge 2011-06-22 12:40:58 -07:00
Jeff Dinkins
4aa72cd991 7057046: Add embedded license to THIRD PARTY README
Reviewed-by: lana
2011-06-22 10:10:39 -07:00
Suchen Chien
6d9b343adb Merge 2011-06-20 17:28:31 -07:00
Suchen Chien
217a519b3e Added tag jdk7-b146 for changeset dbf30739b207 2011-06-20 16:25:23 -07:00
Suchen Chien
cc387f340d Merge 2011-06-08 10:21:10 -07:00
Suchen Chien
51f3bcc4c4 Added tag jdk7-b145 for changeset 027c88c4e55f 2011-06-07 14:01:05 -07:00
Lana Steuck
12e2e2e32e Merge 2011-06-02 13:37:50 -07:00
Jeff Dinkins
40feccaa7b 7045697: JDK7 THIRD PARTY README update
Reviewed-by: lana
2011-05-27 15:01:43 -07:00
Suchen Chien
40eff40fbf Added tag jdk7-b144 for changeset 57cd6696ddb0 2011-05-26 20:19:55 -07:00
Mark Reinhold
60efa7c218 7048009: Update .jcheck/conf files for JDK 8
Reviewed-by: jjh
2011-05-24 15:28:38 -07:00
Lana Steuck
04c1ea3f9f Merge 2011-05-20 21:00:06 -07:00
Suchen Chien
3d8755bc34 Added tag jdk7-b143 for changeset 9fcad86579e6 2011-05-20 16:04:02 -07:00
Kelly O'Hair
a3b2fd358d 7044493: Incorrectly formated GPL headers in JDK7 JAXP source drop
Reviewed-by: joehw
2011-05-19 08:38:13 -07:00
Suchen Chien
a852fe1092 Added tag jdk7-b142 for changeset 80cd3986b5de 2011-05-12 17:17:29 -07:00
Jennifer Godinez
1c21c0f406 Merge 2011-05-09 12:26:53 -07:00
Suchen Chien
31d82bb88b Added tag jdk7-b141 for changeset cb7a3284b15b 2011-05-05 14:02:10 -07:00
Jennifer Godinez
d320ad28b1 Merge 2011-05-03 22:15:17 -07:00
Suchen Chien
d813ff6aba Merge 2011-05-02 09:36:45 -07:00
Lana Steuck
18602d10f0 Merge 2011-04-30 15:14:44 -07:00
Kelly O'Hair
344a758c27 7040147: jaxp 1.4.5 jdk7 integration
Reviewed-by: joehw
2011-04-29 10:58:15 -07:00
Suchen Chien
36230d8a90 Added tag jdk7-b140 for changeset 2c31217f748a 2011-04-28 17:44:28 -07:00
Christine Lu
321c843b19 Merge 2011-04-27 19:20:45 -07:00
Kelly O'Hair
a6c3e80878 6631003: Add hg tip changeset to build image
Reviewed-by: mduigou
2011-04-26 16:28:22 -07:00
David Katleman
9501c6fe3c Added tag jdk7-b139 for changeset 190a0cc8ef93 2011-04-21 15:33:03 -07:00
Suchen Chien
5d58977c4a Added tag jdk7-b138 for changeset 0319b53ef05f 2011-04-14 15:21:52 -07:00
Kelly O'Hair
eeefcda6b6 Merge 2011-04-12 18:36:42 -07:00
Suchen Chien
cf25a79f41 Added tag jdk7-b137 for changeset 4d1bb30e7cb5 2011-04-07 15:21:03 -07:00
Kelly O'Hair
502320fdde 7033660: Update copyright year to 2011 on any files changed in 2011
Reviewed-by: dholmes
2011-04-06 20:15:38 -07:00
Suchen Chien
8dbe27427f Added tag jdk7-b136 for changeset cc86c97af00b 2011-03-31 18:14:10 -07:00
Suchen Chien
ac0ed22859 Added tag jdk7-b135 for changeset ef8d7bf5bc99 2011-03-24 11:20:41 -07:00
Suchen Chien
3441f43b51 Added tag jdk7-b134 for changeset 74c6fa05df57 2011-03-17 14:32:53 -07:00
Kelly O'Hair
89e704969f Merge 2011-03-15 15:31:44 -07:00
Michael Fang
1f536d5799 Merge 2011-03-14 12:32:45 -07:00
Lana Steuck
727cba4af8 Merge 2011-03-10 20:37:53 -08:00
Christine Lu
77d4b381d0 Added tag jdk7-b133 for changeset 97a72738edc8 2011-03-10 17:11:01 -08:00
Kelly O'Hair
07f4c197b3 7025412: make381 issues with quotes in jdk/make/docs/Makefile and other places
Reviewed-by: mchung
2011-03-10 13:21:59 -08:00
Lana Steuck
023881681d Merge 2011-03-07 11:56:06 -08:00
David Katleman
42384274cc Added tag jdk7-b132 for changeset 3ea23e6be269 2011-03-03 14:13:04 -08:00
Kelly O'Hair
b2d0026bff 7023289: jaxp 1.4.5 development jdk7 2nd integration
Reviewed-by: joehw, mchung, alanb
2011-03-02 12:00:41 -08:00
Christine Lu
72cafcadc8 Added tag jdk7-b131 for changeset df8969303f96 2011-02-24 15:15:56 -08:00
Christine Lu
19992e1443 Merge 2011-02-23 15:48:59 -08:00
Christine Lu
5d6d7f29f4 Added tag jdk7-b130 for changeset b0a4325b9ef5 2011-02-18 14:23:42 -08:00
Kelly O'Hair
4d9392390f 7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg
2011-02-16 13:29:39 -08:00
Christine Lu
20b88d2aae Added tag jdk7-b129 for changeset ff78798ebd0e 2011-02-10 16:24:34 -08:00
Christine Lu
ae7dd83321 Added tag jdk7-b128 for changeset 830d9cfc3121 2011-02-03 17:22:12 -08:00
Christine Lu
1fd7554dee Added tag jdk7-b127 for changeset 784082330dbc 2011-01-27 17:28:40 -08:00
Christine Lu
b74d5841e6 Added tag jdk7-b126 for changeset b1e3d8548ad2 2011-01-20 15:52:10 -08:00
Lana Steuck
fd621457ce Merge 2011-01-14 13:48:03 -08:00
Christine Lu
b73f903d3d Added tag jdk7-b125 for changeset c477817f26b9 2011-01-13 16:43:56 -08:00
Lana Steuck
be9206bd4b Merge 2011-01-13 14:55:55 -08:00
Christine Lu
8c9c66c2dc Added tag jdk7-b124 for changeset b715439429dd 2011-01-06 20:10:25 -08:00
Lana Steuck
ae4a2cca16 Merge 2011-01-04 16:28:40 -08:00
Kelly O'Hair
e060789ea4 6962318: Update copyright year
Reviewed-by: xdono
2010-12-28 15:52:56 -08:00
Lana Steuck
ce11ee82ba Merge 2010-12-22 22:57:26 -08:00
Christine Lu
93491a0775 Added tag jdk7-b123 for changeset 0fe786c062f0 2010-12-22 15:57:19 -08:00
Christine Lu
fd8f109e58 Added tag jdk7-b122 for changeset adf3a281adc9 2010-12-16 18:17:59 -08:00
Kelly O'Hair
08bce30ea2 7007257: jaxp 1.4.5 jdk7 1st integration
Reviewed-by: joehw
2010-12-16 13:10:45 -08:00
David Katleman
4960455564 Added tag jdk7-b121 for changeset 75d78f95b8eb 2010-12-09 21:25:29 -08:00
Lana Steuck
95ea622a39 Merge 2010-12-06 20:33:02 -08:00
Christine Lu
9efe7286dd Added tag jdk7-b120 for changeset e9aad21cf42e 2010-12-02 19:04:05 -08:00
Lana Steuck
734b77089b Merge 2010-11-30 15:06:43 -08:00
Kelly O'Hair
9abcddfc69 7002248: Update urls for jaxp and jaxws source downloads
Reviewed-by: darcy
2010-11-23 10:04:15 -08:00
Christine Lu
7daccf11f8 Added tag jdk7-b119 for changeset 1db26590e632 2010-11-22 14:57:16 -08:00
Christine Lu
f315d35ad5 Added tag jdk7-b118 for changeset dd5e977be090 2010-11-11 11:02:16 -08:00
Christine Lu
8d5ed096f0 Added tag jdk7-b117 for changeset be017e4765f7 2010-11-04 15:54:26 -07:00
Christine Lu
aa30496d73 Added tag jdk7-b116 for changeset 990c6c2dc488 2010-10-28 13:31:35 -07:00
Christine Lu
d2d92cc407 Added tag jdk7-b115 for changeset aced6801fb45 2010-10-21 17:12:33 -07:00
Christine Lu
edef1c5aef Added tag jdk7-b114 for changeset 83c0366b459c 2010-10-14 19:25:02 -07:00
Christine Lu
a6e5f5eb91 Added tag jdk7-b113 for changeset 039713686e1c 2010-10-07 15:12:11 -07:00
Christine Lu
76b7afa4ea Added tag jdk7-b112 for changeset 4597d735f40c 2010-10-01 15:45:06 -07:00
Lana Steuck
a6714f583f Merge 2010-09-24 16:38:08 -07:00
Christine Lu
d7a72c75ba Added tag jdk7-b111 for changeset d32614f0702d 2010-09-23 17:33:33 -07:00
Christine Lu
b23471dfea Added tag jdk7-b110 for changeset dcabd2849331 2010-09-16 15:13:03 -07:00
Lana Steuck
d70f7c5e50 Merge 2010-09-16 11:18:37 -07:00
Christine Lu
7998ff0c05 Added tag jdk7-b109 for changeset 6ae478428a17 2010-09-09 15:07:43 -07:00
Christine Lu
34668d416b Merge 2010-09-08 14:04:18 -07:00
Kelly O'Hair
a7ac1a62c9 Merge 2010-09-07 15:50:58 -07:00
Kelly O'Hair
43a5a8356f 6982946: Change make/jprt.properties to defer to JPRT itself for jdk platform list
Reviewed-by: kamg
2010-09-07 15:15:33 -07:00
Christine Lu
9cf82cab33 Added tag jdk7-b108 for changeset 47349e388f34 2010-09-03 12:49:59 -07:00
Lana Steuck
1b9e0aa8c7 Merge 2010-09-02 22:09:16 -07:00
Joe Wang
db3c413268 6981408: Upgrade jaxp to 1.4.4
Reviewed-by: darcy
2010-09-01 13:28:07 -07:00
Christine Lu
a133e18a3b Added tag jdk7-b107 for changeset e8ced0e364f9 2010-08-26 16:16:55 -07:00
Christine Lu
212be87e66 Added tag jdk7-b106 for changeset 443acf814b79 2010-08-19 15:13:06 -07:00
Christine Lu
daf33b796d Added tag jdk7-b105 for changeset 989115191d21 2010-08-13 11:38:21 -07:00
Christine Lu
ba330f23de Added tag jdk7-b104 for changeset e4e7ae0ec293 2010-08-06 12:51:59 -07:00
Christine Lu
a1e95a3802 Added tag jdk7-b103 for changeset d599ee7032ef 2010-07-29 13:33:13 -07:00
Michael Wilkerson
bc54af4743 Added tag jdk7-b102 for changeset 39fde8f85ca1 2010-07-23 16:42:20 -07:00
Lana Steuck
b901dad72f Merge 2010-07-20 22:17:33 -07:00
Michael Wilkerson
cfc55e5aa1 Added tag jdk7-b101 for changeset 705b83bb0c66 2010-07-15 20:11:39 -07:00
Lana Steuck
c3121fbc7e Merge 2010-07-12 19:37:48 -07:00
Michael Wilkerson
709178cf04 Added tag jdk7-b100 for changeset 9962977aef86 2010-07-09 19:18:26 -07:00
Lana Steuck
48d58f76ef Merge 2010-06-29 22:31:39 -07:00
Lana Steuck
4b717b5ba1 Merge 2010-06-29 10:49:43 -07:00
Michael Wilkerson
52ca0b6388 Added tag jdk7-b99 for changeset 2ac6aa68ce63 2010-06-24 20:03:04 -07:00
Kelly O'Hair
ce119517a2 6963941: Correct download link for source drop bundle
Reviewed-by: darcy
2010-06-24 08:34:57 -07:00
Lana Steuck
dde1b747f6 Merge 2010-06-21 22:07:03 -07:00
Michael Wilkerson
01e7cde127 Added tag jdk7-b98 for changeset 19fe6cf1559b 2010-06-17 16:28:04 -07:00
Kelly O'Hair
cafa9bd6e5 6955292: Workaround ant 1.7.1 package-info.java issue in ant scripts
6960333: Add make level ALLOW_DOWNLOADS=true option
6940241: Change jaxp/jaxws so that the http downloads are not done by default

Reviewed-by: darcy
2010-06-17 10:50:14 -07:00
Kelly O'Hair
98a56c7ab7 6955301: Update names and references to rebranded drop bundles (jaxp, jaxws, jaf)
Reviewed-by: darcy
2010-06-17 10:43:17 -07:00
Michael Wilkerson
34af62642f Added tag jdk7-b97 for changeset c537acdc6dba 2010-06-10 13:59:04 -07:00
Michael Wilkerson
f52bff6fde Added tag jdk7-b96 for changeset 4d5b1beafffc 2010-06-03 13:30:13 -07:00
Michael Wilkerson
6e1518685e Added tag jdk7-b95 for changeset eca8ec9ea1e6 2010-05-27 10:57:18 -07:00
Kelly O'Hair
7036215c06 Merge 2010-05-26 10:41:05 -07:00
Kelly O'Hair
149a47c01f 6943119: Rebrand source copyright notices
Reviewed-by: darcy
2010-05-25 15:52:44 -07:00
Michael Wilkerson
d4eb25c634 Added tag jdk7-b94 for changeset 5cb1d1d6eaef 2010-05-20 16:00:20 -07:00
Michael Wilkerson
a0f06a97b0 Added tag jdk7-b93 for changeset b698288c7b9b 2010-05-13 13:22:16 -07:00
Michael Wilkerson
c68729ee76 Added tag jdk7-b92 for changeset 34f8f501f771 2010-05-06 18:26:03 -07:00
Michael Wilkerson
332c6ac181 Added tag jdk7-b91 for changeset d93fc4179dc2 2010-04-29 14:32:48 -07:00
Michael Wilkerson
1c77657b60 Added tag jdk7-b90 for changeset 785ad20ceb84 2010-04-22 16:54:28 -07:00
Michael Wilkerson
5a8b753b8a Added tag jdk7-b89 for changeset a5368e5402f5 2010-04-15 13:54:59 -07:00
Michael Wilkerson
e1b0bb8355 Added tag jdk7-b88 for changeset d929b243d1f3 2010-04-08 17:02:45 -07:00
Michael Wilkerson
f04aa441ba Added tag jdk7-b87 for changeset 40e99ec5ee66 2010-03-25 15:05:24 -07:00
Michael Wilkerson
9d5408b847 Added tag jdk7-b86 for changeset 221fb7990478 2010-03-18 13:52:54 -07:00
Michael Wilkerson
e2d20d45a8 Added tag jdk7-b85 for changeset cdc37d7f9bba 2010-03-04 13:50:18 -08:00
Michael Wilkerson
a2494d2da2 Added tag jdk7-b84 for changeset 1a0d508d727c 2010-02-18 13:31:37 -08:00
Lana Steuck
c117042197 Merge 2010-02-14 23:35:12 -08:00
Michael Wilkerson
e63e477ad4 Added tag jdk7-b83 for changeset ab248239edc6 2010-02-12 13:25:12 -08:00
Lana Steuck
8c00c873ad Merge 2010-02-08 23:58:47 -08:00
Michael Wilkerson
0bd596e2d2 Added tag jdk7-b82 for changeset 735cf3731da4 2010-02-04 11:19:27 -08:00
Kelly O'Hair
d647d7dfb4 6923146: Upgrade to JAXP 1.4.3
Reviewed-by: darcy
2010-02-03 16:44:51 -08:00
Michael Wilkerson
acd68fe1da Added tag jdk7-b81 for changeset 0c8ad4a8e25b 2010-01-28 11:26:48 -08:00