You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by di...@apache.org on 2004/10/29 16:44:58 UTC

svn commit: rev 55975 - in incubator/beehive/trunk/wsm/drt/tests: . org/apache/beehive/wsm/axis org/apache/beehive/wsm/jsr181/model org/apache/beehive/wsm/jsr181/model/fakeAnnotations org/apache/beehive/wsm/jsr181/processor/apt org/apache/beehive/wsm/jsr181/processor/reflection org/apache/beehive/wsm/jsr181/wsdl

Author: dims
Date: Fri Oct 29 07:44:57 2004
New Revision: 55975

Modified:
   incubator/beehive/trunk/wsm/drt/tests/Bar2.java
   incubator/beehive/trunk/wsm/drt/tests/Bar3.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebParamAnnotation.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface2Test.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface3Test.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterfaceTest.java
   incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java
Log:
- Fix imports
- Fix badtiger
- Fix drt failure

Modified: incubator/beehive/trunk/wsm/drt/tests/Bar2.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/Bar2.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/Bar2.java	Fri Oct 29 07:44:57 2004
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import javax.jws.WebService;
 import javax.jws.WebMethod;
+import javax.jws.WebService;
 
 /*******************************************************************************
  *

Modified: incubator/beehive/trunk/wsm/drt/tests/Bar3.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/Bar3.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/Bar3.java	Fri Oct 29 07:44:57 2004
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import javax.jws.WebService;
 import javax.jws.WebMethod;
+import javax.jws.WebService;
 
 /*******************************************************************************
  *

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java	Fri Oct 29 07:44:57 2004
@@ -19,20 +19,20 @@
  */
 package org.apache.beehive.wsm.axis;
 
-import junit.framework.TestCase;
-
 import javax.jws.WebParam;
 import javax.jws.soap.SOAPBinding;
 import javax.wsdl.OperationType;
-import org.apache.axis.description.ServiceDesc;
-//import org.apache.axis.description.JavaServiceDesc;
-import org.apache.axis.description.ParameterDesc;
+
+import junit.framework.TestCase;
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
 import org.apache.axis.description.OperationDesc;
-import org.apache.beehive.wsm.axis.badtiger.EnumWrapper;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+import org.apache.axis.description.ParameterDesc;
+import org.apache.axis.description.ServiceDesc;
+import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
 import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
 import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
 
 /*******************************************************************************
  * 
@@ -81,7 +81,7 @@
    
     public void testUse() throws Exception
     {
-        assertEquals(EnumWrapper.LITERAL, sd.getUse());
+        assertEquals(Use.LITERAL, sd.getUse());
     }
 
     public void testStyle() throws Exception
@@ -92,7 +92,7 @@
          * rather than living next to it as ParameterStyle does in jsr-181
          */
         //assertTrue(EnumWrapper.DOCUMENT.equals(sd.getStyle()));
-        assertEquals(EnumWrapper.WRAPPED, sd.getStyle());
+        assertEquals(Style.WRAPPED, sd.getStyle());
     }
 
 

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/DropInDeploymentHandlerTest.java
==============================================================================
--- 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/DropInDeploymentHandlerTest.java	Fri Oct 29 07:44:57 2004
@@ -20,33 +20,19 @@
 package org.apache.beehive.wsm.axis;
 
 import junit.framework.TestCase;
-
-import javax.jws.WebParam;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-
 import org.apache.axis.Message;
 import org.apache.axis.MessageContext;
-import org.apache.axis.description.ServiceDesc;
-import org.apache.axis.description.ParameterDesc;
-import org.apache.axis.description.OperationDesc;
 import org.apache.axis.handlers.soap.SOAPService;
 import org.apache.axis.message.RPCElement;
 import org.apache.axis.message.SOAPEnvelope;
 import org.apache.axis.server.AxisServer;
-import org.apache.beehive.wsm.axis.badtiger.EnumWrapper;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
 import org.apache.beehive.wsm.jsr181.wsdl.WSDLProcessor;
-
 import org.w3c.dom.Node;
 import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
-import org.xmlsoap.schemas.wsdl.TDefinitions;
-import org.xmlsoap.schemas.wsdl.TService;
 import org.xmlsoap.schemas.wsdl.TBinding;
 import org.xmlsoap.schemas.wsdl.TBindingOperation;
+import org.xmlsoap.schemas.wsdl.TDefinitions;
+import org.xmlsoap.schemas.wsdl.TService;
 import org.xmlsoap.schemas.wsdl.soap.TOperation;
 import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
 

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/FakeWebService.java	Fri Oct 29 07:44:57 2004
@@ -25,8 +25,6 @@
 import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPMessageHandler;
-import javax.jws.soap.SOAPMessageHandlers;
 
 
 /*******************************************************************************

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/ModeratelyComplexObject.java	Fri Oct 29 07:44:57 2004
@@ -20,9 +20,9 @@
 package org.apache.beehive.wsm.axis;
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
-import java.util.Collection;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/Jsr181ModelTest.java	Fri Oct 29 07:44:57 2004
@@ -19,7 +19,6 @@
  */
 
 import java.lang.annotation.Annotation;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -32,6 +31,7 @@
 import javax.jws.soap.SOAPBinding;
 import javax.jws.soap.SOAPMessageHandler;
 
+import junit.framework.TestCase;
 import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeHandlerChainAnnotation;
 import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeInitParamAnnotation;
 import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeOneWayAnnotation;
@@ -44,8 +44,6 @@
 import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebParamAnnotation;
 import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebResultAnnotation;
 import org.apache.beehive.wsm.jsr181.model.fakeAnnotations.FakeWebServiceAnnotation;
-
-import junit.framework.TestCase;
 
 //
 // TODO: test combination of type, method, annotation

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebParamAnnotation.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebParamAnnotation.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/model/fakeAnnotations/FakeWebParamAnnotation.java	Fri Oct 29 07:44:57 2004
@@ -4,7 +4,6 @@
 import java.lang.annotation.Annotation;
 
 import javax.jws.WebParam;
-import javax.jws.WebParam.Mode;
 /*
  * Copyright 2004 The Apache Software Foundation
  *

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorEndpointInterfaceTest.java	Fri Oct 29 07:44:57 2004
@@ -19,7 +19,6 @@
  */
 
 import com.sun.tools.apt.Main;
-
 import org.apache.beehive.wsm.jsr181.model.BarTestCase;
 import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
 import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorTest.java	Fri Oct 29 07:44:57 2004
@@ -19,7 +19,6 @@
  */
 
 import com.sun.tools.apt.Main;
-
 import org.apache.beehive.wsm.jsr181.model.FooTestCase;
 import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
 import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface2Test.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface2Test.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface2Test.java	Fri Oct 29 07:44:57 2004
@@ -19,7 +19,6 @@
  */
 
 import org.apache.beehive.wsm.jsr181.model.Bar2TestCase;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
 
 public class WsmAnnotationProcessorEndpointInterface2Test extends Bar2TestCase
 {

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface3Test.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface3Test.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterface3Test.java	Fri Oct 29 07:44:57 2004
@@ -19,7 +19,6 @@
  */
 
 import org.apache.beehive.wsm.jsr181.model.Bar3TestCase;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
 
 public class WsmAnnotationProcessorEndpointInterface3Test extends Bar3TestCase {
 

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterfaceTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterfaceTest.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/processor/reflection/WsmAnnotationProcessorEndpointInterfaceTest.java	Fri Oct 29 07:44:57 2004
@@ -19,8 +19,8 @@
  */
 
 import org.apache.beehive.wsm.jsr181.model.BarTestCase;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
 import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
+import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
 import org.apache.beehive.wsm.jsr181.processor.apt.WebServiceMetadataViewer;
 
 /**

Modified: incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java
==============================================================================
--- incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java	(original)
+++ incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessorTest.java	Fri Oct 29 07:44:57 2004
@@ -18,21 +18,21 @@
 package org.apache.beehive.wsm.jsr181.wsdl;
 
 import java.io.File;
+
+import junit.framework.TestCase;
 import org.apache.xmlbeans.XmlOptions;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
 import org.xmlsoap.schemas.wsdl.TBinding;
 import org.xmlsoap.schemas.wsdl.TBindingOperation;
 import org.xmlsoap.schemas.wsdl.TBindingOperationMessage;
-import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
 import org.xmlsoap.schemas.wsdl.TDefinitions;
-import org.xmlsoap.schemas.wsdl.TService;
 import org.xmlsoap.schemas.wsdl.TPort;
-import org.xmlsoap.schemas.wsdl.soap.TOperation;
+import org.xmlsoap.schemas.wsdl.TService;
 import org.xmlsoap.schemas.wsdl.soap.TAddress;
-import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
 import org.xmlsoap.schemas.wsdl.soap.TBody;
+import org.xmlsoap.schemas.wsdl.soap.TOperation;
+import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
 import org.xmlsoap.schemas.wsdl.soap.UseChoice;
-import junit.framework.TestCase;
 
 
 /*******************************************************************************