You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/03/20 01:02:35 UTC
svn commit: r639086 - in
/openejb/branches/openejb-3.0/container/openejb-core/src/main:
java/org/apache/openejb/config/Undeploy.java
resources/org/apache/openejb/config/Messages.properties
Author: dblevins
Date: Wed Mar 19 17:02:26 2008
New Revision: 639086
URL: http://svn.apache.org/viewvc?rev=639086&view=rev
Log:
Merging r636952 - http://svn.apache.org/viewvc?rev=636952&view=rev
svn merge -r 636951:636952 http://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r636847 | kmalhi | 2008-03-13 12:35:27 -0700 (Thu, 13 Mar 2008) | 2 lines
Added system properties to SystemInstance
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java
openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties
Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java?rev=639086&r1=639085&r2=639086&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java Wed Mar 19 17:02:26 2008
@@ -148,7 +148,7 @@
undeployed = true;
moduleId = path;
if (!delete(file)){
- throw new DeploymentTerminatedException(messages.format("cmd.deploy.cantDelete", file.getAbsolutePath()));
+ throw new DeploymentTerminatedException(messages.format("cmd.undeploy.cantDelete", file.getAbsolutePath()));
}
} catch (NoSuchApplicationException e) {
}
Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties?rev=639086&r1=639085&r2=639086&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/config/Messages.properties Wed Mar 19 17:02:26 2008
@@ -36,6 +36,9 @@
##System.out.println(messages.format("cmd.undeploy.nothingToDelete", moduleId));
cmd.undeploy.nothingToDelete = Nothing to delete.
+# throw new DeploymentTerminatedException(messages.format("cmd.undeploy.cantDelete", file.getAbsolutePath()));
+cmd.undeploy.cantDelete = Application was undeployed from the runtime
+
#Deploy
cmd.deploy.description = Connects to the server and deploys the application. Note that full remote deployment is not yet supported, deployment can only be done on the same machine as the server. Track OPENEJB-609 for development of full remote deployment feature.\n\nOptions: