You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pa...@apache.org on 2001/12/17 18:37:43 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin SetUpServerAction.java
patrickl 01/12/17 09:37:43
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
SetUpServerAction.java
Log:
Replace tabs with proper number of spaces to conform to coding style standard
Revision Changes Path
1.5 +27 -27 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java
Index: SetUpServerAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetUpServerAction.java 2001/12/17 17:34:05 1.4
+++ SetUpServerAction.java 2001/12/17 17:37:43 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v 1.4 2001/12/17 17:34:05 patrickl Exp $
- * $Revision: 1.4 $
- * $Date: 2001/12/17 17:34:05 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v 1.5 2001/12/17 17:37:43 patrickl Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/12/17 17:37:43 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2001/12/17 17:34:05 $
+ * @version $Revision: 1.5 $ $Date: 2001/12/17 17:37:43 $
*/
public class SetUpServerAction extends Action {
@@ -137,27 +137,27 @@
HttpSession session = request.getSession();
- // Do I have to do this part ??
- if (form == null) {
- getServlet().log(" Creating new ServerForm bean under key "
- + mapping.getAttribute());
- form = new ServerForm();
-
+ // Do I have to do this part ??
+ if (form == null) {
+ getServlet().log(" Creating new ServerForm bean under key "
+ + mapping.getAttribute());
+ form = new ServerForm();
+
if ("request".equals(mapping.getScope()))
request.setAttribute(mapping.getAttribute(), form);
else
request.getSession().setAttribute(mapping.getAttribute(), form);
-
- }
+
+ }
MessageResources messages = getResources();
Locale locale = (Locale)session.getAttribute(Action.LOCALE_KEY);
- // Do transaction stuff before this
+ // Do transaction stuff before this
- ServerForm serverFm = (ServerForm) form;
+ ServerForm serverFm = (ServerForm) form;
- if(debugLvlList == null) {
+ if(debugLvlList == null) {
debugLvlList = new ArrayList();
debugLvlList.add(new LabelValueBean("0", "0"));
debugLvlList.add(new LabelValueBean("1", "1"));
@@ -172,10 +172,10 @@
}
- if(actionList == null) {
+ if(actionList == null) {
actionList = new ArrayList();
- // You can get this from the Mbean
+ // You can get this from the Mbean
actionList.add(new LabelValueBean(
messages.getMessage(locale, "actions.available.actions"),
"Available Actions"));
@@ -189,15 +189,15 @@
"Delete Services"));
}
- Integer portNumb = null;
- Integer debug = null;
- String shutdown = null;
+ Integer portNumb = null;
+ Integer debug = null;
+ String shutdown = null;
try{
-
+
if(mBServer == null) {
- ApplicationServlet servlet = (ApplicationServlet)getServlet();
+ ApplicationServlet servlet = (ApplicationServlet)getServlet();
mBServer = servlet.getServer();
- }
+ }
Iterator serverItr =
mBServer.queryMBeans(new ObjectName(TomcatTreeBuilder.SERVER_TYPE +
@@ -207,16 +207,16 @@
ObjectName serverObjName =
((ObjectInstance)serverItr.next()).getObjectName();
- /*
+ /*
ModelMBeanInfo info = (ModelMBeanInfo) mBServer.getMBeanInfo(serverObjName);
MBeanAttributeInfo attrs[] = info.getAttributes();
for (int i = 0; i < attrs.length; i++)
System.out.println(" AttributeInfo=" + attrs[i]);
-
+
MBeanOperationInfo opers[] = info.getOperations();
for (int i = 0; i < opers.length; i++)
System.out.println(" Operation=" + opers[i]);
- */
+ */
portNumb = (Integer)mBServer.getAttribute(serverObjName,
PORT_PROP_NAME);
@@ -236,7 +236,7 @@
//forward to error page
}
-
+
serverFm.setPortNumberText(portNumb.toString());
// Hardcode debuglvl for now
serverFm.setDebugLvl(debug.toString());
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>