manveen 02/05/04 09:36:22
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
Log:
Save all attributes while creating a new entry.
Revision Changes Path
1.3 +43 -45
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveEnvEntryAction.java 4 May 2002 15:49:47 -0000 1.2
+++ SaveEnvEntryAction.java 4 May 2002 16:36:22 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.2 2002/05/04 15:49:47 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/04 15:49:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.3 2002/05/04 16:36:22 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/04 16:36:22 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* updated Env Entry.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/05/04 15:49:47 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/04 16:36:22 $
* @since 4.1
*/
@@ -171,15 +171,13 @@
// Perform an "Add Entry" transaction
if (objectName == null) {
- String signature[] = new String[3];
+ String signature[] = new String[2];
signature[0] = "java.lang.String";
signature[1] = "java.lang.String";
- signature[2] = "java.lang.String";
- Object params[] = new Object[3];
+ Object params[] = new Object[2];
params[0] = envEntryForm.getName();
- params[1] = envEntryForm.getEntryType();
- params[2] = envEntryForm.getValue();
+ params[1] = envEntryForm.getEntryType();
ObjectName oname = null;
@@ -191,7 +189,13 @@
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, "addEnvironment",
params, signature);
-
+
+ // FIX ME
+ // "addEnvironment" should return the name of the new
+ // mBean just created
+ objectName = ResourceUtils.ENVIRONMENT_TYPE +
+ ",name=" + params[0];
+
} catch (Exception e) {
getServlet().log
@@ -207,42 +211,36 @@
}
// Perform an "Update Environment Entry" transaction
- else {
-
- ObjectName oname = null;
- String attribute = null;
-
- try {
-
- // Construct an object name for this object
- oname = new ObjectName(objectName);
-
- // Update the specified env entry
- attribute = "description";
- mserver.setAttribute
- (oname,
- new Attribute(attribute, envEntryForm.getDescription()));
- attribute = "type";
- mserver.setAttribute
- (oname,
- new Attribute(attribute, envEntryForm.getEntryType()));
- attribute = "value";
- mserver.setAttribute
- (oname,
- new Attribute(attribute, envEntryForm.getValue()));
-
- } catch (Exception e) {
-
- getServlet().log
- (resources.getMessage(locale, "users.error.set.attribute",
- attribute), e);
- response.sendError
- (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- resources.getMessage(locale, "users.error.set.attribute",
- attribute));
- return (null);
+ String attribute = null;
+ try {
+
+ // Construct an object name for this object
+ ObjectName oname = new ObjectName(objectName);
- }
+ // Update the specified env entry
+ attribute = "description";
+ mserver.setAttribute
+ (oname,
+ new Attribute(attribute, envEntryForm.getDescription()));
+ attribute = "type";
+ mserver.setAttribute
+ (oname,
+ new Attribute(attribute, envEntryForm.getEntryType()));
+ attribute = "value";
+ mserver.setAttribute
+ (oname,
+ new Attribute(attribute, envEntryForm.getValue()));
+
+ } catch (Exception e) {
+
+ getServlet().log
+ (resources.getMessage(locale, "users.error.set.attribute",
+ attribute), e);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ resources.getMessage(locale, "users.error.set.attribute",
+ attribute));
+ return (null);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
