From: <st...@us...> - 2004-03-10 08:36:22
|
Update of /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29908/extras/ant/src/org/smartfrog/tools/ant Modified Files: StopApplication.java SmartFrogTask.java Log Message: tests for undeploy, PDF files Index: StopApplication.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant/StopApplication.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StopApplication.java 27 Feb 2004 17:44:58 -0000 1.5 --- StopApplication.java 10 Mar 2004 08:10:39 -0000 1.6 *************** *** 30,34 **** * name of an app */ ! protected String applicationName; public StopApplication() { --- 30,34 ---- * name of an app */ ! protected String application; public StopApplication() { *************** *** 36,41 **** setFailOnError(true); } ! protected String getApplicationName() { ! return applicationName; } --- 36,41 ---- setFailOnError(true); } ! protected String getApplication() { ! return application; } *************** *** 44,51 **** * set the app name; optional on some actions * ! * @param applicationName */ ! public void setApplicationName(String applicationName) { ! this.applicationName = applicationName; } /** --- 44,51 ---- * set the app name; optional on some actions * ! * @param application */ ! public void setApplication(String application) { ! this.application = application; } /** *************** *** 56,67 **** */ public void execute() throws BuildException { - if(applicationName==null) { - throw new BuildException("No application to undeploy"); - } setStandardSmartfrogProperties(); addHostname(); ! addApplicationCommand("-t",applicationName); addExitFlag(); ! execSmartfrog("failed to terminate "+getApplicationName()); } --- 56,64 ---- */ public void execute() throws BuildException { setStandardSmartfrogProperties(); addHostname(); ! addApplicationCommand("-t",application); addExitFlag(); ! execSmartfrog("failed to terminate "+getApplication()); } Index: SmartFrogTask.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant/SmartFrogTask.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SmartFrogTask.java 5 Mar 2004 10:53:55 -0000 1.9 --- SmartFrogTask.java 10 Mar 2004 08:10:39 -0000 1.10 *************** *** 369,374 **** --- 369,378 ---- * @param command * @param name + * @throws BuildException if there is no app name */ protected void addApplicationCommand(String command, String name) { + if(name==null || name.length()==0) { + throw new BuildException("Missing application name"); + } addArg(command); addArg(name); |