incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1190094 - in /incubator/ambari/trunk/controller/src/main: resources/application-doc.xml webapps/wadl.xsl
Date Thu, 27 Oct 2011 23:49:27 GMT
Author: omalley
Date: Thu Oct 27 23:49:26 2011
New Revision: 1190094

URL: http://svn.apache.org/viewvc?rev=1190094&view=rev
Log:
AMBARI-111. Minor clean up of site documentation (omalley)

Modified:
    incubator/ambari/trunk/controller/src/main/resources/application-doc.xml
    incubator/ambari/trunk/controller/src/main/webapps/wadl.xsl

Modified: incubator/ambari/trunk/controller/src/main/resources/application-doc.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/resources/application-doc.xml?rev=1190094&r1=1190093&r2=1190094&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/resources/application-doc.xml (original)
+++ incubator/ambari/trunk/controller/src/main/resources/application-doc.xml Thu Oct 27 23:49:26
2011
@@ -22,9 +22,34 @@
 
 <doc xml:lang="en" title="Ambari REST API">
 
-This text is overridden in the wadl.xsl until we figure out how to make it
-work <b>right</b>.
-
+<p>
+   Ambari provides rich REST interfaces that allow the creation, 
+   modification, querying, and deletion of stacks and clusters. The
+   primary resources are: 
+   <ul>
+   <li><a href="index.html#Stacks">Stacks</a> - definition of which 
+       components should be deployed and how they should be 
+       <a href="index.html#Configuration">configured</a>.</li>
+   <li><a href="index.html#Clusters">Clusters</a> - combination a stack

+       and nodes to run Hadoop</li><li>Nodes - the machines managed by 
+       Ambari</li>
+   </ul>
+   Each is represented by a top level resource, which is a container,
+   and nested resources for each instance.
+</p><br/>
+<p>
+   The resources and the entities that are passed to them are defined
+   using JAXB and are represented in either XML or JSON formats
+   depending on the ContentType and Accept HTTP headers. The definition
+   of the types is given in the <a
+   href="apidocs/org/apache/ambari/common/rest/entities/package-summary.html">
+   JavaDoc</a>.
+</p><br/>
+<p>
+   Typical usage would be to create a new stack derived from a pre-defined
+   one and change the neccessary configuration parameters. Then create a
+   cluster based on the stack by assigning nodes and marking it active.
+</p>
 </doc>
 
 </applicationDocs>

Modified: incubator/ambari/trunk/controller/src/main/webapps/wadl.xsl
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/webapps/wadl.xsl?rev=1190094&r1=1190093&r2=1190094&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/webapps/wadl.xsl (original)
+++ incubator/ambari/trunk/controller/src/main/webapps/wadl.xsl Thu Oct 27 23:49:26 2011
@@ -375,36 +375,6 @@
                 </xsl:variable>
                 <a href="{$url}"><xsl:value-of select="$url"/></a>
             </xsl:when>
-            <xsl:when test="@title = 'Ambari REST API'">
-<p>
-   Ambari provides rich REST interfaces that allow the creation, 
-   modification, querying, and deletion of stacks and clusters. The
-   primary resources are: 
-   <ul>
-   <li><a href="index.html#Stacks">Stacks</a> - definition of which 
-       components should be deployed and how they should be 
-       <a href="index.html#Configuration">configured</a>.</li>
-   <li><a href="index.html#Clusters">Clusters</a> - combination a stack

-       and nodes to run Hadoop</li><li>Nodes - the machines managed by 
-       Ambari</li>
-   </ul>
-   Each is represented by a top level resource, which is a container,
-   and nested resources for each instance.
-</p><br/>
-<p>
-   The resources and the entities that are passed to them are defined
-   using JAXB and are represented in either XML or JSON formats
-   depending on the ContentType and Accept HTTP headers. The definition
-   of the types is given in the <a
-   href="apidocs/org/apache/ambari/common/rest/entities/package-summary.html">
-   JavaDoc</a>.
-</p><br/>
-<p>
-   Typical usage would be to create a new stack derived from a pre-defined
-   one and change the neccessary configuration parameters. Then create a
-   cluster based on the stack by assigning nodes and marking it active.
-</p>
-            </xsl:when>
             <xsl:otherwise>
                <xsl:apply-templates select="node()" mode="copy"/>
             </xsl:otherwise>
@@ -412,6 +382,22 @@
     </xsl:for-each>
 </xsl:template>
 
+<xsl:template match="b" mode="copy">
+  <b><xsl:apply-templates select="node()" mode="copy"/></b>
+</xsl:template>
+
+<xsl:template match="p" mode="copy">
+  <p><xsl:apply-templates select="node()" mode="copy"/></p>
+</xsl:template>
+
+<xsl:template match="ul" mode="copy">
+  <ul><xsl:apply-templates select="node()" mode="copy"/></ul>
+</xsl:template>
+
+<xsl:template match="li" mode="copy">
+  <li><xsl:apply-templates select="node()" mode="copy"/></li>
+</xsl:template>
+
 <xsl:template match="html:*" mode="copy">
     <!-- remove the prefix on HTML elements -->
     <xsl:element name="{local-name()}">



Mime
View raw message