ASF Bugzilla – Attachment 29197 Details for
Bug 53653
Allow for wrapped source code example in config/context.html
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated patch in a single file with proper paths
53653.diff (text/plain), 3.58 KB, created by
Christopher Schultz
on 2012-08-09 17:35:41 UTC
(
hide
)
Description:
Updated patch in a single file with proper paths
Filename:
MIME Type:
Creator:
Christopher Schultz
Created:
2012-08-09 17:35:41 UTC
Size:
3.58 KB
patch
obsolete
>Index: webapps/docs/config/context.xml >--- webapps/docs/config/context.xml 2012-08-04 14:32:24.000000000 -0500 >+++ webapps/docs/config/context.xml 2012-08-05 00:13:17.000000000 -0500 >@@ -1339,18 +1339,25 @@ > classes/ > </source> > <p>The configuration is:</p> >-<source> >+ >+<source wrapped="true"> > <Context path="/mywebapp" docBase="/Users/theuser/mywebapp/src/main/webapp" > >+<indent> > <Resources className="org.apache.naming.resources.VirtualDirContext" >- extraResourcePaths= >- "/WEB-INF/classes=/Users/theuser/mywebapp/target/classes,/pictures=/Users/theuser/mypictures,/movies=/Users/theuser/mymovies" /> >+ <indent><outdent>extraResourcePaths="/WEB-INF/classes=/Users/theuser/mywebapp/target/classes,/pictures=/Users/theuser/mypictures,/movies=/Users/theuser/mymovies"</outdent></indent> >+ <indent>/></indent> >+</indent> >+<indent> > <Loader className="org.apache.catalina.loader.VirtualWebappLoader" >- virtualClasspath="/Users/theuser/mywebapp/target/classes; >- /Users/theuser/mylib/target/classes; >- /Users/theuser/.m2/repository/log4j/log4j/1.2.15/log4j-1.2.15.jar" /> >+ <indent><outdent>virtualClasspath="/Users/theuser/mywebapp/target/classes;/Users/theuser/mylib/target/classes;/Users/theuser/.m2/repository/log4j/log4j/1.2.15/log4j-1.2.15.jar"</outdent></indent> >+ <indent>/></indent> >+</indent> >+<indent> > <JarScanner scanAllDirectories="true" /> >+</indent> > </Context> > </source> >+ > <p>Note that resources in mylib/target/classes/META-INF/resources/ are mapped to / as > required by servlet 3 specification.</p> > </subsection> > >Index: webapps/docs/tomcat-docs.xsl >--- webapps/docs/tomcat-docs.xsl 2012-08-04 14:32:35.000000000 -0500 >+++ webapps/docs/tomcat-docs.xsl 2012-08-05 00:30:51.000000000 -0500 >@@ -87,6 +87,11 @@ > code {background-color:rgb(224,255,255);padding:0 0.1em;} > code.attributeName, code.propertyName {background-color:transparent;} > </style> >+ <style type="text/css"> >+ .wrapped-source code { display: block; background-color: transparent; } >+ .wrapped-source div { margin: 0 0 0 1.25em; } >+ .wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; } >+ </style> > </head> > > <body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}" >@@ -326,9 +331,22 @@ > <td bgcolor="{$source-color}" width="1"> > <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/> > </td> >+ <xsl:choose> >+ <xsl:when test="@wrapped='true'"> >+ <td bgcolor="#ffffff" height="1"> >+ <div class="wrapped-source"> >+ <code> >+ <xsl:apply-templates /> >+ </code> >+ </div> >+ </td> >+ </xsl:when> >+ <xsl:otherwise> > <td bgcolor="#ffffff" height="1"><pre> > <xsl:value-of select="."/> > </pre></td> >+ </xsl:otherwise> >+ </xsl:choose> > <td bgcolor="{$source-color}" width="1"> > <img src="{$void}" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/> > </td> >@@ -349,6 +367,18 @@ > </xsl:template> > > >+ <!-- Process a wrapped source code example - indent --> >+ <xsl:template match="source//indent"> >+ <div><xsl:apply-templates /></div> >+ </xsl:template> >+ >+ >+ <!-- Process a wrapped source code example - outdent --> >+ <xsl:template match="source//outdent"> >+ <p><xsl:apply-templates /></p> >+ </xsl:template> >+ >+ > <!-- Process an attributes list with nested attribute elements --> > <xsl:template match="attributes"> > <table border="1" cellpadding="5">
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 53653
:
29164
| 29197