Menu
▾
▴
[Smartfrog-checkins] core/extras/ant/src/org/smartfrog/tools/ant StopDaemon.java,1.8,1.9 StartDaemon.java,1.7,1.8 StartApplication.java,1.11,1.12 SmartFrogTask.java,1.18,1.19 RunApplicationTask.java,1.11,1.12 DeployingTaskBase.java,1.6,1.7
Update of /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3461/src/org/smartfrog/tools/ant Modified Files: StopDaemon.java StartDaemon.java StartApplication.java SmartFrogTask.java RunApplicationTask.java DeployingTaskBase.java Log Message: Fixes to get the tests compatible with Julios changes. At this point the tests are working again on Linux, but not winXP. Responsibility for maintaining tasks+tests now falls to whoever breaks the tests in future. Index: DeployingTaskBase.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant/DeployingTaskBase.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DeployingTaskBase.java 30 Mar 2004 10:20:22 -0000 1.6 --- DeployingTaskBase.java 30 Mar 2004 14:17:37 -0000 1.7 *************** *** 93,102 **** */ public void deployApplications() { Iterator it=applications.iterator(); while (it.hasNext()) { Application application = (Application) it.next(); application.validate(); ! addArg("-a"); ! addArg(application.getName()+":" //NAME +"DEPLOY"+":" //Action: DEPLOY,TERMINATE,DETACH,DETaTERM +application.getDescriptor()+":" //URL --- 93,103 ---- */ public void deployApplications() { + verifyHostDefined(); Iterator it=applications.iterator(); while (it.hasNext()) { Application application = (Application) it.next(); application.validate(); ! addArg("-a"); ! addArg(application.getName()+":" //NAME +"DEPLOY"+":" //Action: DEPLOY,TERMINATE,DETACH,DETaTERM +application.getDescriptor()+":" //URL *************** *** 131,134 **** --- 132,138 ---- private String descriptor; + /** + * text of an application + */ private String text; *************** *** 169,172 **** --- 173,179 ---- } + /** + * validate the descriptor + */ public void validate() { if(name==null) { Index: SmartFrogTask.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant/SmartFrogTask.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** SmartFrogTask.java 29 Mar 2004 16:44:21 -0000 1.18 --- SmartFrogTask.java 30 Mar 2004 14:17:37 -0000 1.19 *************** *** 56,59 **** --- 56,61 ---- public void init() throws BuildException { smartfrog = getBaseJavaTask(); + setFailOnError(true); + setTimeout(DEFAULT_TIMEOUT_VALUE); } *************** *** 164,167 **** --- 166,170 ---- */ public void setHost(String host) { + log("setting host to "+host, Project.MSG_DEBUG); this.host = host; } *************** *** 492,498 **** * if a host is defined */ ! protected void checkNoHost() { if (host != null && host.length() > 0) { ! throw new BuildException("host cannot be set on this task"); } } --- 495,501 ---- * if a host is defined */ ! protected void verifyHostUndefined() { if (host != null && host.length() > 0) { ! throw new BuildException("host cannot be set on this task; it is set to "+host); } } *************** *** 506,510 **** smartfrog.setTimeout(new Long(timeout)); } else { ! //no valid timeout; ignore it. smartfrog.setTimeout(null); } --- 509,513 ---- smartfrog.setTimeout(new Long(timeout)); } else { ! //no valid timeout; ignore it. smartfrog.setTimeout(null); } *************** *** 512,515 **** --- 515,529 ---- /** + * verify that the host is defined; assert if it is not set + * @throws org.apache.tools.ant.BuildException + * if a host is undefined + */ + protected void verifyHostDefined() { + if(getHost()==null) { + throw new BuildException("host is undefined"); + } + } + + /** * this contains information pointing to the location of code. * It can either be a URL or a file path to a Java file. Index: StartApplication.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant/StartApplication.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** StartApplication.java 30 Mar 2004 10:21:11 -0000 1.11 --- StartApplication.java 30 Mar 2004 14:17:37 -0000 1.12 *************** *** 45,49 **** enableFailOnError(); checkApplicationsDeclared(); - //addHostname(); deployApplications(); addExitFlag(); --- 45,48 ---- Index: StopDaemon.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant/StopDaemon.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** StopDaemon.java 29 Mar 2004 16:44:21 -0000 1.8 --- StopDaemon.java 30 Mar 2004 14:17:37 -0000 1.9 *************** *** 54,61 **** public void execute() throws BuildException { setStandardSmartfrogProperties(); String terminateCommand = ROOT_PROCESS + ":TERMINATE:::"+getHost()+ ":"; addApplicationCommand("-a", terminateCommand); - //addArg(terminateCommand); - //addArg(host); addExitFlag(); execSmartfrog("failed to terminate " + ROOT_PROCESS); --- 54,60 ---- public void execute() throws BuildException { setStandardSmartfrogProperties(); + verifyHostDefined(); String terminateCommand = ROOT_PROCESS + ":TERMINATE:::"+getHost()+ ":"; addApplicationCommand("-a", terminateCommand); addExitFlag(); execSmartfrog("failed to terminate " + ROOT_PROCESS); Index: StartDaemon.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant/StartDaemon.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** StartDaemon.java 29 Mar 2004 16:08:14 -0000 1.7 --- StartDaemon.java 30 Mar 2004 14:17:37 -0000 1.8 *************** *** 52,55 **** --- 52,60 ---- } + public void init() throws BuildException { + super.init(); + setHost("localhost"); + } + /** * get the title string used to name a task *************** *** 89,93 **** ROOT_PROCESS); addIniFile(); - //addHostname(); deployApplications(); if(spawn) { --- 94,97 ---- Index: RunApplicationTask.java =================================================================== RCS file: /cvsroot/smartfrog/core/extras/ant/src/org/smartfrog/tools/ant/RunApplicationTask.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** RunApplicationTask.java 30 Mar 2004 10:20:22 -0000 1.11 --- RunApplicationTask.java 30 Mar 2004 14:17:37 -0000 1.12 *************** *** 22,26 **** import org.apache.tools.ant.BuildException; - import java.util.Iterator; --- 22,25 ---- *************** *** 80,84 **** */ public void execute() throws BuildException { ! checkNoHost(); setHost(""); setStandardSmartfrogProperties(); --- 79,83 ---- */ public void execute() throws BuildException { ! verifyHostUndefined(); setHost(""); setStandardSmartfrogProperties(); |