Author: dolander
Date: Wed Mar 16 08:05:14 2005
New Revision: 157763
URL: http://svn.apache.org/viewcvs?view=rev&rev=157763
Log:
Fix the DRT break in AxisHookTest
A bit of import cleanup in a few files
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java
Modified:
incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/tests/org/apache/beehive/wsm/axis/AxisHookTest.java?view=diff&r1=157762&r2=157763
==============================================================================
---
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
Wed Mar 16 08:05:14 2005
@@ -90,7 +90,7 @@
}
public void testTwoWayOperation() throws Exception {
- OperationDesc twoWayOp = sd.getOperationByName(WM_OPERATION);
+ OperationDesc twoWayOp = sd.getOperationByName(WM_JAVAMETHODNAME);
assertNotNull(twoWayOp);
if (twoWayOp != null) {
assertEquals(WM_ACTION, twoWayOp.getSoapAction());
@@ -108,7 +108,7 @@
}
public void testOneWayOperation() throws Exception {
- OperationDesc oneWayOp = sd.getOperationByName(WM_ONEWAY +
WM_OPERATION);
+ OperationDesc oneWayOp =
sd.getOperationByName(WM_JAVAONEWAYMETHODNAME);
assertNotNull(oneWayOp);
if (oneWayOp != null) {
assertEquals(WM_ONEWAY + WM_ACTION, oneWayOp.getSoapAction());
@@ -188,4 +188,4 @@
//do nothing
}
}
-}
\ No newline at end of file
+}
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java?view=diff&r1=157762&r2=157763
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
Wed Mar 16 08:05:14 2005
@@ -15,43 +15,14 @@
*/
package org.apache.beehive.wsm.axis;
-import java.io.File;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.rmi.Remote;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.jws.WebParam;
-import javax.wsdl.OperationType;
-import javax.xml.namespace.QName;
-
import org.apache.axis.constants.Style;
import org.apache.axis.constants.Use;
-import org.apache.axis.description.ElementDesc;
-import org.apache.axis.description.FaultDesc;
-import org.apache.axis.description.FieldDesc;
-import org.apache.axis.description.JavaServiceDesc;
-import org.apache.axis.description.OperationDesc;
-import org.apache.axis.description.ParameterDesc;
-import org.apache.axis.description.ServiceDesc;
-import org.apache.axis.description.TypeDesc;
-import org.apache.axis.encoding.DeserializerFactory;
-import org.apache.axis.encoding.SerializerFactory;
-import org.apache.axis.encoding.TypeMapping;
-import org.apache.axis.encoding.TypeMappingDelegate;
-import org.apache.axis.encoding.TypeMappingImpl;
-import org.apache.axis.encoding.TypeMappingRegistry;
-import org.apache.axis.encoding.TypeMappingRegistryImpl;
+import org.apache.axis.description.*;
+import org.apache.axis.encoding.*;
import org.apache.axis.encoding.ser.ArrayDeserializerFactory;
import org.apache.axis.encoding.ser.ArraySerializerFactory;
import org.apache.axis.encoding.ser.BeanDeserializerFactory;
import org.apache.axis.encoding.ser.BeanSerializerFactory;
-import org.apache.axis.encoding.ser.VectorDeserializerFactory;
import org.apache.axis.utils.BeanPropertyDescriptor;
import org.apache.axis.wsdl.fromJava.Namespaces;
import org.apache.axis.wsdl.fromJava.Types;
@@ -61,12 +32,22 @@
import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.jsr181.SOAPBindingInfo;
import org.apache.beehive.wsm.jsr181.util.InvalidTypeMappingException;
-
import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlObject;
+import javax.jws.WebParam;
+import javax.wsdl.OperationType;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.rmi.Remote;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
/**
* ****************************************************************************
*
@@ -480,9 +461,9 @@
use = sbi.getUse();
paramStyle = sbi.getParameterStyle();
}
- if (style == style.RPC) {
+ if (style == javax.jws.soap.SOAPBinding.Style.RPC) {
sd.setStyle(Style.RPC);
- if (use == use.ENCODED) {
+ if (use == javax.jws.soap.SOAPBinding.Use.ENCODED) {
sd.setUse(Use.ENCODED);
} else {
sd.setUse(Use.LITERAL);
@@ -495,7 +476,7 @@
sd.setUse(Use.LITERAL);
// check if this is a wrapped document literal
- if (paramStyle == paramStyle.WRAPPED) {
+ if (paramStyle ==
javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED) {
sd.setStyle(Style.WRAPPED);
} else {
// just regular document style
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java?view=diff&r1=157762&r2=157763
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/BeehiveWsTypeMetadata.java
Wed Mar 16 08:05:14 2005
@@ -18,28 +18,12 @@
* $Header:$Factory
*/
-import java.io.IOException;
+import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
+
import java.net.URL;
import java.util.Collection;
import java.util.List;
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-
-import javax.jws.security.SecurityIdentity;
-import javax.jws.security.SecurityRoles;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPMessageHandler;
-import javax.jws.soap.SOAPMessageHandlers;
-
-import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
-
-//import org.apache.xmlbeans.XmlException;
-
-import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
-import org.apache.beehive.wsm.jsr181.model.jsr181.SecurityRolesInfo;
-
/**
* @author Daryoush
*/
@@ -84,7 +68,7 @@
public abstract BeehiveWsMethodMetadata getMethod(String methodName,
Class... paramTypes);
/**
- * @throws ValidateException if duplicate methods are encountered or if a
+ * @throws ValidationException if duplicate methods are encountered or if a
* Document style service attempts to overload methods.
*/
void addMethod(BeehiveWsMethodMetadata method) throws ValidationException;
Modified:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java?view=diff&r1=157762&r2=157763
==============================================================================
---
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java
(original)
+++
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/jsr181/Jsr181TypeMetadataImpl.java
Wed Mar 16 08:05:14 2005
@@ -18,22 +18,12 @@
* $Header:$Factory
*/
-import java.io.File;
-
-import java.lang.annotation.Annotation;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.apache.beehive.wsm.jsr181.model.*;
+import org.apache.beehive.wsm.jsr181.model.java.JavaMethodInfo;
+import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import javax.jws.HandlerChain;
import javax.jws.WebMethod;
@@ -43,24 +33,12 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPMessageHandler;
import javax.jws.soap.SOAPMessageHandlers;
-
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsParameterMetadata;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSOAPMessageHandlerInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsSecurityRolesInfo;
-import org.apache.beehive.wsm.jsr181.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.jsr181.model.ValidationException;
-
-import org.apache.beehive.wsm.jsr181.model.java.JavaTypeInfo;
-import org.apache.beehive.wsm.jsr181.model.java.JavaMethodInfo;
+import java.io.File;
+import java.lang.annotation.Annotation;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
/**
*
@@ -393,10 +371,10 @@
* or file:/...) first, then relative to basePath. This method does not
use
* class loaders since it needs to work with source files as well as with
* (binary) class files.
- * @resourcePath the path of the resource, either absolute or relative
+ * @param resourcePath the path of the resource, either absolute or
relative
* (to basePath).
- * @basePath only required when resourcePath is relative.
- * @returns URL of resource.
+ * @param basePath only required when resourcePath is relative.
+ * @return URL of resource.
*/
private URL findResource(String resourcePath, File basePath) {
