svn commit: r1152149 - in /db/derby/docs/trunk: build.xml lib/dita2htmlImpl.xsl lib/map2htmtoc.xsl

[ka...@apache.org]

Author: kahatlen
Date: Fri Jul 29 09:21:24 2011
New Revision: 1152149

URL: http://svn.apache.org/viewvc?rev=1152149&view=rev
Log:
DERBY-5354: Remove unnecessary dita.regex build target

Removed unnecessary rewriting of DITA toolkit and reverted the changes
in two files copied from the DITA toolkit.

Modified:
    db/derby/docs/trunk/build.xml
    db/derby/docs/trunk/lib/dita2htmlImpl.xsl
    db/derby/docs/trunk/lib/map2htmtoc.xsl

Modified: db/derby/docs/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/build.xml?rev=1152149&r1=1152148&r2=1152149&view=diff
==============================================================================
--- db/derby/docs/trunk/build.xml (original)
+++ db/derby/docs/trunk/build.xml Fri Jul 29 09:21:24 2011
@@ -40,7 +40,7 @@ limitations under the License.
 
   <target name="html" depends="init,html.getstart,html.tools,html.devguide,html.adminguide,html.ref,html.tuning"/>
 
-  <target name="init" depends="check.dita,unpack.dita,check.regex.done,dita.regex">
+  <target name="init" depends="check.dita,unpack.dita">
     <available classname="org.apache.fop.tools.anttasks.Fop"
                property="hasFOP"/>
     <copy todir="${basedir}/src/dtd">
@@ -154,17 +154,6 @@ limitations under the License.
     </move>
   </target>
 
-  <target name="check.regex.done">
-    <available file="${dita.script.dir}/regex.done" property="regex.done"/>
-  </target>
-
-  <target name="dita.regex" unless="regex.done">
-    <replaceregexp match="select=&quot;'.xml'&quot;" replace="select=&quot;'.dita'&quot;">
-      <fileset dir="${dita.script.dir}" includes="**/*.xsl"/>
-    </replaceregexp>
-    <touch file="${dita.script.dir}/regex.done"/>
-  </target>
-
   <target name="pdf" depends="init,pdf.getstart,pdf.tools,pdf.devguide,pdf.adminguide,pdf.ref,pdf.tuning"/>
 
   <target name="pdf.getstart" depends="init">

Modified: db/derby/docs/trunk/lib/dita2htmlImpl.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/dita2htmlImpl.xsl?rev=1152149&r1=1152148&r2=1152149&view=diff
==============================================================================
--- db/derby/docs/trunk/lib/dita2htmlImpl.xsl (original)
+++ db/derby/docs/trunk/lib/dita2htmlImpl.xsl Fri Jul 29 09:21:24 2011
@@ -99,7 +99,7 @@
 <xsl:param name="DBG" select="'no'"/> <!-- "no" and "yes" are valid values; non-'yes' is ignored -->
 
 <!-- DITAEXT file extension name of dita topic file -->
-<xsl:param name="DITAEXT" select="'.dita'"/>
+<xsl:param name="DITAEXT" select="'.xml'"/>
 
 <!-- =========== "GLOBAL" DECLARATIONS (see 35) =========== -->
 

Modified: db/derby/docs/trunk/lib/map2htmtoc.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/map2htmtoc.xsl?rev=1152149&r1=1152148&r2=1152149&view=diff
==============================================================================
--- db/derby/docs/trunk/lib/map2htmtoc.xsl (original)
+++ db/derby/docs/trunk/lib/map2htmtoc.xsl Fri Jul 29 09:21:24 2011
@@ -38,7 +38,7 @@
 <!-- *************************** Command line parameters *********************** -->
 <xsl:param name="OUTEXT" select="'.html'"/><!-- "htm" and "html" are valid values -->
 <xsl:param name="WORKDIR" select="'./'"/>
-<xsl:param name="DITAEXT" select="'.dita'"/>
+<xsl:param name="DITAEXT" select="'.xml'"/>
 <xsl:param name="FILEREF" select="'file://'"/>
 <xsl:param name="contenttarget" select="'contentwin'"/>