Started unifying URI resolution mechanism, redesigned configuration system and created flexible config testing

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_URI_Unification@1344594 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 3 insertions, 228 deletions

diff --git a/test/config/afp-invalid-characterset.xconf b/test/config/afp-invalid-characterset.xconf
index 48147e726..e15fa7cd4 100644
--- a/test/config/afp-invalid-characterset.xconf
+++ b/test/config/afp-invalid-characterset.xconf
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fop version="1.0">
   <base>.</base>
+  <strict-validation>false</strict-validation>
   <renderers>
    <renderer mime="application/x-afp">
       <fonts>
diff --git a/test/config/afp-invalid-config.xconf b/test/config/afp-invalid-config.xconf
index 30eecbe6d..55c2ca18a 100644
--- a/test/config/afp-invalid-config.xconf
+++ b/test/config/afp-invalid-config.xconf
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fop version="1.0">
   <base>.</base>
+  <strict-validation>false</strict-validation>
   <renderers>
    <renderer mime="application/x-afp">
       <fonts>
diff --git a/test/config/afp-raster-font-missing.xconf b/test/config/afp-raster-font-missing.xconf
index cf6578d6a..907c70778 100644
--- a/test/config/afp-raster-font-missing.xconf
+++ b/test/config/afp-raster-font-missing.xconf
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fop version="1.0">
   <base>.</base>
+  <strict-validation>false</strict-validation>
   <renderers>
    <renderer mime="application/x-afp">
       <fonts>
diff --git a/test/config/test_font_embedurl_bad.xconf b/test/config/test_font_embedurl_bad.xconf
deleted file mode 100644
index 3a4265d97..000000000
--- a/test/config/test_font_embedurl_bad.xconf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-  
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
-  
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-		<!-- this font has an embed-url that does not exist on filesystem -->
-		<font metrics-url="test/resources/fonts/ttf/glb12.ttf.xml" embed-url="test/resources/fonts/ttf/doesnotexist.ttf">
-          <font-triplet name="Gladiator-Ansi" style="normal" weight="normal"/>
-        </font>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
diff --git a/test/config/test_font_embedurl_malformed.xconf b/test/config/test_font_embedurl_malformed.xconf
deleted file mode 100644
index 41e6c2677..000000000
--- a/test/config/test_font_embedurl_malformed.xconf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-  
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
-  
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-		<!-- this font has a malformed embed-url -->
-		<font metrics-url="test/resources/fonts/ttf/glb12.ttf.xml" embed-url="badprotocol:test/resources/fonts/ttf/glb12.ttf">
-          <font-triplet name="Gladiator-Ansi" style="normal" weight="normal"/>
-        </font>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
diff --git a/test/config/test_font_metricsurl_bad.xconf b/test/config/test_font_metricsurl_bad.xconf
deleted file mode 100644
index 9f2d9b646..000000000
--- a/test/config/test_font_metricsurl_bad.xconf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-  
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
-  
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-		<!-- this font has a metrics-url that does not exist on filesystem -->
-        <font metrics-url="test/resources/fonts/ttf/doesnotexist.ttf.ansi.xml">
-          <font-triplet name="Gladiator-Ansi" style="normal" weight="normal"/>
-        </font>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
diff --git a/test/config/test_font_metricsurl_malformed.xconf b/test/config/test_font_metricsurl_malformed.xconf
deleted file mode 100644
index 8d0302fee..000000000
--- a/test/config/test_font_metricsurl_malformed.xconf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-  
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
-  
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-		<!-- this font has a malformed metrics-url -->
-        <font metrics-url="badprotocol:test/resources/fonts/ttf/glb12.ttf.xml">
-          <font-triplet name="Gladiator" style="normal" weight="normal"/>
-        </font>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
diff --git a/test/config/test_font_tripletattribute_missing.xconf b/test/config/test_font_tripletattribute_missing.xconf
deleted file mode 100644
index 5865e1784..000000000
--- a/test/config/test_font_tripletattribute_missing.xconf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
-  
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-        <font metrics-url="test/resources/fonts/ttf/glb12.ttf.xml">
-		  <!-- this font-triplet has a missing style attribute -->           
-          <font-triplet name="Gladiator" weight="normal"/>
-        </font>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
diff --git a/test/config/test_fontbase_bad.xconf b/test/config/test_fontbase_bad.xconf
deleted file mode 100644
index 535f51a9d..000000000
--- a/test/config/test_fontbase_bad.xconf
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./doesnotexist/</font-base>
-  
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-		<!-- this font is with a relative metrics-url
-		     so should call upon the bad font-base -->
-        <font metrics-url="test/resources/fonts/ttf/glb12.ttf.xml" embed-url="test/resources/fonts/ttf/glb12.ttf">
-          <font-triplet name="Gladiator" style="normal" weight="normal"/>
-        </font>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
diff --git a/test/config/test_fonts_autodetect.xconf b/test/config/test_fonts_autodetect.xconf
deleted file mode 100644
index 0bcbb101b..000000000
--- a/test/config/test_fonts_autodetect.xconf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
-  
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-      	<auto-detect/>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
diff --git a/test/config/test_fonts_directory_recursive.xconf b/test/config/test_fonts_directory_recursive.xconf
deleted file mode 100644
index 60a42b94a..000000000
--- a/test/config/test_fonts_directory_recursive.xconf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
-  
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-      	<directory recursive="true">test/resources/fonts</directory>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>
diff --git a/test/config/test_fonts_substitution.xconf b/test/config/test_fonts_substitution.xconf
deleted file mode 100644
index fea83dca5..000000000
--- a/test/config/test_fonts_substitution.xconf
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<fop version="1.0">
-  <!-- Strict configuration On -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Switch off font caching for the purposes of the unit test -->
-  <use-cache>false</use-cache>  
-
-  <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
-
-  <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
-  
-  <fonts>
-     <substitutions>
-        <substitution>
-           <from font-family="Times" font-style="italic"/>
-           <to font-family="Gladiator" font-style="normal" font-weight="bold"/>
-        </substitution>
-     </substitutions>
-  </fonts>
-
-  <renderers>
-    <renderer mime="application/pdf">
-      <fonts>
-        <font metrics-url="test/resources/fonts/ttf/glb12.ttf.xml" embed-url="test/resources/fonts/ttf/glb12.ttf">
-          <font-triplet name="Gladiator" style="normal" weight="bold"/>
-        </font>
-      </fonts>
-    </renderer>
-  </renderers>
-</fop>