Change xml and json files that contain only text to *.txt files

Otherwise, this book fails the new validation gates

Closes-Bug: #1270267

Change-Id: Ibbe16c8e4db64abb29c66c3b1a14cb90014d56a3
author: diane fleming

apidocs/includewars.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <assembly>
   <id>includewars</id>
   <formats>
@@ -12,4 +13,4 @@
       </includes>
     </fileSet>
   </fileSets>
-</assembly>
+</assembly>

apidocs/pom.xml

@@ -37,7 +37,7 @@
 	    <phase>generate-sources</phase>
 	    <configuration>
 	      <security>reviewer</security>
-	      <sourceDirectory>src/resources</sourceDirectory>
+	      <sourceDirectory>src</sourceDirectory>
 	      <highlightSource>false</highlightSource>
 	      <trimWadlUriCount>2</trimWadlUriCount>
 	      <!-- this is the public-facing client developer guide formerly known as PublicAPISpec.xml -->
@@ -91,27 +91,27 @@
 		  <configuration>
 		    <target>
 		      <copy todir="${project.build.directory}/generated-resources/normalized/api/v1.0">
-			<fileset dir="src/resources">
+			<fileset dir="src">
 			  <include name="xslts/**"/>
 			</fileset>
-			<fileset dir="src/resources">
+			<fileset dir="src">
 			  <include name="samples/**"/>
 			</fileset>
 		      </copy>
-		      <copy file="../xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/xsd/cdb.xsd"/>
-		      <copy file="../xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.xsd"/>
-		      <copy file="src/resources/bookinfo.xml" tofile="${project.build.directory}/generated-resources/normalized/bookinfo.xml"/>
+		      <copy file="src/xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/xsd/cdb.xsd"/>
+		      <copy file="src/xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.xsd"/>
+		      <copy file="src/bookinfo.xml" tofile="${project.build.directory}/generated-resources/normalized/bookinfo.xml"/>
 		      <java
 			  jar="${net.sourceforge.saxon:saxon:jar}"
 			  fork="true">
 			<arg value="-u"/>
-			<arg value="-s:../xsd/dbaas.wadl"/>
+			<arg value="-s:src/xsd/dbaas.wadl"/>
 			<arg value="-xsl:${project.build.directory}/generated-resources/xsl/normalizeWadl.xsl"/>
 			<arg value="-o:${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"/>
 			<arg value="flattenXsds=false"/>
 		      </java>
 		      <replaceregexp file="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"
-				     match="file:/.*/xsd/dbaas.xsd"
+				     match="file:/.*/src/xsd/dbaas.xsd"
 				     replace="xsd/cdb.xsd"/>
 		      <war destfile="${project.build.directory}/docbkx/webhelp/cdb-wadls.war" needxmlfile="false">
 			<fileset dir="${project.build.directory}/generated-resources/normalized"/>			

apidocs/src/cdb-devguide.xml

@@ -423,7 +423,7 @@
                 <title>List Instances Paged Request: XML</title>
                 <?dbfo keep-together="always"?>
                 <programlisting language="xml">
-<xi:include href="samples/db-instances-index-pagination-request.xml" parse="text"/>
+<xi:include href="samples/db-instances-index-pagination-request-xml.txt" parse="text"/>
                     </programlisting>
             </example>
             <example>
@@ -755,10 +755,10 @@
             <para>This section describes the versions that are
                 supported for the Cloud Databases API.</para>
             <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#versions">
+                <wadl:resource href="xsd/dbaas.wadl#versions">
                     <wadl:method href="getVersions"/>
                 </wadl:resource>
-                <wadl:resource href="../../../xsd/dbaas.wadl#version">
+                <wadl:resource href="xsd/dbaas.wadl#version">
                     <wadl:method href="getVersionInfo" />
                 </wadl:resource>
             </wadl:resources>
@@ -769,16 +769,16 @@
             <title>Database Instances</title>
             <para>This section describes the operations that are supported for database instances.</para>
             <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#instances" >
+                <wadl:resource href="xsd/dbaas.wadl#instances" >
                     <wadl:method href="createInstance"/>
                     <wadl:method href="getInstance"/>
                 </wadl:resource>
 
-                <wadl:resource href="../../../xsd/dbaas.wadl#instanceId">
+                <wadl:resource href="xsd/dbaas.wadl#instanceId">
                     <wadl:method href="getInstanceById"/>
                     <wadl:method href="deleteInstance"/>
                 </wadl:resource>
-                <wadl:resource href="../../../xsd/dbaas.wadl#root">
+                <wadl:resource href="xsd/dbaas.wadl#root">
                     <wadl:method href="createRoot"/>
                     <wadl:method href="isRootEnabled"/>
                 </wadl:resource>
@@ -789,7 +789,7 @@
             <title>Database Instance Actions</title>
             <para>This section describes the actions that are supported for database instances.</para>
             <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#instanceAction" >
+                <wadl:resource href="xsd/dbaas.wadl#instanceAction" >
                     <wadl:method href="restartInstance"/>
                     <wadl:method href="resizeInstance"/>
                     <wadl:method href="resizeVolume"/>
@@ -803,11 +803,11 @@
                 supported for databases.</para>
             <wadl:resources
                 xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#databases">
+                <wadl:resource href="xsd/dbaas.wadl#databases">
                     <wadl:method href="createDatabase"/>
                     <wadl:method href="getDatabases"/>
                 </wadl:resource>
-                <wadl:resource href="../../../xsd/dbaas.wadl#databaseName">
+                <wadl:resource href="xsd/dbaas.wadl#databaseName">
                     <wadl:method href="deleteDatabase"/>
                 </wadl:resource>
             </wadl:resources>
@@ -840,20 +840,20 @@
             </warning>
             <wadl:resources
                 xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#users">
+                <wadl:resource href="xsd/dbaas.wadl#users">
                     <wadl:method href="createUser"/>
                     <wadl:method href="getUsers"/>
                     <wadl:method href="changePass"/>
                 </wadl:resource>
-                <wadl:resource href="../../../xsd/dbaas.wadl#userId">
+                <wadl:resource href="xsd/dbaas.wadl#userId">
                     <wadl:method href="listUser"/>
                     <wadl:method href="deleteUser"/>
                     <wadl:resource
-                        href="../../../xsd/dbaas.wadl#database">
+                        href="xsd/dbaas.wadl#database">
                         <wadl:method href="getUserAccess"/>
                         <wadl:method href="grantUserAccess"/>
                         <wadl:resource
-                            href="../../../xsd/dbaas.wadl#dbName">
+                            href="xsd/dbaas.wadl#dbName">
                             <wadl:method href="revokeUserAccess"/>
                         </wadl:resource>
                     </wadl:resource>
@@ -867,11 +867,11 @@
                 supported for flavors.</para>
             <wadl:resources
                 xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#flavors">
+                <wadl:resource href="xsd/dbaas.wadl#flavors">
                     <wadl:method href="getFlavors"/>
                 </wadl:resource>
 
-                <wadl:resource href="../../../xsd/dbaas.wadl#flavorId">
+                <wadl:resource href="xsd/dbaas.wadl#flavorId">
                     <wadl:method href="getFlavorById"/>
                 </wadl:resource>
             </wadl:resources>