Author: kkolinko
Date: Sat Mar 16 06:16:58 2013
New Revision: 1457208
URL: http://svn.apache.org/r1457208
Log:
CTR: docs
Wrap long lines, to reduce horizontal scrolling.
Replace tabs with spaces in sample Ant buildfile fragment.
Inspired by r1456706
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1457208&r1=1457207&r2=1457208&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Sat Mar 16 06:16:58 2013
@@ -419,7 +419,8 @@ http://localhost:8080/manager/deploy?con
configuration ".xml" file and a web application ".war" file located
on the server.</p>
<source>
-http://localhost:8080/manager/deploy?config=file:/path/context.xml&war=jar:file:/path/bar.war!/
+http://localhost:8080/manager/deploy
+ ?config=file:/path/context.xml&war=jar:file:/path/bar.war!/
</source>
@@ -1165,69 +1166,69 @@ can be used:
<table border="1">
<tr><td><pre>
- <target name="manager.deploy"
- depends="context.status"
- if="context.notInstalled">
- <deploy url="${mgr.url}"
- username="${mgr.username}"
- password="${mgr.password}"
- path="${mgr.context.path}"
- config="${mgr.context.descriptor}"/>
- </target>
-
- <target name="manager.deploy.war"
- depends="context.status"
- if="context.deployable">
- <deploy url="${mgr.url}"
- username="${mgr.username}"
- password="${mgr.password}"
- update="${mgr.update}"
- path="${mgr.context.path}"
- war="${mgr.war.file}"/>
- </target>
-
- <target name="context.status">
- <property name="running"
value="${mgr.context.path}:running"/>
- <property name="stopped"
value="${mgr.context.path}:stopped"/>
-
- <list url="${mgr.url}"
- outputproperty="ctx.status"
- username="${mgr.username}"
- password="${mgr.password}">
- </list>
-
- <condition property="context.running">
- <contains string="${ctx.status}"
substring="${running}"/>
- </condition>
- <condition property="context.stopped">
- <contains string="${ctx.status}"
substring="${stopped}"/>
- </condition>
- <condition property="context.notInstalled">
- <and>
- <isfalse value="${context.running}"/>
- <isfalse value="${context.stopped}"/>
- </and>
- </condition>
- <condition property="context.deployable">
- <or>
- <istrue value="${context.notInstalled}"/>
- <and>
- <istrue
value="${context.running}"/>
- <istrue value="${mgr.update}"/>
- </and>
- <and>
- <istrue
value="${context.stopped}"/>
- <istrue value="${mgr.update}"/>
- </and>
- </or>
- </condition>
- <condition property="context.undeployable">
- <or>
- <istrue value="${context.running}"/>
- <istrue value="${context.stopped}"/>
- </or>
- </condition>
- </target>
+ <target name="manager.deploy"
+ depends="context.status"
+ if="context.notInstalled">
+ <deploy url="${mgr.url}"
+ username="${mgr.username}"
+ password="${mgr.password}"
+ path="${mgr.context.path}"
+ config="${mgr.context.descriptor}"/>
+ </target>
+
+ <target name="manager.deploy.war"
+ depends="context.status"
+ if="context.deployable">
+ <deploy url="${mgr.url}"
+ username="${mgr.username}"
+ password="${mgr.password}"
+ update="${mgr.update}"
+ path="${mgr.context.path}"
+ war="${mgr.war.file}"/>
+ </target>
+
+ <target name="context.status">
+ <property name="running" value="${mgr.context.path}:running"/>
+ <property name="stopped" value="${mgr.context.path}:stopped"/>
+
+ <list url="${mgr.url}"
+ outputproperty="ctx.status"
+ username="${mgr.username}"
+ password="${mgr.password}">
+ </list>
+
+ <condition property="context.running">
+ <contains string="${ctx.status}" substring="${running}"/>
+ </condition>
+ <condition property="context.stopped">
+ <contains string="${ctx.status}" substring="${stopped}"/>
+ </condition>
+ <condition property="context.notInstalled">
+ <and>
+ <isfalse value="${context.running}"/>
+ <isfalse value="${context.stopped}"/>
+ </and>
+ </condition>
+ <condition property="context.deployable">
+ <or>
+ <istrue value="${context.notInstalled}"/>
+ <and>
+ <istrue value="${context.running}"/>
+ <istrue value="${mgr.update}"/>
+ </and>
+ <and>
+ <istrue value="${context.stopped}"/>
+ <istrue value="${mgr.update}"/>
+ </and>
+ </or>
+ </condition>
+ <condition property="context.undeployable">
+ <or>
+ <istrue value="${context.running}"/>
+ <istrue value="${context.stopped}"/>
+ </or>
+ </condition>
+ </target>
</pre></td></tr>
</table>
@@ -1311,7 +1312,8 @@ http://webserver/manager/jmxproxy/?set=B
<code>ErrorReportValve</code>. The following will set debugging to 10.
<source>
http://localhost:8080/manager/jmxproxy/
-?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost&att=debug&val=10
+ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost
+ &att=debug&val=10
</source>
and my result is (YMMV):
<source>
@@ -1319,14 +1321,15 @@ Result: ok
</source>
Here is what I see if I pass in a bad value. Here is the URL I used,
- I try set debugging equal to 'cowbell':
+ I try set debugging equal to 'cow':
<source>
http://localhost:8080/manager/jmxproxy/
-?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost&att=debug&val=cowbell
+ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhost
+ &att=debug&val=cow
</source>
When I try that, my result is
<source>
-Error: java.lang.NumberFormatException: For input string: "cowbell"
+Error: java.lang.NumberFormatException: For input string: "cow"
</source>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
