You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/06/03 23:16:37 UTC
svn commit: r662891 - in
/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli:
CommandInstallCAR.java CommandInstallLibrary.java
CommandListConfigurations.java
Author: gawor
Date: Tue Jun 3 14:16:37 2008
New Revision: 662891
URL: http://svn.apache.org/viewvc?rev=662891&view=rev
Log:
improve error message and prevent NPE
Modified:
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallLibrary.java
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java?rev=662891&r1=662890&r2=662891&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java Tue Jun 3 14:16:37 2008
@@ -68,7 +68,7 @@
throw new DeploymentException("Cannot install plugin", e);
}
} else {
- throw new DeploymentException("Cannot install plugins when connected to "+connection.getServerURI());
+ throw new DeploymentException("Cannot install plugins using " + dmgr.getClass().getName() + " deployment manager");
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallLibrary.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallLibrary.java?rev=662891&r1=662890&r2=662891&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallLibrary.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallLibrary.java Tue Jun 3 14:16:37 2008
@@ -61,7 +61,7 @@
throw new DeploymentException("Unable to install library "+installLibraryCommandArgs.getArgs()[0], e);
}
} else {
- throw new DeploymentException("Cannot install library when connected to "+connection.getServerURI());
+ throw new DeploymentException("Cannot install library using " + dmgr.getClass().getName() + " deployment manager");
}
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java?rev=662891&r1=662890&r2=662891&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java Tue Jun 3 14:16:37 2008
@@ -77,7 +77,7 @@
throw new DeploymentException("Invalid response");
}
} else {
- throw new DeploymentException("Cannot list repositories when connected to " + connection.getServerURI());
+ throw new DeploymentException("Cannot list repositories using " + dmgr.getClass().getName() + " deployment manager");
}
}