From 1bd949eb8caa164608177c26fb44f4b745ec6207 Mon Sep 17 00:00:00 2001 From: Jake Hamby Date: Thu, 27 May 2010 19:49:45 -0700 Subject: Delete duplicate test files for JDK 1.6 compatibility. JDK 1.6's jar utility fails with a "duplicate entry" error due to identical test files in multiple locations. This change fixes the build on JDK 1.6 by deleting the extra copies of the test files. Change-Id: Iad27b9a345e7b455c1576989e948088fe00e1116 --- xml/src/test/resources/hc_staff.xml | 60 ----------------------------- xml/src/test/resources/staff.dtd | 17 --------- xml/src/test/resources/staff.xml | 57 ---------------------------- xml/src/test/resources/staff2.dtd | 24 ------------ xml/src/test/resources/staff2.xml | 13 ------- xml/src/test/resources/staffNS.dtd | 45 ---------------------- xml/src/test/resources/staffNS.xml | 59 ----------------------------- xml/src/test/resources/xhtml1-strict.dtd | 65 -------------------------------- 8 files changed, 340 deletions(-) delete mode 100644 xml/src/test/resources/hc_staff.xml delete mode 100644 xml/src/test/resources/staff.dtd delete mode 100644 xml/src/test/resources/staff.xml delete mode 100644 xml/src/test/resources/staff2.dtd delete mode 100644 xml/src/test/resources/staff2.xml delete mode 100644 xml/src/test/resources/staffNS.dtd delete mode 100644 xml/src/test/resources/staffNS.xml delete mode 100644 xml/src/test/resources/xhtml1-strict.dtd (limited to 'xml/src') diff --git a/xml/src/test/resources/hc_staff.xml b/xml/src/test/resources/hc_staff.xml deleted file mode 100644 index 2df9a74..0000000 --- a/xml/src/test/resources/hc_staff.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - -]> - -hc_staff -

- EMP0001 - Margaret Martin - Accountant - 56,000 - Female - 1230 North Ave. Dallas, Texas 98551 -

-

- EMP0002 - Martha RaynoldsThis is a CDATASection with EntityReference number 2 &ent2; -This is an adjacent CDATASection with a reference to a tab &tab; - Secretary - 35,000 - Female - β Dallas, γ - 98554 -

-

- EMP0003 - Roger - Jones - Department Manager - 100,000 - δ - PO Box 27 Irving, texas 98553 -

-

- EMP0004 - Jeny Oconnor - Personnel Director - 95,000 - Female - 27 South Road. Dallas, Texas 98556 -

-

- EMP0005 - Robert Myers - Computer Specialist - 90,000 - male - 1821 Nordic. Road, Irving Texas 98558 -

- diff --git a/xml/src/test/resources/staff.dtd b/xml/src/test/resources/staff.dtd deleted file mode 100644 index 02a994d..0000000 --- a/xml/src/test/resources/staff.dtd +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff --git a/xml/src/test/resources/staff.xml b/xml/src/test/resources/staff.xml deleted file mode 100644 index f89c510..0000000 --- a/xml/src/test/resources/staff.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - Element data"> - - - - -]> - - - - EMP0001 - Margaret Martin - Accountant - 56,000 - Female -
1230 North Ave. Dallas, Texas 98551
- - - EMP0002 - Martha Raynolds - - Secretary - 35,000 - Female -
&ent2; Dallas, &ent3; - 98554
- - - EMP0003 - Roger - Jones - Department Manager - 100,000 - &ent4; -
PO Box 27 Irving, texas 98553
- - - EMP0004 - Jeny Oconnor - Personnel Director - 95,000 - Female -
27 South Road. Dallas, Texas 98556
- - - EMP0005 - Robert Myers - Computer Specialist - 90,000 - male -
1821 Nordic. Road, Irving Texas 98558
- - diff --git a/xml/src/test/resources/staff2.dtd b/xml/src/test/resources/staff2.dtd deleted file mode 100644 index 0bac8f2..0000000 --- a/xml/src/test/resources/staff2.dtd +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/xml/src/test/resources/staff2.xml b/xml/src/test/resources/staff2.xml deleted file mode 100644 index d3d9a13..0000000 --- a/xml/src/test/resources/staff2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - EMP0001 - Margaret Martin - Accountant - 56,000 - Female -
1230 North Ave. Dallas, Texas 98551
- - diff --git a/xml/src/test/resources/staffNS.dtd b/xml/src/test/resources/staffNS.dtd deleted file mode 100644 index 7643773..0000000 --- a/xml/src/test/resources/staffNS.dtd +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xml/src/test/resources/staffNS.xml b/xml/src/test/resources/staffNS.xml deleted file mode 100644 index 1cb1459..0000000 --- a/xml/src/test/resources/staffNS.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Element data"> - - - - - -]> - - - - EMP0001 - Margaret Martin - Accountant - 56,000 - Female -
1230 North Ave. Dallas, Texas 98551
- - - EMP0002 - Martha Raynolds - - - Secretary - 35,000 - Female -
&ent2; Dallas, &ent3; - 98554
- - - EMP0003 - Roger - Jones - Department Manager - 100,000 - &ent4; -
PO Box 27 Irving, texas 98553
- - EMP0004 - Jeny Oconnor - Personnel Director - 95,000 - Female - 27 South Road. Dallas, texas 98556 - - - EMP0005 - Robert Myers - Computer Specialist - 90,000 - male -
1821 Nordic. Road, Irving Texas 98558
- - diff --git a/xml/src/test/resources/xhtml1-strict.dtd b/xml/src/test/resources/xhtml1-strict.dtd deleted file mode 100644 index 60bbaf7..0000000 --- a/xml/src/test/resources/xhtml1-strict.dtd +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1