From: Steve L. <st...@us...> - 2004-11-01 17:12:34
|
Update of /cvsroot/smartfrog/core/components/cddlm/test/org/smartfrog/services/cddlm/test/system/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2090/components/cddlm/test/org/smartfrog/services/cddlm/test/system/console Modified Files: CallbackTest.java DeployTest.java DeployingTestBase.java ListenTest.java Log Message: Update Axis; update WSDL; patch the source to deal with these changes Index: DeployingTestBase.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/test/org/smartfrog/services/cddlm/test/system/console/DeployingTestBase.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DeployingTestBase.java 14 Oct 2004 17:01:14 -0000 1.9 --- DeployingTestBase.java 1 Nov 2004 17:12:16 -0000 1.10 *************** *** 30,36 **** import org.smartfrog.services.cddlm.generated.api.types.ApplicationStatusType; import org.smartfrog.services.cddlm.generated.api.types.DeploymentDescriptorType; import org.smartfrog.services.cddlm.generated.api.types.LifecycleStateEnum; import org.smartfrog.services.cddlm.generated.api.types.NotificationInformationType; - import org.smartfrog.services.cddlm.generated.api.types._deploymentDescriptorType_body; import javax.xml.namespace.QName; --- 30,36 ---- import org.smartfrog.services.cddlm.generated.api.types.ApplicationStatusType; import org.smartfrog.services.cddlm.generated.api.types.DeploymentDescriptorType; + import org.smartfrog.services.cddlm.generated.api.types.DeploymentDescriptorTypeBody; import org.smartfrog.services.cddlm.generated.api.types.LifecycleStateEnum; import org.smartfrog.services.cddlm.generated.api.types.NotificationInformationType; import javax.xml.namespace.QName; *************** *** 75,79 **** String search) throws Exception { ! _deploymentDescriptorType_body body = dt.getBody(); assertNotNull("data null", body); final org.apache.axis.message.MessageElement[] any = body.get_any(); --- 75,79 ---- String search) throws Exception { ! DeploymentDescriptorTypeBody body = dt.getBody(); assertNotNull("data null", body); final org.apache.axis.message.MessageElement[] any = body.get_any(); Index: CallbackTest.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/test/org/smartfrog/services/cddlm/test/system/console/CallbackTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CallbackTest.java 26 Oct 2004 16:21:41 -0000 1.4 --- CallbackTest.java 1 Nov 2004 17:12:16 -0000 1.5 *************** *** 22,32 **** import org.apache.axis.AxisFault; import org.apache.axis.types.URI; import org.smartfrog.services.cddlm.api.CallbackProcessor; import org.smartfrog.services.cddlm.api.Processor; - import org.smartfrog.services.cddlm.api.CallbackInfo; import org.smartfrog.services.cddlm.generated.api.DeployApiConstants; import org.smartfrog.services.cddlm.generated.api.types.DeploymentDescriptorType; import org.smartfrog.services.cddlm.generated.api.types.NotificationInformationType; ! import org.smartfrog.services.cddlm.generated.api.types._setNotificationRequest; /** --- 22,32 ---- import org.apache.axis.AxisFault; import org.apache.axis.types.URI; + import org.smartfrog.services.cddlm.api.CallbackInfo; import org.smartfrog.services.cddlm.api.CallbackProcessor; import org.smartfrog.services.cddlm.api.Processor; import org.smartfrog.services.cddlm.generated.api.DeployApiConstants; import org.smartfrog.services.cddlm.generated.api.types.DeploymentDescriptorType; import org.smartfrog.services.cddlm.generated.api.types.NotificationInformationType; ! import org.smartfrog.services.cddlm.generated.api.types.SetNotificationRequest; /** *************** *** 96,100 **** NotificationInformationType callbackInfo = new NotificationInformationType(); callbackInfo.setType(null); ! _setNotificationRequest request = new _setNotificationRequest(application, callbackInfo); operation.setNotification(request); --- 96,101 ---- NotificationInformationType callbackInfo = new NotificationInformationType(); callbackInfo.setType(null); ! SetNotificationRequest request = new SetNotificationRequest( ! application, callbackInfo); operation.setNotification(request); *************** *** 108,112 **** public void testNoCallbackIsAllowed() throws Exception { ! _setNotificationRequest request = new _setNotificationRequest( application, null); --- 109,113 ---- public void testNoCallbackIsAllowed() throws Exception { ! SetNotificationRequest request = new SetNotificationRequest( application, null); *************** *** 119,123 **** callbackInfo.setType( DeployApiConstants.URI_CALLBACK_WS_NOTIFICATION); ! _setNotificationRequest request = new _setNotificationRequest( application, callbackInfo); --- 120,124 ---- callbackInfo.setType( DeployApiConstants.URI_CALLBACK_WS_NOTIFICATION); ! SetNotificationRequest request = new SetNotificationRequest( application, callbackInfo); Index: DeployTest.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/test/org/smartfrog/services/cddlm/test/system/console/DeployTest.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** DeployTest.java 26 Oct 2004 16:21:42 -0000 1.15 --- DeployTest.java 1 Nov 2004 17:12:16 -0000 1.16 *************** *** 170,178 **** OptionType option = options.createNamedOption( new URI("http://localhost/1"), true); ! assertTrue(option.isMustUnderstand()); option = options.createNamedOption(new URI("http://localhost/2"), false); ! assertFalse(option.isMustUnderstand()); OptionMapType map = options.toOptionMap(); assertEquals("map size is two", 2, map.getOption().length); --- 170,178 ---- OptionType option = options.createNamedOption( new URI("http://localhost/1"), true); ! assertTrue(option.getMustUnderstand().booleanValue()); option = options.createNamedOption(new URI("http://localhost/2"), false); ! assertFalse(option.getMustUnderstand().booleanValue()); OptionMapType map = options.toOptionMap(); assertEquals("map size is two", 2, map.getOption().length); Index: ListenTest.java =================================================================== RCS file: /cvsroot/smartfrog/core/components/cddlm/test/org/smartfrog/services/cddlm/test/system/console/ListenTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ListenTest.java 14 Oct 2004 17:01:14 -0000 1.3 --- ListenTest.java 1 Nov 2004 17:12:16 -0000 1.4 *************** *** 29,34 **** import org.smartfrog.services.cddlm.generated.api.types.ApplicationStatusType; import org.smartfrog.services.cddlm.generated.api.types.DeploymentDescriptorType; import org.smartfrog.services.cddlm.generated.api.types.LifecycleStateEnum; - import org.smartfrog.services.cddlm.generated.api.types._lifecycleEventRequest; import java.io.IOException; --- 29,34 ---- import org.smartfrog.services.cddlm.generated.api.types.ApplicationStatusType; import org.smartfrog.services.cddlm.generated.api.types.DeploymentDescriptorType; + import org.smartfrog.services.cddlm.generated.api.types.LifecycleEventRequest; import org.smartfrog.services.cddlm.generated.api.types.LifecycleStateEnum; import java.io.IOException; *************** *** 78,83 **** new URL(url), null); callback.setTimeout(2 * 60 * 1000); ! _lifecycleEventRequest message; ! message = new _lifecycleEventRequest(); boolean result = callback.notification(message); assertFalse("Expected failure", result); --- 78,83 ---- new URL(url), null); callback.setTimeout(2 * 60 * 1000); ! LifecycleEventRequest message; ! message = new LifecycleEventRequest(); boolean result = callback.notification(message); assertFalse("Expected failure", result); *************** *** 96,101 **** new URL(url), null); callback.setTimeout(2 * 60 * 1000); ! _lifecycleEventRequest message; ! message = new _lifecycleEventRequest(); message.setIdentifier(key); boolean result = callback.notification(message); --- 96,101 ---- new URL(url), null); callback.setTimeout(2 * 60 * 1000); ! LifecycleEventRequest message; ! message = new LifecycleEventRequest(); message.setIdentifier(key); boolean result = callback.notification(message); *************** *** 143,147 **** private void assertTerminationMessageReceived() { ! _lifecycleEventRequest message = listen.getLastMessage(); assertNotNull(message); ApplicationStatusType status = message.getStatus(); --- 143,147 ---- private void assertTerminationMessageReceived() { ! LifecycleEventRequest message = listen.getLastMessage(); assertNotNull(message); ApplicationStatusType status = message.getStatus(); |