svn commit: r415759 - in /incubator/lokahi/lokahi/trunk: conf/ApplicationResources.properties src/java/org/apache/lokahi/core/api/environment/EnvironmentModel.java

[to...@apache.org]

Author: toback
Date: Tue Jun 20 11:39:33 2006
New Revision: 415759

URL: http://svn.apache.org/viewvc?rev=415759&view=rev
Log:
The EnvironmentModel.java was using Function f.getName() when it really wanted f.getCommand().

Fixed some spelling errors in ApplicationResources.properties

Modified:
    incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/EnvironmentModel.java

Modified: incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties?rev=415759&r1=415758&r2=415759&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties (original)
+++ incubator/lokahi/lokahi/trunk/conf/ApplicationResources.properties Tue Jun 20 11:39:33 2006
@@ -49,7 +49,7 @@
 function.success.AddApachePool=The Apache Pool was added.
 function.success.AddApacheWorker=The Apache Worker was added.
 function.success.AddContext=The Context was added.
-function.success.AddEnviroment=The Enviroment was added.
+function.success.AddEnvironment=The Environment was added.
 function.success.AddFile=The File was added.
 function.success.AddFunction=The Function was added.
 function.success.AddHardware=The Hardware was added.
@@ -74,7 +74,7 @@
 function.success.DeleteApachePool=The apache pool has been deleted.
 function.success.DeleteApacheWorker=The apache worker has been deleted.
 function.success.DeleteContext=The context has been deleted.
-function.success.DeleteEnviroment=The environment has been deleted.
+function.success.DeleteEnvironment=The environment has been deleted.
 function.success.DeleteFile=The file has been deleted.
 function.success.DeleteFunction=The function has been deleted.
 function.success.DeleteHardware=The hardware has been deleted.  Why would you want to do that to me?
@@ -117,7 +117,7 @@
 function.success.UpdateApachePool=The apache pool has been updated.
 function.success.UpdateApacheWorker=The apache worker has been updated.
 function.success.UpdateContext=The context has been updated.
-function.success.UpdateEnviroment=The environment has been updated.
+function.success.UpdateEnvironment=The environment has been updated.
 function.success.UpdateFile=The file has been updated.
 function.success.UpdateFunction=The function has been updated.
 function.success.UpdateHardware=The hadware has been updated.

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/EnvironmentModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/EnvironmentModel.java?rev=415759&r1=415758&r2=415759&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/EnvironmentModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/EnvironmentModel.java Tue Jun 20 11:39:33 2006
@@ -38,7 +38,7 @@
 
   public void addEnvironment(User u, Environment e, Function f) throws SQLException, TMCException {
     jpInit(f, u, e.getName());
-    if (u.isAllowed(f) && "AddEnvironment".equals(f.getName())) {
+    if (u.isAllowed(f) && "AddEnvironment".equals(f.getCommand())) {
       Environment.store(e);
       jp.setState(State.COMPLETE);
       JobPool.update(jp);
@@ -49,7 +49,7 @@
 
   public void deleteEnvironment(User u, Environment e, Function f) throws SQLException, TMCException {
     jpInit(f, u, e.getName());
-    if (u.isAllowed(f) && "DeleteEnvironment".equals(f.getName())) {
+    if (u.isAllowed(f) && "DeleteEnvironment".equals(f.getCommand())) {
       if (Environment.delete(e)) {
         jp.setState(State.COMPLETE);
         JobPool.update(jp);
@@ -63,7 +63,7 @@
 
   public void updateEnvironment(User u, Environment e, Function f) throws SQLException, TMCException {
     jpInit(f, u, e.getName());
-    if (u.isAllowed(f) && "DeleteEnvironment".equals(f.getName())) {
+    if (u.isAllowed(f) && "DeleteEnvironment".equals(f.getCommand())) {
       if (e.getPk() < 1 || e.getName() == null) {
         throw new IllegalArgumentException("error.badData");
       }