You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2014/03/27 09:28:00 UTC
svn commit: r1582217 - in /tomcat/trunk:
java/org/apache/catalina/manager/host/ webapps/docs/
Author: kfujino
Date: Thu Mar 27 08:28:00 2014
New Revision: 1582217
URL: http://svn.apache.org/r1582217
Log:
Add Support for copyXML attribute of Host to Host Manager.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1582217&r1=1582216&r2=1582217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Thu Mar 27 08:28:00 2014
@@ -393,6 +393,11 @@ public final class HTMLHostManagerServle
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/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1582217&r1=1582216&r2=1582217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Thu Mar 27 08:28:00 2014
@@ -247,11 +247,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);
}
@@ -328,6 +330,7 @@ public class HostManagerServlet
boolean deployOnStartup,
boolean deployXML,
boolean unpackWARs,
+ boolean copyXML,
StringManager smClient) {
if (debug >= 1) {
log(sm.getString("hostManagerServlet.add", name));
@@ -414,6 +417,7 @@ public class HostManagerServlet
host.setDeployOnStartup(deployOnStartup);
host.setDeployXML(deployXML);
host.setUnpackWARs(unpackWARs);
+ host.setCopyXML(copyXML);
// Add new host
try {
Modified: tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=1582217&r1=1582216&r2=1582217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties Thu Mar 27 08:28:00 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/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1582217&r1=1582216&r2=1582217&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar 27 08:28:00 2014
@@ -61,6 +61,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>
<subsection name="Other">
<scode>
Review source code and take advantage of Java 7's
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org