cvs commit: jakarta-tomcat-catalina/webapps/admin/host host.jsp
amyroh 2003/08/24 15:52:46 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host AddHostAction.java EditHostAction.java HostForm.java SaveHostAction.java webapps/admin/host host.jsp Log: Update the host properties in admin. - liveDeploy - autoDeploy: dynamic deployement of webapps put in the host appBase - autoDeploy - deployOnStartup: Deploy webapps from appBase on startup Revision ChangesPath 1.15 +1 -1 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ApplicationResources_en.properties13 May 2003 08:33:14 - 1.14 +++ ApplicationResources_en.properties24 Aug 2003 22:52:45 - 1.15 @@ -133,7 +133,7 @@ host.base=Application Base host.autoDeploy=Auto Deploy host.deployXML=Deploy XML -host.liveDeploy=Live Deploy +host.deployOnStartup=Deploy On Startup host.wars=Unpack WARs host.aliases=Aliases host.alias.name=Alias Name 1.14 +1 -1 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties Index: ApplicationResources_es.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ApplicationResources_es.properties13 May 2003 08:33:14 - 1.13 +++ ApplicationResources_es.properties24 Aug 2003 22:52:45 - 1.14 @@ -133,7 +133,7 @@ host.base=Base De la Aplicacion host.autoDeploy=El Automóvil Despliega host.deployXML=Despliegue XML -host.liveDeploy=Vivo Despliegue +host.deployOnStartup=Despliegue En Arranque host.wars=Desempaquetar WARs host.aliases=Aliases host.alias.name=Alias Nombre 1.7 +5 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java Index: AddHostAction.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AddHostAction.java24 Apr 2003 07:56:33 - 1.6 +++ AddHostAction.java24 Aug 2003 22:52:45 - 1.7 @@ -137,7 +137,7 @@ hostFm.setAppBase(); hostFm.setAutoDeploy(true); hostFm.setDeployXML(true); -hostFm.setLiveDeploy(true); +hostFm.setDeployOnStartup(true); hostFm.setUnpackWARs(true); hostFm.setXmlNamespaceAware(false); hostFm.setXmlValidation(false); 1.6 +6 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java Index: EditHostAction.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- EditHostAction.java 18 Mar 2003 10:48:22 - 1.5 +++ EditHostAction.java 24 Aug 2003 22:52:45 - 1.6 @@ -209,8 +209,8 @@ attribute = deployXML; hostFm.setDeployXML (((Boolean) mBServer.getAttribute(hname, attribute)).toString()); -attribute = liveDeploy; -hostFm.setLiveDeploy +attribute = deployOnStartup; +hostFm.setDeployOnStartup (((Boolean) mBServer.getAttribute(hname, attribute)).toString()); attribute = unpackWARs; hostFm.setUnpackWARs 1.8 +15 -15 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java Index: HostForm.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 ---
cvs commit: jakarta-tomcat-catalina/webapps/admin/host host.jsp hosts.jsp
amyroh 2003/02/03 15:16:52
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
DeleteHostAction.java EditHostAction.java
webapps/admin/host host.jsp hosts.jsp
Log:
Port change.
Revision ChangesPath
1.3 +34 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Index: Lists.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Lists.java16 Sep 2002 04:46:18 - 1.2
+++ Lists.java3 Feb 2003 23:16:52 - 1.3
@@ -696,4 +696,34 @@
}
+/**
+ * Return the codeHost/code object name string
+ * that the admin app belongs to.
+ *
+ * @param mbserver MBeanServer from which to retrieve the list
+ * @param request Http request
+ *
+ * @exception Exception if thrown while retrieving the list
+ */
+public static String getAdminAppHost
+(MBeanServer mbserver, String domain, HttpServletRequest request)
+throws Exception {
+
+// Get the admin app's host name
+StringBuffer sb = new StringBuffer(domain);
+sb.append(:type=Context);
+sb.append(,path=);
+sb.append(request.getContextPath());
+sb.append(,*);
+ObjectName search = new ObjectName(sb.toString());
+Iterator names = mbserver.queryNames(search, null).iterator();
+String host = null;
+while (names.hasNext()) {
+host = ((ObjectName)names.next()).getKeyProperty(host);
+}
+return host;
+
+}
+
+
}
1.2 +21 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java
Index: DeleteHostAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteHostAction.java 18 Jul 2002 16:48:25 - 1.1
+++ DeleteHostAction.java 3 Feb 2003 23:16:52 - 1.2
@@ -90,6 +90,7 @@
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
+import org.apache.webapp.admin.Lists;
import org.apache.webapp.admin.TomcatTreeBuilder;
/**
@@ -153,6 +154,22 @@
(Cannot acquire MBeanServer reference, t);
}
+String adminHost = null;
+// Get the host name the admin app runs on
+// this host cannot be deleted from the admin tool
+try {
+adminHost = Lists.getAdminAppHost(
+ mBServer, Catalina ,request);
+} catch (Exception e) {
+String message =
+resources.getMessage(error.hostName.bad,
+adminHost);
+getServlet().log(message);
+response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
+return (null);
+}
+request.setAttribute(adminAppHost, adminHost);
+
String serviceName = request.getParameter(serviceName);
// Set up a form bean containing the currently selected
// objects to be deleted
1.4 +20 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
Index: EditHostAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EditHostAction.java 16 Sep 2002 04:46:18 - 1.3
+++ EditHostAction.java 3 Feb 2003 23:16:52 - 1.4
@@ -147,6 +147,22 @@
(Cannot acquire MBeanServer reference, t);
}
+String adminHost = null;
+// Get the host name the admin app runs on
+// this host cannot be deleted from the admin tool
+try {
+adminHost = Lists.getAdminAppHost(
+ mBServer, Catalina ,request);
+} catch (Exception e) {
+String message =
+resources.getMessage(error.hostName.bad,
+adminHost);
+getServlet().log(message);
+
cvs commit: jakarta-tomcat-catalina/webapps/admin/host host.jsp
amyroh 2002/08/21 01:19:17 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host AddHostAction.java EditHostAction.java HostForm.java SaveHostAction.java webapps/admin/host host.jsp Log: Add xmlNamespaceAware and xmlValidation properties to Host admin page. Revision ChangesPath 1.4 +2 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ApplicationResources_en.properties16 Aug 2002 19:00:35 - 1.3 +++ ApplicationResources_en.properties21 Aug 2002 08:19:17 - 1.4 @@ -128,6 +128,8 @@ host.wars=Unpack WARs host.aliases=Aliases host.alias.name=Alias Name +host.xmlNamespaceAware=XML Namespace Aware +host.xmlValidation=XML Validation error.aliasName.exists=liAlias already exists/li error.aliasName.required=liAlias name is required/li context.properties=Context Properties 1.4 +8 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties Index: ApplicationResources_es.properties === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ApplicationResources_es.properties16 Aug 2002 19:00:35 - 1.3 +++ ApplicationResources_es.properties21 Aug 2002 08:19:17 - 1.4 @@ -129,6 +129,8 @@ host.wars=Desempaquetar WARs host.aliases=Aliases host.alias.name=Alias Nombre +host.xmlNamespaceAware=XML Namespace Aware +host.xmlValidation=XML Validation error.aliasName.exists=liAlias ya existe/li error.aliasName.required=liAlias nombre requiredo/li context.properties=Propiedades del contexto @@ -257,7 +259,7 @@ error.rolePattern.required=liSe requiere el modelo de la busqueda del papel./li error.userPassword.required=liSe requiere la palabra de paso del utilizador./li error.userPattern.required=liSe requiere el patr=n del usuario./li -error.userSearch.required=liSe requiere la b·squeda del usuario./li +error.userSearch.required=liSe requiere la b+squeda del usuario./li error.userPattern.userSearch.defined=liUserPattern o userSearch se deben especificar no ambos./li error.contextFactory.required=liSe requiere la factory del contexto./li error.connPassword.required=liSe requiere la palabra de paso de la conexion./li @@ -312,16 +314,16 @@ resources.error.entryType.notimpl=liValidaci=n para este tipo no puesto en ejecucio'n todavfa./li resources.error.url.required=liSe requiere el URL de Datasource./li resources.error.driverClass.required=liSe requiere la clase del conductor de JDBC./li -resources.error.active.required=liSe requieren las conexiones activas m¯ximas./li -resources.error.idle.required=liSe requieren las conexiones ociosas m¯ximas./li -resources.error.wait.required=liLa espera m¯xima para una conexi=n se requiere./li +resources.error.active.required=liSe requieren las conexiones activas m»ximas./li +resources.error.idle.required=liSe requieren las conexiones ociosas m»ximas./li +resources.error.wait.required=liLa espera m»xima para una conexi=n se requiere./li resources.error.mailhost.required=limail.smtp.host is required./li -resources.integer.error=liError inv¯lido del n+mero entero./li +resources.integer.error=liError inv»lido del n+mero entero./li resources.actions.userdb.create=Cree La Nueva Base de datos Del Usuario resources.actions.userdb.edit=Corrija La Base de datos Del Usuario resources.actions.userdb.delete=Bases de datos Del Usuario De la Cancelaci=n resources.userdb.location=Localizaci=n -resources.userdb.factory=F¯brica +resources.userdb.factory=F»brica resources.treeBuilder.userdbs=Bases de datos Del Usuario resources.error.path.required=liPath requerido/li resources.error.jndiName.required=liJNDI Nombre requerido/li 1.2 +18 -16 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java Index: AddHostAction.java === RCS file:
cvs commit: jakarta-tomcat-catalina/webapps/admin/host host.jsp
remm2002/08/14 06:44:43 Modified:webapps/admin/host host.jsp Log: - Port patch. - Fix bug 11415. - Max length for host name is now 255. Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-catalina/webapps/admin/host/host.jsp Index: host.jsp === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/host.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- host.jsp 24 Jul 2002 20:57:26 - 1.2 +++ host.jsp 14 Aug 2002 13:44:43 - 1.3 @@ -140,7 +140,7 @@ controls:data %-- input only allowed on create transaction --% logic:equal name=hostForm property=adminAction value=Create - html:text property=hostName size=24 maxlength=24/ + html:text property=hostName size=255 maxlength=24/ /logic:equal logic:equal name=hostForm property=adminAction value=Edit bean:write name=hostForm property=hostName/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
