You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by jr...@apache.org on 2003/01/16 12:37:05 UTC
cvs commit: jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant StartServerHelper.java GenericAntProvider.java
jruaux 2003/01/16 03:37:05
Modified: Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant
StartServerHelper.java GenericAntProvider.java
Log:
Externalized messages
Revision Changes Path
1.9 +9 -3 jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant/StartServerHelper.java
Index: StartServerHelper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant/StartServerHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StartServerHelper.java 15 Jan 2003 16:30:56 -0000 1.8
+++ StartServerHelper.java 16 Jan 2003 11:37:04 -0000 1.9
@@ -131,7 +131,9 @@
// Verify that a test URL has been specified
if (this.testURL == null)
{
- throw new BuildException("A testURL attribute must be specified");
+ throw new BuildException(
+ CactusMessages.getString(
+ "CactusLaunch.message.start.url.error"));
}
// Try connecting in case the server is already running. If so, does
@@ -172,7 +174,8 @@
if (pm.isCanceled())
{
throw new BuildException(
- CactusMessages.getString("ContainerStart.message.failed"));
+ CactusMessages.getString(
+ "CactusLaunch.message.start.error"));
}
break;
}
@@ -197,7 +200,10 @@
}
catch (InterruptedException e)
{
- throw new BuildException("Interruption during sleep", e);
+ throw new BuildException(
+ CactusMessages.getString(
+ "CactusLaunch.message.start.sleep.error"),
+ e);
}
}
1.9 +3 -2 jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant/GenericAntProvider.java
Index: GenericAntProvider.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/Eclipse-Plugin/src/java/org/apache/cactus/eclipse/containers/ant/GenericAntProvider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GenericAntProvider.java 15 Jan 2003 16:28:03 -0000 1.8
+++ GenericAntProvider.java 16 Jan 2003 11:37:04 -0000 1.9
@@ -64,6 +64,7 @@
import org.apache.cactus.eclipse.containers.ContainerInfo;
import org.apache.cactus.eclipse.containers.Credential;
import org.apache.cactus.eclipse.containers.IContainerProvider;
+import org.apache.cactus.eclipse.ui.CactusMessages;
import org.apache.cactus.eclipse.ui.CactusPlugin;
import org.apache.tools.ant.BuildException;
import org.eclipse.ant.core.AntRunner;
@@ -147,7 +148,7 @@
public void start(ContainerInfo theContainerInfo, IProgressMonitor thePM)
throws CoreException
{
- thePM.subTask("Starting the container");
+ thePM.subTask(CactusMessages.getString("CactusLaunch.message.start"));
String[] targets = getMasked("start.");
AntRunner runner = createAntRunner(targets);
StartServerHelper startHelper = new StartServerHelper(runner);
@@ -201,7 +202,7 @@
IProgressMonitor thePM)
throws CoreException
{
- thePM.subTask("Deploying the container");
+ thePM.subTask(CactusMessages.getString("CactusLaunch.message.deploy"));
contextPath = theContextPath;
String warPath = theDeployableObject.getPath();
antArguments.add("-Dwar.path=" + warPath);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>