Menu
▾
▴
[Smartfrog-checkins] core/components/cddlm/client/org/cddlm/client/console ApplicationStatus.java,1.1,1.2 ConsoleOperation.java,1.20,1.21 Deploy.java,1.6,1.7 Listen.java,1.2,1.3
|
From: Steve L. <st...@us...> - 2004-09-17 16:31:33
|
Update of /cvsroot/smartfrog/core/components/cddlm/client/org/cddlm/client/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv695/components/cddlm/client/org/cddlm/client/console Modified Files: ApplicationStatus.java ConsoleOperation.java Deploy.java Listen.java Log Message: Pre demo edition; callbacks are now *working* Index: ApplicationStatus.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/client/org/cddlm/client/console/ApplicationStatus.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ApplicationStatus.java 15 Sep 2004 12:59:12 -0000 1.1 --- ApplicationStatus.java 17 Sep 2004 16:30:51 -0000 1.2 *************** *** 24,27 **** --- 24,29 ---- import org.smartfrog.services.cddlm.generated.api.types.ApplicationStatusType; import org.smartfrog.services.cddlm.generated.api.types.UnboundedXMLOtherNamespace; + import org.smartfrog.services.cddlm.generated.api.types.CallbackInformationType; + import org.smartfrog.services.cddlm.generated.api.types.CallbackAddressType; import java.io.PrintWriter; *************** *** 51,54 **** --- 53,67 ---- out.println("status: " + status.getState()); out.println("info: " + status.getStateInfo()); + CallbackInformationType callbackInfo = status.getCallback(); + if(callbackInfo!=null) { + out.println( "callback: "+callbackInfo.getType()); + CallbackAddressType address = callbackInfo.getAddress(); + if ( address != null ) { + if ( address.getUri() != null ) { + out.println("url: " + address.getUri()); + } + } + out.println( "identifier:"+callbackInfo.getIdentifier()); + } UnboundedXMLOtherNamespace extendedState = status.getExtendedState(); if (extendedState != null) { Index: ConsoleOperation.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/client/org/cddlm/client/console/ConsoleOperation.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ConsoleOperation.java 17 Sep 2004 10:34:23 -0000 1.20 --- ConsoleOperation.java 17 Sep 2004 16:30:52 -0000 1.21 *************** *** 25,28 **** --- 25,29 ---- import org.apache.axis.types.NCName; import org.apache.axis.types.URI; + import org.apache.axis.AxisFault; import org.cddlm.client.common.Constants; import org.cddlm.client.common.ServerBinding; *************** *** 545,549 **** _setCallbackRequest request = new _setCallbackRequest(application, null); ! return setCallback(request); } --- 546,560 ---- _setCallbackRequest request = new _setCallbackRequest(application, null); ! try { ! return setCallback(request); ! } catch (AxisFault e) { ! if(DeployApiConstants.FAULT_NO_SUCH_APPLICATION.equals(e.getFaultCode())) { ! //do nothing, as this is a common event ! return false; ! } else { ! //anything else ! throw e; ! } ! } } Index: Deploy.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/client/org/cddlm/client/console/Deploy.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Deploy.java 15 Sep 2004 16:47:26 -0000 1.6 --- Deploy.java 17 Sep 2004 16:30:52 -0000 1.7 *************** *** 99,103 **** createDeploymentDescriptor(); uri = deploy(name, descriptor, null, null); ! out.print("Deployed to uri:" + uri); } --- 99,103 ---- createDeploymentDescriptor(); uri = deploy(name, descriptor, null, null); ! out.print("Deployed to uri: " + uri); } Index: Listen.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/client/org/cddlm/client/console/Listen.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Listen.java 17 Sep 2004 10:34:23 -0000 1.2 --- Listen.java 17 Sep 2004 16:30:52 -0000 1.3 *************** *** 23,26 **** --- 23,27 ---- import org.apache.axis.message.MessageElement; + import org.apache.axis.types.URI; import org.cddlm.client.callbacks.CallbackServer; import org.cddlm.client.common.ServerBinding; *************** *** 45,49 **** int messageCount = 0; ! int timeout = 0; public Listen(ServerBinding binding, PrintWriter out, String[] args) { --- 46,50 ---- int messageCount = 0; ! int timeout = 5*60; public Listen(ServerBinding binding, PrintWriter out, String[] args) { *************** *** 104,108 **** //now ask for try { ! Thread.sleep(timeout * 1000); } catch (InterruptedException e) { --- 105,110 ---- //now ask for try { ! int millis = timeout * 1000; ! sleep(millis); } catch (InterruptedException e) { *************** *** 113,117 **** //shutdown code server.stop(); ! if (identifier != null) { CallbackServer.removeMapping(identifier); } --- 115,119 ---- //shutdown code server.stop(); ! if ( identifier != null ) { CallbackServer.removeMapping(identifier); } *************** *** 119,122 **** --- 121,128 ---- } + protected void sleep(int millis) throws InterruptedException { + Thread.sleep(millis); + } + /** * useful little override point for testing the cddlm callback has already *************** *** 124,128 **** */ ! protected void aboutToWait() { } --- 130,134 ---- */ ! protected void aboutToWait() throws IOException { } *************** *** 135,145 **** * @throws RemoteException */ ! public synchronized boolean callback( ! _lifecycleEventCallbackRequest callback) throws RemoteException { messageCount++; lastMessage = callback; processCallback(callback); this.notifyAll(); ! return false; } --- 141,150 ---- * @throws RemoteException */ ! public synchronized boolean callback(_lifecycleEventCallbackRequest callback) throws RemoteException { messageCount++; lastMessage = callback; processCallback(callback); this.notifyAll(); ! return true; } *************** *** 151,171 **** protected void processCallback(_lifecycleEventCallbackRequest callback) { BigInteger timestamp = callback.getTimestamp(); ! if (timestamp != null) { long utc = timestamp.longValue(); Date date = new Date(utc * 1000); out.println("time: " + date.toString()); } ApplicationStatusType status = callback.getStatus(); ! out.println("event: " + status.getState()); ! if (status.getStateInfo() != null) { ! out.println("info :" + status.getStateInfo()); ! } ! if (status.getExtendedState() != null) { ! MessageElement[] any = status.getExtendedState().get_any(); ! for (int i = 0; i < any.length; i++) { ! out.println(any[i].toString()); } } out.println(); } --- 156,185 ---- protected void processCallback(_lifecycleEventCallbackRequest callback) { BigInteger timestamp = callback.getTimestamp(); ! if ( timestamp != null ) { long utc = timestamp.longValue(); Date date = new Date(utc * 1000); out.println("time: " + date.toString()); } + URI app = callback.getApplicationReference(); + out.println("uri: " + ((app != null) ? app.toString() : "(null)")); + ApplicationStatusType status = callback.getStatus(); ! out.println("event: " ! + ((status != null) ? ! status.getState().toString() ! : "(null)")); ! if ( status != null ) { ! if ( status.getStateInfo() != null ) { ! out.println("info :" + status.getStateInfo()); ! } ! if ( status.getExtendedState() != null ) { ! MessageElement[] any = status.getExtendedState().get_any(); ! for ( int i = 0; i < any.length; i++ ) { ! out.println(any[i].toString()); ! } } } out.println(); + out.flush(); } *************** *** 180,184 **** public synchronized boolean blockForMessages(long timeout) throws InterruptedException { ! if (messageCount <= 0) { wait(timeout); } --- 194,198 ---- public synchronized boolean blockForMessages(long timeout) throws InterruptedException { ! if ( messageCount <= 0 ) { wait(timeout); } |