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
author: Jake Hamby <jhamby@google.com> 2010-05-27 19:49:45 -0700
committer: Jake Hamby <jhamby@google.com> 2010-05-27 19:49:45 -0700
commit: 1bd949eb8caa164608177c26fb44f4b745ec6207 (patch)
tree: cf80c275f254aa39ab6391ef3c01248566ee35e2 /xml/src
parent: 6ba9c6519c9b1681fdbd6f444917e19f359acc15 (diff)
download: libcore-1bd949eb8caa164608177c26fb44f4b745ec6207.zip
libcore-1bd949eb8caa164608177c26fb44f4b745ec6207.tar.gz
libcore-1bd949eb8caa164608177c26fb44f4b745ec6207.tar.bz2
8 files changed, 0 insertions, 340 deletions
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 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-<!DOCTYPE html
-   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   "xhtml1-strict.dtd" [
-   <!ENTITY alpha "&#945;">
-   <!ENTITY beta "&#946;">
-   <!ENTITY gamma "&#947;">
-   <!ENTITY delta "&#948;">
-   <!ENTITY epsilon "&#949;">
-   <!ENTITY alpha "&#950;">
-   <!NOTATION notation1 PUBLIC "notation1File">
-   <!NOTATION notation2 SYSTEM "notation2File">
-   <!ATTLIST acronym dir CDATA "ltr">
-]>
-<!-- This is comment number 1.-->
-<html xmlns='http://www.w3.org/1999/xhtml'><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><title>hc_staff</title><script type="text/javascript" src="svgunit.js"/><script charset="UTF-8" type="text/javascript" src="svgtest.js"/><script type='text/javascript'>function loadComplete() { startTest(); }</script></head><body onload="parent.loadComplete()">
- <p>
-  <em>EMP0001</em>
-  <strong>Margaret Martin</strong>
-  <code>Accountant</code>           
-  <sup>56,000</sup>
-  <var>Female</var>
-  <acronym title="Yes">1230 North Ave. Dallas, Texas 98551</acronym>
- </p>
- <p>
-  <em>EMP0002</em>
-  <strong>Martha RaynoldsThis is a CDATASection with EntityReference number 2 &amp;ent2;
-This is an adjacent CDATASection with a reference to a tab &amp;tab;</strong>
-  <code>Secretary</code>
-  <sup>35,000</sup>
-  <var>Female</var>
-  <acronym title="Yes" class="Yes">&beta; Dallas, &gamma;
- 98554</acronym>
- </p>
- <p>
-  <em>EMP0003</em>
-  <strong>Roger
- Jones</strong>
-  <code>Department Manager</code>
-  <sup>100,000</sup>
-  <var>&delta;</var>
-  <acronym title="Yes" class="No">PO Box 27 Irving, texas 98553</acronym>
- </p>
- <p>
-  <em>EMP0004</em>
-  <strong>Jeny Oconnor</strong>
-  <code>Personnel Director</code>
-  <sup>95,000</sup>
-  <var>Female</var>
-  <acronym title="Yes" class="Y&alpha;">27 South Road. Dallas, Texas 98556</acronym>
- </p>
- <p>
-  <em>EMP0005</em>
-  <strong>Robert Myers</strong>
-  <code>Computer Specialist</code>
-  <sup>90,000</sup>
-  <var>male</var>
-  <acronym title="Yes">1821 Nordic. Road, Irving Texas 98558</acronym>
- </p>
-</body></html>
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 @@
-<!ELEMENT employeeId (#PCDATA)>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT position (#PCDATA)>
-<!ELEMENT salary (#PCDATA)>
-<!ELEMENT address (#PCDATA)>
-<!ELEMENT entElement ( #PCDATA ) >
-<!ELEMENT gender ( #PCDATA | entElement )* >
-<!ELEMENT employee (employeeId, name, position, salary, gender, address) >
-<!ELEMENT staff (employee)+>
-<!ATTLIST entElement 
-          attr1 CDATA "Attr">
-<!ATTLIST address
-          domestic CDATA #IMPLIED 
-          street CDATA "Yes">
-<!ATTLIST entElement 
-          domestic CDATA "MALE" >
-
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 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-<!DOCTYPE staff SYSTEM "staff.dtd" [
-   <!ENTITY ent1 "es">
-   <!ENTITY ent2 "1900 Dallas Road">
-   <!ENTITY ent3 "Texas">
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>
-   <!ENTITY ent1 "This entity should be discarded">
-   <!NOTATION notation1 PUBLIC "notation1File">
-   <!NOTATION notation2 SYSTEM "notation2File">
-]>
-<!-- This is comment number 1.-->
-<staff>
- <employee>
-  <employeeId>EMP0001</employeeId>
-  <name>Margaret Martin</name>
-  <position>Accountant</position>           
-  <salary>56,000</salary>
-  <gender>Female</gender>
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
- </employee>
- <employee>
-  <employeeId>EMP0002</employeeId>
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>
-  <position>Secretary</position>
-  <salary>35,000</salary>
-  <gender>Female</gender>
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;
- 98554</address>
- </employee>
- <employee>
-  <employeeId>EMP0003</employeeId>
-  <name>Roger
- Jones</name>
-  <position>Department Manager</position>
-  <salary>100,000</salary>
-  <gender>&ent4;</gender>
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>
- </employee>
- <employee>
-  <employeeId>EMP0004</employeeId>
-  <name>Jeny Oconnor</name>
-  <position>Personnel Director</position>
-  <salary>95,000</salary>
-  <gender>Female</gender>
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>
- </employee>
- <employee>
-  <employeeId>EMP0005</employeeId>
-  <name>Robert Myers</name>
-  <position>Computer Specialist</position>
-  <salary>90,000</salary>
-  <gender>male</gender>
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>
- </employee>
- </staff>
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 @@
-<!ELEMENT employeeId (#PCDATA)>
-<!ELEMENT name (#PCDATA)>
-<!ELEMENT position (#PCDATA)>
-<!ELEMENT salary (#PCDATA)>
-<!ELEMENT address (#PCDATA)>
-<!ELEMENT gender ( #PCDATA)>
-<!ELEMENT employee (employeeId, name, position, salary, gender, address) >
-<!ATTLIST employee xmlns CDATA #IMPLIED>
-<!ELEMENT staff (employee)+>
-<!ELEMENT svg (rect, script, employee+)>
-<!ATTLIST svg 
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"
-      name CDATA #IMPLIED>
-<!ELEMENT rect EMPTY>
-<!ATTLIST rect 
-      x CDATA #REQUIRED
-      y CDATA #REQUIRED
-      width CDATA #REQUIRED
-      height CDATA #REQUIRED>
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script type CDATA #IMPLIED>      
-<!ENTITY svgunit SYSTEM "svgunit.js">
-<!ENTITY svgtest SYSTEM "internalSubset01.js">
-
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 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-<!DOCTYPE staff SYSTEM "staff2.dtd" []>
-<!-- This is comment number 1.-->
-<staff>
- <employee>
-  <employeeId>EMP0001</employeeId>
-  <name>Margaret Martin</name>
-  <position>Accountant</position>           
-  <salary>56,000</salary>
-  <gender>Female</gender>
-  <address>1230 North Ave. Dallas, Texas 98551</address>
- </employee>
- </staff>
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 @@
-<!ELEMENT staff (employee+,emp:employee,employee) >
-<!ELEMENT employee (employeeId,name,position,salary,gender,address) >
-<!ATTLIST employee xmlns CDATA #IMPLIED>
-<!ATTLIST employee xmlns:dmstc CDATA #IMPLIED>
-<!ATTLIST employee xmlns:emp2 CDATA #IMPLIED>
-
-<!ELEMENT employeeId (#PCDATA) >
-
-<!ELEMENT name (#PCDATA) >
-
-<!ELEMENT position (#PCDATA) >
-
-<!ELEMENT salary (#PCDATA) >
-
-<!ELEMENT entElement1 (#PCDATA) >
-<!ELEMENT gender (#PCDATA | entElement1)* >
-<!ATTLIST entElement1 xmlns:local1 CDATA #IMPLIED >
-
-<!ELEMENT address (#PCDATA) >
-<!ATTLIST address dmstc:domestic CDATA #IMPLIED>
-<!ATTLIST address street CDATA #IMPLIED>
-<!ATTLIST address domestic CDATA #IMPLIED>
-<!ATTLIST address xmlns CDATA #IMPLIED>
-
-<!ELEMENT emp:employee (emp:employeeId,nm:name,emp:position,emp:salary,emp:gender,emp:address) >
-<!ATTLIST emp:employee xmlns:emp CDATA #IMPLIED>
-<!ATTLIST emp:employee xmlns:nm CDATA #IMPLIED>
-<!ATTLIST emp:employee defaultAttr CDATA 'defaultVal'>
-
-<!ELEMENT emp:employeeId (#PCDATA) >
-
-<!ELEMENT nm:name (#PCDATA) >
-
-<!ELEMENT emp:position (#PCDATA) >
-
-<!ELEMENT emp:salary (#PCDATA) >
-
-<!ELEMENT emp:gender (#PCDATA) >
-
-<!ELEMENT emp:address (#PCDATA) >
-<!ATTLIST emp:address emp:domestic CDATA #IMPLIED>
-<!ATTLIST emp:address street CDATA #IMPLIED>
-<!ATTLIST emp:address emp:zone ID #IMPLIED>
-<!ATTLIST emp:address emp:district CDATA 'DISTRICT'>
-<!ATTLIST emp:address emp:local1 CDATA 'FALSE'>
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 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>
-<!DOCTYPE staff PUBLIC "STAFF" "staffNS.dtd" 
-[
-   <!ENTITY ent1 "es">
-   <!ENTITY ent2 "1900 Dallas Road">
-   <!ENTITY ent3 "Texas">
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>
-   <!ENTITY ent1 "This entity should be discarded">
-   <!NOTATION notation1 PUBLIC "notation1File">
-   <!NOTATION notation2 SYSTEM "notation2File">
-]>
-<!-- This is comment number 1.-->
-<staff>
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">
-  <employeeId>EMP0001</employeeId>
-  <name>Margaret Martin</name>
-  <position>Accountant</position>           
-  <salary>56,000</salary>
-  <gender>Female</gender>
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
- </employee>
- <employee xmlns:dmstc="http://www.usa.com">
-  <employeeId>EMP0002</employeeId>
-  <name>Martha Raynolds
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>
-  <position>Secretary</position>
-  <salary>35,000</salary>
-  <gender>Female</gender>
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;
- 98554</address>
- </employee>
- <employee xmlns:dmstc="http://www.netzero.com">
-  <employeeId>EMP0003</employeeId>
-  <name>Roger
- Jones</name>
-  <position>Department Manager</position>
-  <salary>100,000</salary>
-  <gender>&ent4;</gender>
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>
- </employee>
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>
-  <nm:name>Jeny Oconnor</nm:name>
-  <emp:position>Personnel Director</emp:position>
-  <emp:salary>95,000</emp:salary>
-  <emp:gender>Female</emp:gender>
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>
- </emp:employee>
- <employee xmlns:emp2="http://www.nist.gov">
-  <employeeId>EMP0005</employeeId>
-  <name>Robert Myers</name>
-  <position>Computer Specialist</position>
-  <salary>90,000</salary>
-  <gender>male</gender>
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>
- </employee>
- </staff>
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 @@
-<!--
-
-Copyright (c) 2001-2004 World Wide Web Consortium, 
-(Massachusetts Institute of Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University).  All 
-Rights Reserved.  This program is distributed under the W3C's Software
-Intellectual Property License.  This program is distributed in the 
-hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
-PURPOSE.  
-
-See W3C License http://www.w3.org/Consortium/Legal/ for more details.
-
--->
-
-<!--
-
-This is a radically simplified DTD for use in the DOM Test Suites
-due to a XML non-conformance of one implementation in processing
-parameter entities.  When that non-conformance is resolved,
-this DTD can be replaced by the normal DTD for XHTML.
-
--->
-
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html xmlns CDATA #IMPLIED>
-<!ELEMENT head (meta,title,script*)>
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta 
-	http-equiv CDATA #IMPLIED
-	content CDATA #IMPLIED>
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT body (p*)>
-<!ATTLIST body onload CDATA #IMPLIED>
-<!ELEMENT p (#PCDATA|em|strong|code|sup|var|acronym|abbr)*>
-<!ATTLIST p 
-  xmlns:dmstc CDATA #IMPLIED
-  xmlns:nm CDATA #IMPLIED
-  xmlns:emp2 CDATA #IMPLIED
-  id ID #IMPLIED  
->
-<!ELEMENT em (#PCDATA)>
-<!ELEMENT span (#PCDATA)>
-<!ELEMENT strong (#PCDATA)>
-<!ELEMENT code (#PCDATA)>
-<!ELEMENT sup (#PCDATA)>
-<!ELEMENT var (#PCDATA|span)*>
-<!ELEMENT acronym (#PCDATA)>
-<!ATTLIST acronym
-    title CDATA #IMPLIED
-    class CDATA #IMPLIED
-    id ID #IMPLIED
->
-<!ELEMENT abbr (#PCDATA)>
-<!ATTLIST abbr
-    title CDATA #IMPLIED
-    class CDATA #IMPLIED
-    id ID #IMPLIED
->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script 
-   type CDATA #IMPLIED
-   src CDATA #IMPLIED
-   charset CDATA #IMPLIED>
author	Jake Hamby <jhamby@google.com>	2010-05-27 19:49:45 -0700
committer	Jake Hamby <jhamby@google.com>	2010-05-27 19:49:45 -0700
commit	1bd949eb8caa164608177c26fb44f4b745ec6207 (patch)
tree	cf80c275f254aa39ab6391ef3c01248566ee35e2 /xml/src
parent	6ba9c6519c9b1681fdbd6f444917e19f359acc15 (diff)
download	libcore-1bd949eb8caa164608177c26fb44f4b745ec6207.zip libcore-1bd949eb8caa164608177c26fb44f4b745ec6207.tar.gz libcore-1bd949eb8caa164608177c26fb44f4b745ec6207.tar.bz2