You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/02/04 12:53:10 UTC

svn commit: r1728448 - in /tomcat/trunk: java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml webapps/docs/manager-howto.xml

Author: markt
Date: Thu Feb  4 11:53:10 2016
New Revision: 1728448

URL: http://svn.apache.org/viewvc?rev=1728448&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58935
Remove incorrect references in the documentation to using "jar:file:" URLs with the Manager application.

Modified:
    tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1728448&r1=1728447&r2=1728448&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Feb  4 11:53:10 2016
@@ -138,15 +138,6 @@ import org.apache.tomcat.util.res.String
  *     path of a directory that contains the unpacked version of a web
  *     application.  This directory will be attached to the context path you
  *     specify without any changes.</li>
- * <li><b>jar:file:/absolute/path/to/a/warfile.war!/</b> - You can specify a
- *     URL to a local web application archive file.  The syntax must conform to
- *     the rules specified by the <code>JarURLConnection</code> class for a
- *     reference to an entire JAR file.</li>
- * <li><b>jar:http://hostname:port/path/to/a/warfile.war!/</b> - You can specify
- *     a URL to a remote (HTTP-accessible) web application archive file.  The
- *     syntax must conform to the rules specified by the
- *     <code>JarURLConnection</code> class for a reference to an entire
- *     JAR file.</li>
  * </ul>
  * <p>
  * <b>NOTE</b> - Attempting to reload or remove the application containing

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1728448&r1=1728447&r2=1728448&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Feb  4 11:53:10 2016
@@ -70,6 +70,10 @@
         present, the directory will always be deleted and recreated by expanding
         the WAR if <code>unpackWARs</code> is <code>true</code>. (markt)
       </fix>
+      <fix>
+        <bug>58935</bug>: Remove incorrect references in the documentation to
+        using <code>jar:file:</code> URLs with the Manager application. (markt) 
+      </fix>
     </changelog>
   </subsection>
 </section>

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1728448&r1=1728447&r2=1728448&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Thu Feb  4 11:53:10 2016
@@ -278,10 +278,6 @@ the host and port appropriately for your
         path of a web application archive (WAR) file.  This is valid
         <strong>only</strong> for the <code>/deploy</code> command, and is
         the only acceptable format to that command.</li>
-    <li><strong>jar:file:/absolute/path/to/a/warfile.war!/</strong> - The
-        URL to a local web application archive (WAR) file.  You can use any
-        syntax that is valid for the <code>JarURLConnection</code> class
-        for reference to an entire JAR file.</li>
     <li><strong>file:/absolute/path/to/a/context.xml</strong> - The
         absolute path of a web application Context configuration ".xml"
         file which contains the Context configuration element.</li>
@@ -405,7 +401,7 @@ Tomcat server is deployed as the web app
 <code>/bar</code>. Notice that there is no <code>path</code> parameter
 so the context path defaults to the name of the web application archive
 file without the ".war" extension.</p>
-<source>http://localhost:8080/manager/text/deploy?war=jar:file:/path/to/bar.war!/</source>
+<source>http://localhost:8080/manager/text/deploy?war=file:/path/to/bar.war</source>
 
 </subsection>
 
@@ -458,7 +454,7 @@ configuration ".xml" file.</p>
 configuration ".xml" file and a web application ".war" file located
 on the server.</p>
 <source>http://localhost:8080/manager/text/deploy
- ?config=file:/path/context.xml&amp;war=jar:file:/path/bar.war!/</source>
+ ?config=file:/path/context.xml&amp;war=file:/path/bar.war</source>
 
 </subsection>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org