You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2004/12/03 00:41:50 UTC
svn commit: r109594 - in incubator/beehive/trunk/wsm: drt/tests/org/apache/beehive/wsm/axis src/runtime/org/apache/beehive/wsm/axis
Author: mmerz
Date: Thu Dec 2 15:41:48 2004
New Revision: 109594
URL: http://svn.apache.org/viewcvs?view=rev&rev=109594
Log:
Removed deprecated DropInDeploymentHandler and migrated test case to test new AnnotatedWebServiceDeploymentHandler.
Added:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java
- copied, changed from r109527, incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
Removed:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java
Copied: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java (from r109527, incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java?view=diff&rev=109594&p1=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java&r1=109527&p2=incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java&r2=109594
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java (original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandlerTest.java Thu Dec 2 15:41:48 2004
@@ -1,9 +1,8 @@
+package org.apache.beehive.wsm.axis;
+
/*
- * DropInDeploymentHandlerTest.java
- *
* Copyright 2001-2004 The Apache Software Foundation.
*
- *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -17,8 +16,6 @@
* limitations under the License.
*
*/
-package org.apache.beehive.wsm.axis;
-
import junit.framework.TestCase;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
@@ -44,73 +41,19 @@
*
* @author Jonathan Colwell
*/
-public class DropInDeploymentHandlerTest extends TestCase {
+public class AnnotatedWebServiceDeploymentHandlerTest extends TestCase {
SOAPService fakeSOAPService;
public void setUp() throws Exception {
- DropInDeploymentHandler didh = new DropInDeploymentHandler();
- fakeSOAPService = didh
- .createSOAPServiceFromAnnotatedClass(FakeWebService.class);
+ AnnotatedWebServiceDeploymentHandler hdlr =
+ new AnnotatedWebServiceDeploymentHandler();
+ fakeSOAPService = hdlr.getSOAPService(FakeWebService.class);
}
public void tearDown() {
}
- /*
- * FIXME jcolwell@bea.com 2004-Sep-21 --
- * examine the generated WSDL to see that it matches the settings in
- * FakeWebService. For the moment, just having at least one
- * operation and the correct name is sufficient.
- *
- * NOTE jcolwell@bea.com 2004-Nov-29 -- commented out until the WSDLProcessor
- * is refactored to properly support both WSDL parsing and generation.
- *
- public void testGenerateWSDL() throws Exception {
- MessageContext mc = new MessageContext(null);
- mc.setService(fakeSOAPService);
- fakeSOAPService.generateWSDL(mc);
- Node doc = (Node) mc.getProperty("WSDL");
- assertNotNull(doc);
- if (doc != null) {
- DefinitionsDocument defDoc = DefinitionsDocument.Factory.parse(doc);
- assertNotNull(defDoc);
- if (defDoc != null) {
- TDefinitions tDefs = defDoc.getDefinitions();
- assertNotNull(tDefs);
- if (tDefs != null) {
- assertEquals("http://fake.target.namespace/",
- tDefs.getTargetNamespace());
- TService tSrv = tDefs.getServiceArray(0);
- assertNotNull(tSrv);
- if (tSrv != null) {
- assertEquals("FakeServiceName", tSrv.getName());
- }
- TBinding tBind = tDefs.getBindingArray(0);
- assertNotNull(tBind);
- if (tBind != null) {
- org.xmlsoap.schemas.wsdl.soap.TBinding[] tSoapBinding =
- WSDLProcessor.getSOAPBinding(tBind);
- assertEquals(TStyleChoice.RPC, tSoapBinding[0]
- .getStyle());
- TBindingOperation[] tBops = tBind.getOperationArray();
- assertTrue(tBind.sizeOfOperationArray() == 2);
- assertEquals("doInvocation", tBops[0].getName());
- assertNotNull(tBops[0].getOutput());
- TOperation[] soapOps = WSDLProcessor
- .getSOAPOperations(tBops[0]);
- assertTrue(soapOps.length > 0);
- assertEquals("invocationAction",
- soapOps[0].getSoapAction());
- assertEquals("processThingy", tBops[1].getName());
- assertNull(tBops[1].getOutput());
- }
- }
- }
- }
- }
-*/
-
public void testInvokeSOAPService() throws Exception {
MessageContext mc = new MessageContext(new AxisServer());
SOAPEnvelope env = new SOAPEnvelope();
@@ -121,7 +64,8 @@
Message msg = mc.getResponseMessage();
msg.saveChanges();
assertNotNull(msg);
- if (msg != null) {
+ if (null != msg)
+ {
Node n = msg.getSOAPBody().getFirstChild();
System.out.println(n);
assertEquals("doInvocationResponse", n.getLocalName());
Deleted: /incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java?view=auto&rev=109593
==============================================================================
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java?view=diff&rev=109594&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java&r1=109593&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java&r2=109594
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java Thu Dec 2 15:41:48 2004
@@ -1,8 +1,6 @@
package org.apache.beehive.wsm.axis;
/*
- * DropInDeploymentHandler.java
- *
* Copyright 2001-2004 The Apache Software Foundation.
*
*
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java?view=diff&rev=109594&p1=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java&r1=109593&p2=incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java&r2=109594
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AuthenticationHandler.java Thu Dec 2 15:41:48 2004
@@ -1,8 +1,6 @@
package org.apache.beehive.wsm.axis.handlers;
/*
- * DropInDeploymentHandler.java
- *
* Copyright 2001-2004 The Apache Software Foundation.
*
*
Deleted: /incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java?view=auto&rev=109593
==============================================================================