Author: kfujino Date: Thu Mar 27 08:31:33 2014 New Revision: 1582218 URL: http://svn.apache.org/r1582218 Log: Add Support for copyXML attribute of Host to Host Manager.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1582218&r1=1582217&r2=1582218&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Thu Mar 27 08:31:33 2014 @@ -393,7 +393,12 @@ public final class HTMLHostManagerServle args[1] = "manager"; args[2] = "checked"; writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args)); - + + args[0] = smClient.getString("htmlHostManagerServlet.addCopyXML"); + args[1] = "copyXML"; + args[2] = ""; + writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args)); + args = new Object[1]; args[0] = smClient.getString("htmlHostManagerServlet.addButton"); writer.print(MessageFormat.format(ADD_SECTION_END, args)); Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1582218&r1=1582217&r2=1582218&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Thu Mar 27 08:31:33 2014 @@ -265,11 +265,13 @@ public class HostManagerServlet boolean deployOnStartup = booleanParameter(request, "deployOnStartup", true, htmlMode); boolean deployXML = booleanParameter(request, "deployXML", true, htmlMode); boolean unpackWARs = booleanParameter(request, "unpackWARs", true, htmlMode); + boolean copyXML = booleanParameter(request, "copyXML", false, htmlMode); add(writer, name, aliases, appBase, manager, autoDeploy, deployOnStartup, deployXML, unpackWARs, + copyXML, smClient); } @@ -346,6 +348,7 @@ public class HostManagerServlet boolean deployOnStartup, boolean deployXML, boolean unpackWARs, + boolean copyXML, StringManager smClient) { if (debug >= 1) { log(sm.getString("hostManagerServlet.add", name)); @@ -449,6 +452,7 @@ public class HostManagerServlet host.setDeployOnStartup(deployOnStartup); host.setDeployXML(deployXML); host.setUnpackWARs(unpackWARs); + host.setCopyXML(copyXML); // Add new host try { Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=1582218&r1=1582217&r2=1582218&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties Thu Mar 27 08:31:33 2014 @@ -70,6 +70,7 @@ htmlHostManagerServlet.addAutoDeploy=Aut htmlHostManagerServlet.addDeployOnStartup=DeployOnStartup htmlHostManagerServlet.addDeployXML=DeployXML htmlHostManagerServlet.addUnpackWARs=UnpackWARs +htmlHostManagerServlet.addCopyXML=CopyXML htmlHostManagerServlet.addButton=Add htmlHostManagerServlet.serverTitle=Server Information htmlHostManagerServlet.serverVersion=Tomcat Version Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1582218&r1=1582217&r2=1582218&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 27 08:31:33 2014 @@ -68,6 +68,14 @@ </fix> </changelog> </subsection> + <subsection name="Web applications"> + <changelog> + <fix> + Add Support for <code>copyXML</code> attribute of Host to Host Manager. + (kfujino) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 7.0.53 (violetagg)"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org