From f14818622606003d5a11baa4135590afa6f15a24 Mon Sep 17 00:00:00 2001
From: David Cramer <david.cramer@rackspace.com>
Date: Fri, 27 Jun 2014 13:10:06 -0500
Subject: [PATCH] Use refactored process-embeded-wadl code for api-ref page

The xslt that pulls wadl content into a DocBook document
failed to pull in template parameters. This code had
already been completely refactored for the webhelp and
pdf pipelines. The api-ref pipeline now uses this same
(much cleaner) refactored code.

Change-Id: Ie5b064fe5ed361313571fd1487917eb269bcf600
Closes-Bug: #1327403
---
 .../apipage/process-embedded-wadl-apipage.xsl | 109 ------------------
 src/main/resources/wadl2html.xpl              |  39 ++++---
 2 files changed, 26 insertions(+), 122 deletions(-)
 delete mode 100644 src/main/resources/cloud/apipage/process-embedded-wadl-apipage.xsl

diff --git a/src/main/resources/cloud/apipage/process-embedded-wadl-apipage.xsl b/src/main/resources/cloud/apipage/process-embedded-wadl-apipage.xsl
deleted file mode 100644
index fec86ee..0000000
--- a/src/main/resources/cloud/apipage/process-embedded-wadl-apipage.xsl
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:wadl="http://wadl.dev.java.net/2009/02"
-    xmlns:rax="http://docs.rackspace.com/api"
-    xmlns:d="http://docbook.org/ns/docbook"
-    exclude-result-prefixes="xs d wadl rax" version="2.0">
-
-    <xsl:template match="node() | @*">
-        <xsl:copy>
-            <xsl:apply-templates select="node() | @*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="d:dummy"/>
-
-    <xsl:param name="compute.wadl.path.from.docbook.path">0</xsl:param>
-
-    <xsl:param name="project.build.directory"/>
-
-    <xsl:template match="wadl:resources[@href]">
-        <xsl:variable name="wadl.path">
-            <xsl:call-template name="wadlPath">
-                <xsl:with-param name="path" select="@href"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:apply-templates select="document($wadl.path)//wadl:resource"/>
-    </xsl:template>
-
-    <xsl:template match="wadl:resources">
-        <xsl:apply-templates/>
-    </xsl:template>
-
-    <xsl:template match="wadl:resource[@href]"> <!-- and not(./wadl:method) -->
-        <xsl:variable name="wadl.path">
-            <xsl:call-template name="wadlPath">
-                <xsl:with-param name="path" select="@href"/>
-            </xsl:call-template>
-        </xsl:variable>
-        <xsl:copy>
-            <xsl:apply-templates select="document($wadl.path)//wadl:resource[@id = substring-after(current()/@href,'#')]/@*"/>
-            <xsl:choose>
-                <xsl:when test="not(./wadl:method)">
-                    <xsl:apply-templates
-                        select="document($wadl.path)//wadl:resource[@id = substring-after(current()/@href,'#')]/wadl:method">
-                        <xsl:with-param name="resourceLink" select="."/>
-                    </xsl:apply-templates>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:apply-templates select="wadl:method">
-                        <xsl:with-param name="wadl.path" select="$wadl.path"/>
-                    </xsl:apply-templates>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="wadl:method[@href]">
-        <xsl:param name="wadl.path"/>
-        <xsl:param name="resourceid" select="substring-after(parent::wadl:resource/@href,'#')"/>
-        <xsl:apply-templates
-            select="document($wadl.path)//wadl:resource[@id = $resourceid]/wadl:method[@rax:id = substring-after(current()/@href,'#')]">
-            <xsl:with-param name="resourceLink" select="."/>
-        </xsl:apply-templates>
-    </xsl:template>
-
-
-    <xsl:template name="wadlPath">
-        <xsl:param name="path"/>
-        <xsl:choose>
-            <xsl:when test="contains($path,'#')">
-                <xsl:call-template name="wadlPath">
-                    <xsl:with-param name="path"
-                        select="substring-before($path,'#')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when
-                test="$compute.wadl.path.from.docbook.path = '0' and contains($path,'\')">
-                <xsl:call-template name="wadlPath">
-                    <xsl:with-param name="path"
-                        select="substring-after($path,'\')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when
-                test="$compute.wadl.path.from.docbook.path = '0' and contains($path,'/')">
-                <xsl:call-template name="wadlPath">
-                    <xsl:with-param name="path"
-                        select="substring-after($path,'/')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when
-                test="$compute.wadl.path.from.docbook.path = '0'">
-                <xsl:value-of
-                    select="concat($project.build.directory, '/generated-resources/xml/xslt/', $path)"
-                />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:message terminate="yes"> ERROR:
-                    compute.wadl.path.from.docbook.path=1 not yet
-                    supported </xsl:message>
-                <!--                <xsl:value-of
-                  select="concat('target/generated-resources/xml/xslt',$docbook.partial.path, $path)"
-                />-->
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-</xsl:stylesheet>
diff --git a/src/main/resources/wadl2html.xpl b/src/main/resources/wadl2html.xpl
index aaf277d..558d479 100644
--- a/src/main/resources/wadl2html.xpl
+++ b/src/main/resources/wadl2html.xpl
@@ -30,22 +30,35 @@
   </l:validate-transform>
   
   <l:normalize-wadls name="normalize"/>
-      
-  <p:xslt name="process-embedded-wadl">
-    <p:input port="source"> 
-      <p:pipe step="normalize" port="result"/> 
-    </p:input> 
-    <p:input port="stylesheet">
-      <p:document href="classpath:///cloud/apipage/process-embedded-wadl-apipage.xsl"/>
-    </p:input>
-    <p:input port="parameters" >
-      <p:pipe step="main" port="parameters"/>
-    </p:input>
-  </p:xslt>
+    
+    <p:xslt name="process-embedded-wadl-xslt-1">
+      <p:input port="source"> 
+        <p:pipe step="normalize" port="result"/> 
+      </p:input> 
+      <p:input port="stylesheet">
+        <p:document href="classpath:///cloud/process-embedded-wadl-1.xsl"/>
+      </p:input>
+      <p:input port="parameters" >
+        <p:pipe step="main" port="parameters"/>
+      </p:input>
+    </p:xslt>          
+    
+    <p:xslt name="process-embedded-wadl-xslt-2">
+      <p:input port="source"> 
+        <p:pipe step="process-embedded-wadl-xslt-1" port="result"/> 
+      </p:input> 
+      <p:input port="stylesheet">
+        <p:document href="classpath:///cloud/process-embedded-wadl-2.xsl"/>
+      </p:input>
+      <p:input port="parameters" >
+        <p:pipe step="main" port="parameters"/>
+      </p:input>
+    </p:xslt>
+    
   
   <p:xslt name="docbook2apipage">
     <p:input port="source"> 
-      <p:pipe step="process-embedded-wadl" port="result"/> 
+      <p:pipe step="process-embedded-wadl-xslt-2" port="result"/> 
     </p:input> 
     <p:input port="stylesheet">
       <p:document href="classpath:///cloud/apipage/apipage-main.xsl"/>