amyroh 2003/03/24 01:17:02
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
CommitChangesAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
SaveConnectorAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
DeleteContextAction.java SaveContextAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
DeleteLoggerAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
SaveServiceAction.java
webapps/admin/context contexts.jsp
Log:
More admin update. Items left to be fixed/tested are
deregistration of MBeans, DefaultContext, Valve, Logger, Realm pages.
Revision Changes Path
1.2 +7 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java
Index: CommitChangesAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommitChangesAction.java 18 Jul 2002 16:48:20 -0000 1.1
+++ CommitChangesAction.java 24 Mar 2003 09:17:01 -0000 1.2
@@ -144,7 +144,8 @@
ObjectName sname = null;
try {
- sname = new ObjectName(TomcatTreeBuilder.SERVER_TYPE);
+ sname = new ObjectName(TomcatTreeBuilder.DEFAULT_DOMAIN +
+ TomcatTreeBuilder.SERVER_TYPE);
} catch (Exception e) {
String message = "Could not get Server Object";
getServlet().log(message);
@@ -152,7 +153,7 @@
return (null);
}
- String operation = "store";
+ String operation = "storeConfig";
try {
mBServer.invoke(sname, operation, null, null);
} catch (Throwable t) {
1.5 +12 -8
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Index: SaveConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveConnectorAction.java 21 Mar 2003 08:19:13 -0000 1.4
+++ SaveConnectorAction.java 24 Mar 2003 09:17:01 -0000 1.5
@@ -179,10 +179,14 @@
String serviceName = cform.getServiceName();
ObjectName soname = new ObjectName(serviceName);
String domain = soname.getDomain();
- ObjectName oname =
- new ObjectName(domain + TomcatTreeBuilder.CONNECTOR_TYPE +
- ",port=" + cform.getPortText() +
- ",address=" + cform.getAddress());
+ StringBuffer sb = new StringBuffer(domain);
+ sb.append(TomcatTreeBuilder.CONNECTOR_TYPE);
+ sb.append(",port=" + cform.getPortText());
+ String address = cform.getAddress();
+ if ((address!=null) && (address.length()>0)) {
+ sb.append(",address=" + address);
+ }
+ ObjectName oname = new ObjectName(sb.toString());
// Ensure that the requested connector name is unique
if (mBServer.isRegistered(oname)) {
1.3 +26 -9
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java
Index: DeleteContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteContextAction.java 18 Mar 2003 10:48:15 -0000 1.2
+++ DeleteContextAction.java 24 Mar 2003 09:17:01 -0000 1.3
@@ -180,14 +180,31 @@
try {
ObjectName poname = new ObjectName(patternObject);
String domain = poname.getDomain();
- String pattern = domain + TomcatTreeBuilder.CONTEXT_TYPE +
- TomcatTreeBuilder.WILDCARD +
- ",host=" + poname.getKeyProperty("host");
+ StringBuffer sb = new StringBuffer(domain);
+ sb.append(":j2eeType=WebModule,*");
+ ObjectName search = new ObjectName(sb.toString());
// get all available contexts only for this host
Iterator items =
- mBServer.queryNames(new ObjectName(pattern), null).iterator();
+ mBServer.queryNames(search, null).iterator();
+ String item = null;
+ String host = poname.getKeyProperty("host");
+ if (host==null) {
+ String name = poname.getKeyProperty("name");
+ if ((name != null) && (name.length() > 0)) {
+ name = name.substring(2);
+ int i = name.indexOf("/");
+ host = name.substring(0,i);
+ }
+ }
+ String hostPrefix = "//"+host;
+ String hostAttr = null;
while (items.hasNext()) {
- list.add(items.next().toString());
+ item = items.next().toString();
+ ObjectName oname = new ObjectName(item);
+ hostAttr = oname.getKeyProperty("name");
+ if (hostAttr.startsWith(hostPrefix)) {
+ list.add(item);
+ }
}
} catch (Exception e) {
getServlet().log
1.7 +32 -23
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
Index: SaveContextAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SaveContextAction.java 20 Mar 2003 05:40:09 -0000 1.6
+++ SaveContextAction.java 24 Mar 2003 09:17:01 -0000 1.7
@@ -195,17 +195,27 @@
String operation = null;
Object values[] = null;
- try {
+ try {
+ String docBase = cform.getDocBase();
+ if ((docBase == null) || (docBase.length() < 1)) {
+ ActionErrors errors = new ActionErrors();
+ errors.add("docBase",
+ new ActionError("error.docBase.required"));
+ saveErrors(request, errors);
+ return (new ActionForward(mapping.getInput()));
+ }
// get the parent host name
String parentName = cform.getParentObjectName();
ObjectName honame = new ObjectName(parentName);
// Ensure that the requested context name is unique
- ObjectName oname =
- new ObjectName(honame.getDomain() +
- TomcatTreeBuilder.CONTEXT_TYPE +
- ",path=" + cform.getPath() +
- ",host=" + honame.getKeyProperty("host"));
+ ObjectName oname =
+ new ObjectName(honame.getDomain() +
+ ":j2eeType=WebModule,name=//" +
+ honame.getKeyProperty("host") +
+ cform.getPath() +
+ // FIXME set J2EEApplication and J2EEServer
+ ",J2EEApplication=none,J2EEServer=none");
if (mBServer.isRegistered(oname)) {
ActionErrors errors = new ActionErrors();
@@ -229,7 +239,7 @@
cObjectName = (String)
mBServer.invoke(fname, operation,
values, createStandardContextTypes);
-
+ getServlet().log("context="+cObjectName+" path="+values[1]+"
docbase="+values[2]);
// Create a new Loader object
values = new String[1];
// parent of loader is the newly created context
@@ -464,7 +474,16 @@
if (control != null) {
TreeControlNode parentNode = control.findNode(parentName);
if (parentNode != null) {
- String path = oname.getKeyProperty("path");
+ String type = "Context";
+ String path = "";
+ String host = "";
+ String name = oname.getKeyProperty("name");
+ if ((name != null) && (name.length() > 0)) {
+ name = name.substring(2);
+ int i = name.indexOf("/");
+ host = name.substring(0,i);
+ path = name.substring(i);
+ }
String nodeLabel = "Context (" + path + ")";
String encodedName = URLEncoder.encode(oname.toString());
TreeControlNode childNode =
@@ -476,18 +495,8 @@
"content",
true, domain);
parentNode.addChild(childNode);
+
// FIXME - force a redisplay
- String type = oname.getKeyProperty("type");
- if (type == null) {
- type = "";
- }
- if (path == null) {
- path = "";
- }
- String host = oname.getKeyProperty("host");
- if (host == null) {
- host = "";
- }
TreeControlNode subtree = new TreeControlNode
("Context Resource Administration " + containerName,
"folder_16_pad.gif",
1.4 +15 -8
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java
Index: DeleteLoggerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteLoggerAction.java 21 Mar 2003 08:19:15 -0000 1.3
+++ DeleteLoggerAction.java 24 Mar 2003 09:17:02 -0000 1.4
@@ -216,11 +216,18 @@
StringBuffer sb = new StringBuffer(domain+MBeanType);
String type = poname.getKeyProperty("type");
String j2eeType = poname.getKeyProperty("j2eeType");
+ String path = "";
+ String host = "";
+ String name = poname.getKeyProperty("name");
+ if ((name != null) && (name.length() > 0)) {
+ name = name.substring(2);
+ int i = name.indexOf("/");
+ host = name.substring(0,i);
+ path = name.substring(i);
+ }
if ("WebModule".equalsIgnoreCase(j2eeType)) { // container is context
- sb.append(",path=");
- sb.append(poname.getKeyProperty("path"));
- sb.append(",host=");
- sb.append(poname.getKeyProperty("host"));
+ sb.append(",path="+path);
+ sb.append(",host="+host);
}
if ("Host".equalsIgnoreCase(type)) { // container is host
sb.append(",host=");
1.6 +16 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java
Index: SaveServiceAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveServiceAction.java 23 Mar 2003 02:10:28 -0000 1.5
+++ SaveServiceAction.java 24 Mar 2003 09:17:02 -0000 1.6
@@ -210,7 +210,8 @@
//String domain = (new ObjectName(serverObjectName)).getDomain();
// Ensure that the requested service name is unique
ObjectName oname =
- new ObjectName(engineName + TomcatTreeBuilder.SERVICE_TYPE);
+ new ObjectName(engineName + TomcatTreeBuilder.SERVICE_TYPE +
+ ",serviceName="+sform.getServiceName());
if (mBServer.isRegistered(oname)) {
ActionErrors errors = new ActionErrors();
errors.add("serviceName",
@@ -218,7 +219,16 @@
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
-
+
+ oname = new ObjectName(engineName + TomcatTreeBuilder.ENGINE_TYPE);
+ if (mBServer.isRegistered(oname)) {
+ ActionErrors errors = new ActionErrors();
+ errors.add("serviceName",
+ new ActionError("error.serviceName.exists"));
+ saveErrors(request, errors);
+ return (new ActionForward(mapping.getInput()));
+ }
+
// Look up our MBeanFactory MBean
ObjectName fname = TomcatTreeBuilder.getMBeanFactory();
1.4 +3 -4 jakarta-tomcat-catalina/webapps/admin/context/contexts.jsp
Index: contexts.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/context/contexts.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- contexts.jsp 23 Jan 2003 00:07:08 -0000 1.3
+++ contexts.jsp 24 Mar 2003 09:17:02 -0000 1.4
@@ -44,7 +44,6 @@
<br>
<%-- Contexts List --%>
-
<table class="back-table" border="0" cellspacing="0" cellpadding="1"
width="100%">
<tr><td>
@@ -60,15 +59,15 @@
<bean:message key="host.name"/>
</div></td>
</tr>
-
+
<logic:iterate name="contextsList" id="context">
<tr class="line-row">
<td><div align="left" class="table-normal-text">
<%-- admin context cannot be deleted from the tool --%>
- <logic:match name="context" value='<%=
"path="+request.getContextPath()+"," %>'>
+ <logic:match name="context" value='<%= request.getContextPath()+","
%>'>
<font color='red'>*</font>
</logic:match>
- <logic:notMatch name="context" value='<%=
"path="+request.getContextPath()+"," %>'>
+ <logic:notMatch name="context" value='<%=
request.getContextPath()+"," %>'>
<label for="contexts"></label>
<html:multibox property="contexts"
value="<%= context.toString() %>"
styleId="contexts"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
