You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/06/01 22:53:22 UTC
svn commit: r179419 [1/6] - in /incubator/beehive/trunk/wsm/src:
api/javax/jws/ api/javax/jws/soap/ runtime/org/apache/beehive/wsm/axis/
runtime/org/apache/beehive/wsm/axis/ant/
runtime/org/apache/beehive/wsm/axis/databinding/
runtime/org/apache/beehive/wsm/axis/handlers/
runtime/org/apache/beehive/wsm/axis/registration/
runtime/org/apache/beehive/wsm/axis/security/
runtime/org/apache/beehive/wsm/axis/security/model/
runtime/org/apache/beehive/wsm/axis/tools/
runtime/org/apache/beehive/wsm/axis/util/
runtime/org/apache/beehive/wsm/axis/util/encoding/
runtime/org/apache/beehive/wsm/databinding/
runtime/org/apache/beehive/wsm/databinding/xmlbeans/
runtime/org/apache/beehive/wsm/model/
runtime/org/apache/beehive/wsm/model/java/
runtime/org/apache/beehive/wsm/model/jsr181/
runtime/org/apache/beehive/wsm/model/wsdl/
runtime/org/apache/beehive/wsm/processor/
runtime/org/apache/beehive/wsm/processor/apt/
runtime/org/apache/beehive/wsm/registration/
runtime/org/apache/beehive/wsm/util/ runtime/org/apache/beehive/wsm/wsdl/
runtime/schema/
Author: ekoneil
Date: Wed Jun 1 13:53:19 2005
New Revision: 179419
URL: http://svn.apache.org/viewcvs?rev=179419&view=rev
Log:
Code formatting -- makes WSM consistent with one style.
Some additional changes are coming.
BB: self
DRT: WSM pass
Modified:
incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java
incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java
incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java
incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java
incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java
incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java
incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java
incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDLFilter.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Group.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Role.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/SecurityModel.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/User.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/UserList.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/AxisSecurityModel.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/BeehiveMemorySecurityModel.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryGroupImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryRoleImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserListImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/ServletSecurityModel.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/DebugPrintMessageHandler.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/BindingLookupService.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/GenericHolder.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsParameterMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPBindingInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSecurityRolesInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java
incubator/beehive/trunk/wsm/src/runtime/schema/beehive-role.xsd
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/HandlerChain.java Wed Jun 1 13:53:19 2005
@@ -15,10 +15,10 @@
*/
package javax.jws;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.TYPE)
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/Oneway.java Wed Jun 1 13:53:19 2005
@@ -15,10 +15,10 @@
*/
package javax.jws;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.METHOD)
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebMethod.java Wed Jun 1 13:53:19 2005
@@ -15,10 +15,10 @@
*/
package javax.jws;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.METHOD)
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebParam.java Wed Jun 1 13:53:19 2005
@@ -15,10 +15,10 @@
*/
package javax.jws;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.PARAMETER)
@@ -33,5 +33,7 @@
public enum Mode {
IN, OUT, INOUT
- };
+ }
+
+ ;
}
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebResult.java Wed Jun 1 13:53:19 2005
@@ -15,10 +15,10 @@
*/
package javax.jws;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.METHOD)
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/WebService.java Wed Jun 1 13:53:19 2005
@@ -15,10 +15,10 @@
*/
package javax.jws;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.TYPE)
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPBinding.java Wed Jun 1 13:53:19 2005
@@ -15,10 +15,10 @@
*/
package javax.jws.soap;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.TYPE)
@@ -31,13 +31,19 @@
public enum ParameterStyle {
BARE, WRAPPED
- };
+ }
+
+ ;
public enum Style {
DOCUMENT, RPC
- };
+ }
+
+ ;
public enum Use {
LITERAL, ENCODED
- };
+ }
+
+ ;
}
Modified: incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java (original)
+++ incubator/beehive/trunk/wsm/src/api/javax/jws/soap/SOAPMessageHandlers.java Wed Jun 1 13:53:19 2005
@@ -15,10 +15,10 @@
*/
package javax.jws.soap;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.TYPE)
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?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- 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 Jun 1 13:53:19 2005
@@ -15,17 +15,41 @@
*/
package org.apache.beehive.wsm.axis;
+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;
+import javax.jws.WebParam;
+import javax.jws.soap.SOAPBinding;
+import javax.wsdl.OperationType;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.holders.Holder;
+
import org.apache.axis.constants.Style;
import org.apache.axis.constants.Use;
-import org.apache.axis.description.*;
-import org.apache.axis.encoding.*;
+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.TypeMappingRegistry;
+import org.apache.axis.encoding.TypeMappingRegistryImpl;
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.utils.BeanPropertyDescriptor;
import org.apache.axis.utils.BeanUtils;
-import org.apache.axis.utils.JavaUtils;
import org.apache.axis.wsdl.fromJava.Namespaces;
import org.apache.axis.wsdl.fromJava.Types;
import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
@@ -37,40 +61,25 @@
import org.apache.beehive.wsm.model.BeehiveWsParameterMetadata;
import org.apache.beehive.wsm.model.BeehiveWsSOAPBindingInfo;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.util.InvalidTypeMappingException;
import org.apache.beehive.wsm.registration.TypeRegistrar;
+import org.apache.beehive.wsm.util.InvalidTypeMappingException;
import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlObject;
-import javax.jws.WebParam;
-import javax.jws.soap.SOAPBinding;
-import javax.wsdl.OperationType;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.holders.Holder;
-
-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;
-
/**
* ****************************************************************************
- *
+ *
* @author Jonathan Colwell
*/
public class AxisHook {
static Logger logger = Logger.getLogger(AxisHook.class);
- public static ServiceDesc createServiceDesc(BeehiveWsTypeMetadata wsm,
- ClassLoader cl) throws ClassNotFoundException,
- NoSuchMethodException, InvalidTypeMappingException {
+ public static ServiceDesc createServiceDesc(BeehiveWsTypeMetadata wsm, ClassLoader cl)
+ throws ClassNotFoundException, InvalidTypeMappingException {
+
JavaServiceDesc sd = new JavaServiceDesc();
- if (null == cl) {
+ if(null == cl) {
/*
* NOTE jcolwell@bea.com 2004-Aug-30 -- if no classloader was
* provided, use the one that loaded this Class
@@ -81,7 +90,7 @@
// Create a list of the allowed methods
List<String> allowedMethods = new ArrayList<String>();
- for (BeehiveWsMethodMetadata meth : wsm.getMethods()) {
+ for(BeehiveWsMethodMetadata meth : wsm.getMethods()) {
String method = meth.getJavaMethodName();
allowedMethods.add(method);
}
@@ -95,9 +104,8 @@
configureSoapBinding(sd, wsm.getSoapBinding());
TypeMappingRegistry tmr = new TypeMappingRegistryImpl(true);
- TypeMapping tm = tmr
- .getOrMakeTypeMapping(sd.getUse() == Use.ENCODED ? "http://schemas.xmlsoap.org/soap/encoding/" //"encoded"
- : "");
+ TypeMapping tm = tmr.getOrMakeTypeMapping
+ (sd.getUse() == Use.ENCODED ? "http://schemas.xmlsoap.org/soap/encoding/" : "");
sd.setTypeMappingRegistry(tmr);
sd.setTypeMapping(tm);
@@ -112,41 +120,41 @@
sd.getOperations();
// Walk the methods
- for (BeehiveWsMethodMetadata meth : wsm.getMethods()) {
+ for(BeehiveWsMethodMetadata meth : wsm.getMethods()) {
String operationName = meth.getWmOperationName();
- if (null != operationName && 0 < operationName.length()) {
+ if(null != operationName && 0 < operationName.length()) {
// set the Operations properties
OperationDesc od = sd.getOperationByName(meth
- .getJavaMethodName());
+ .getJavaMethodName());
od.setElementQName(new QName(targetNamespace, operationName));
od.setName(operationName);
od.setSoapAction(meth.getWmAction());
- if (meth.isOneWay()) {
+ if(meth.isOneWay()) {
od.setMep(OperationType.ONE_WAY);
- } else {
- String namespace = "" ;
- // namespace only should be added for document style, RPC style doesn't need name space for return type.
- if( wsm.getSoapBinding().getStyle() == SOAPBinding.Style.DOCUMENT) namespace = meth.getWrTargetNamespace();
- od.setReturnQName(new QName(namespace,
- meth.getWrName()));
+ }
+ else {
+ String namespace = "";
+ // namespace only should be added for document style, RPC style doesn't need name space for return type.
+ if(wsm.getSoapBinding().getStyle() == SOAPBinding.Style.DOCUMENT)
+ namespace = meth.getWrTargetNamespace();
+
+ od.setReturnQName(new QName(namespace, meth.getWrName()));
final Class returnType = meth.getJavaReturnType();
- QName qn = configureTypeMapping(sd, returnType, meth
- .getWrTargetNamespace());
+ QName qn = configureTypeMapping(sd, returnType, meth.getWrTargetNamespace());
od.setReturnType(qn);
od.setReturnClass(returnType);
}
// process the parameters
int pcnt = 0;
- for (BeehiveWsParameterMetadata param : meth.getParams()) {
+ for(BeehiveWsParameterMetadata param : meth.getParams()) {
ParameterDesc pd = od.getParameter(pcnt++);
final Class paramType = param.getJavaType();
- if (pd.getTypeQName() == null) { // set the typeQName if
+ if(pd.getTypeQName() == null) { // set the typeQName if
// it is not set
// already.
- QName typeQName = configureTypeMapping(sd, paramType,
- param.getWpTargetNamespace());
+ QName typeQName = configureTypeMapping(sd, paramType, param.getWpTargetNamespace());
/*
* jongjinchoi@apache.org 2005-Mar-16 -- The typeQName
* from configureTypeMapping() is not dummy. This is
@@ -157,35 +165,34 @@
}
// set QName
- String namespace = "" ;
- // namespace only should be added for document style, RPC style doesn't need name space for parameter names.
- if( wsm.getSoapBinding().getStyle() == SOAPBinding.Style.DOCUMENT) namespace = param.getWpTargetNamespace();
- QName paramQName = new QName(namespace,
- param.getWpName());
+ String namespace = "";
+ // namespace only should be added for document style, RPC style doesn't need name space for parameter names.
+ if(wsm.getSoapBinding().getStyle() == SOAPBinding.Style.DOCUMENT)
+ namespace = param.getWpTargetNamespace();
+ QName paramQName = new QName(namespace, param.getWpName());
pd.setQName(paramQName);
// set Mode
final boolean header = param.isWpHeader();
final WebParam.Mode mode = param.getWpMode();
- switch (mode) {
- case IN:
- pd.setMode(ParameterDesc.IN);
- pd.setInHeader(header);
- pd.setOutHeader(false);
- break;
- case OUT:
- pd.setMode(ParameterDesc.OUT);
- pd.setInHeader(false);
- pd.setOutHeader(header);
- break;
- case INOUT:
- pd.setMode(ParameterDesc.INOUT);
- pd.setInHeader(header);
- pd.setOutHeader(header);
- break;
- default:
- throw new IllegalArgumentException(
- "Illegal value for WebParam.Mode: " + mode);
+ switch(mode) {
+ case IN:
+ pd.setMode(ParameterDesc.IN);
+ pd.setInHeader(header);
+ pd.setOutHeader(false);
+ break;
+ case OUT:
+ pd.setMode(ParameterDesc.OUT);
+ pd.setInHeader(false);
+ pd.setOutHeader(header);
+ break;
+ case INOUT:
+ pd.setMode(ParameterDesc.INOUT);
+ pd.setInHeader(header);
+ pd.setOutHeader(header);
+ break;
+ default:
+ throw new IllegalArgumentException("Illegal value for WebParam.Mode: " + mode);
}
// set JavaType
@@ -194,17 +201,16 @@
// set Exceptions
Method javaMethod = od.getMethod();
- for (Class thrown : javaMethod.getExceptionTypes()) {
+ for(Class thrown : javaMethod.getExceptionTypes()) {
FaultDesc fd = od.getFaultByClass(thrown);
- if (null == fd) {
- logger
- .info("Exception: "
- + thrown.getCanonicalName()
- + " is not picked up by the Axis, only non Remote and Application Specific exceptions are registed in Axis. This is not a fatal error.");
+ if(null == fd) {
+ logger.info("Exception: "
+ + thrown.getCanonicalName()
+ + " is not picked up by the Axis, only non Remote and Application Specific exceptions are registed in Axis. This is not a fatal error.");
continue;
}
QName qname = configureTypeMapping(sd, thrown, meth
- .getWrTargetNamespace());
+ .getWrTargetNamespace());
fd.setXmlType(qname);
fd.setQName(qname);
fd.setComplex(true);
@@ -218,7 +224,7 @@
* This method will return a boolean value indicating that Activation is
* enabled. Activation requires the DataHandler and the Multipart Classes to
* both be found.
- *
+ *
* @return boolean indicating that Activation is enabled.
*/
private static boolean isActivationEnabled() {
@@ -228,14 +234,15 @@
/**
* This will return the Class for the DataHandler. This will return null if
* the DataHandler is not available.
- *
+ *
* @return The DataHandler Class or null if the DataHandler is not found
*/
private static Class getDataHandlerClass() {
try {
return AxisHook.class.getClassLoader().loadClass(
- "javax.activation.DataHandler");
- } catch (ClassNotFoundException e) {
+ "javax.activation.DataHandler");
+ }
+ catch(ClassNotFoundException e) {
// ignore the class was not found
}
return null;
@@ -244,35 +251,37 @@
/**
* This will return the Class for the MimeMultipart handler. It will return
* null if the MimMultipart class is not available.
- *
+ *
* @return The MimeMultipart Class or null if the DataHandler is not found.
*/
private static Class getMultipartClass() {
try {
return AxisHook.class.getClassLoader().loadClass(
- "javax.mail.internet.MimeMultipart");
- } catch (ClassNotFoundException e) {
+ "javax.mail.internet.MimeMultipart");
+ }
+ catch(ClassNotFoundException e) {
// ignore the class was not found
}
return null;
}
private static QName configureTypeMapping(ServiceDesc desc, Class type,
- String defaultNameSpace) throws InvalidTypeMappingException {
+ String defaultNameSpace)
+ throws InvalidTypeMappingException {
try {
- if (Void.TYPE.equals(type))
+ if(Void.TYPE.equals(type))
return null;
-
+
// // If type is holder or it is generic holder, strip it to its base type
// type = TypeRegistrar.getUnderlyingType(type);
-//
- if (AxisTypeMappingMetaData.isBuiltInType(type))
+//
+ if(AxisTypeMappingMetaData.isBuiltInType(type))
return AxisTypeMappingMetaData.getBuiltInTypeQname(type);
-
- if(Holder.class.isAssignableFrom(type )) {
+
+ if(Holder.class.isAssignableFrom(type)) {
type = TypeRegistrar.getHoldersValueClass(type);
- // NOTE: May need to register the holder type also.
- }
+ // NOTE: May need to register the holder type also.
+ }
// if type needs to be registered
TypeMapping tm = desc.getTypeMapping();
@@ -297,36 +306,37 @@
BindingLookupService lookupService = new SystemTypeLookupService(); // move this to the constructor
QName q = lookupService.class2qname(type, defaultNameSpace);
-
- if (type.isArray()) {
+
+ if(type.isArray()) {
/*
* jongjinchoi@apache.org 2005-Mar-16 -- don't register array
* serializer in document(bare or wrapped)/literal mode.
*/
- if (!tm.isRegistered(type, q) && desc.getStyle() == Style.RPC
- && desc.getUse() == Use.ENCODED) {
+ if(!tm.isRegistered(type, q) && desc.getStyle() == Style.RPC
+ && desc.getUse() == Use.ENCODED) {
tm.register(type, q, new ArraySerializerFactory(type, q),
- new ArrayDeserializerFactory());
+ new ArrayDeserializerFactory());
}
QName qcomp = configureTypeMapping(desc, type
- .getComponentType(), defaultNameSpace);
- if (desc.getUse() == Use.LITERAL) {
+ .getComponentType(), defaultNameSpace);
+ if(desc.getUse() == Use.LITERAL) {
q = qcomp;
}
- } else if (!tm.isRegistered(type, q)) {
- if (XmlObject.class.isAssignableFrom(type)) {
+ }
+ else if(!tm.isRegistered(type, q)) {
+ if(XmlObject.class.isAssignableFrom(type)) {
q = XmlBeans.typeForClass(type).getName();
tm.register(type, q, new XmlBeanSerializerFactory(type, q),
- new XmlBeanDeserializerFactory(type, q));
+ new XmlBeanDeserializerFactory(type, q));
}
/*
* NOTE jcolwell@bea.com 2004-Oct-11 -- these datahandler using
* classes are generally already registered but just in case...
*/
- else if (isActivationEnabled()
- && (java.awt.Image.class.isAssignableFrom(type)
- || getMultipartClass().isAssignableFrom(type) || getDataHandlerClass()
- .isAssignableFrom(type))) {
+ else if(isActivationEnabled()
+ && (java.awt.Image.class.isAssignableFrom(type)
+ || getMultipartClass().isAssignableFrom(type) || getDataHandlerClass()
+ .isAssignableFrom(type))) {
try {
/*
* NOTE jcolwell@bea.com 2004-Oct-08 -- doing reflection
@@ -344,66 +354,68 @@
// would have had dependecies to the org.apache... class
// which would not have worked in case activation was
// not on the path.
- Class<SerializerFactory> sfClass = (Class<SerializerFactory>) cl
- .loadClass("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
- Class<DeserializerFactory> dsfClass = (Class<DeserializerFactory>) cl
- .loadClass("org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory");
+ Class<SerializerFactory> sfClass = (Class<SerializerFactory>)cl
+ .loadClass("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
+ Class<DeserializerFactory> dsfClass = (Class<DeserializerFactory>)cl
+ .loadClass("org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory");
Constructor<SerializerFactory> sfCon = sfClass
- .getConstructor(Class.class, QName.class);
+ .getConstructor(Class.class, QName.class);
Constructor<DeserializerFactory> dsfCon = dsfClass
- .getConstructor(Class.class, QName.class);
+ .getConstructor(Class.class, QName.class);
SerializerFactory sf = sfCon.newInstance(type, q);
DeserializerFactory dsf = dsfCon.newInstance(type, q);
tm.register(type, q, sf, dsf);
- } catch (Exception e) {
+ }
+ catch(Exception e) {
/*
* FIXME jcolwell@bea.com 2004-Oct-08 -- log this
* properly
*/
e.printStackTrace();
}
- } else if (!Remote.class.isAssignableFrom(type)
- /*
- * NOTE jcolwell@bea.com 2004-Dec-01 -- java.rmi.Remote is
- * prohibited by the jax-rpc spec
- *
- * NOTE jcolwell@bea.com 2004-Oct-11 -- restricting against
- * File, since it doesn't make sense to serialize as a bean. It
- * causes an infinite loop as it keeps returning itself from the
- * getAbsoluteFile and getCanonicalFile calls
- */
- && !File.class.isAssignableFrom(type)) {
+ }
+ else if(!Remote.class.isAssignableFrom(type)
+ /*
+ * NOTE jcolwell@bea.com 2004-Dec-01 -- java.rmi.Remote is
+ * prohibited by the jax-rpc spec
+ *
+ * NOTE jcolwell@bea.com 2004-Oct-11 -- restricting against
+ * File, since it doesn't make sense to serialize as a bean. It
+ * causes an infinite loop as it keeps returning itself from the
+ * getAbsoluteFile and getCanonicalFile calls
+ */
+ && !File.class.isAssignableFrom(type)) {
TypeDesc td = TypeDesc.getTypeDescForClass(type);
// if type was registered in a different namespace, then
// ignore this and create a new td
- if (td != null
- && !td.getXmlType().getNamespaceURI().equals(
- q.getNamespaceURI())) {
+ if(td != null
+ && !td.getXmlType().getNamespaceURI().equals(
+ q.getNamespaceURI())) {
td = null;
}
TypeDesc superTd = null;
BeanPropertyDescriptor[] superPd = null;
// type desc is used for java-xml mapping, make sure the
// class and all its super classes have a type desc defined.
- if (null == td) {
+ if(null == td) {
td = new TypeDesc(type); // create type descriptor
// for this class --- NOT
// its super classes at this
// point.
// add super class types.
Class supa = type.getSuperclass();
- if ((supa != null) && (supa != java.lang.Object.class)
- && (supa != java.lang.Exception.class)
- && (supa != java.lang.Throwable.class)
- && (supa != java.rmi.RemoteException.class)
- && (supa != org.apache.axis.AxisFault.class)) {
+ if((supa != null) && (supa != java.lang.Object.class)
+ && (supa != java.lang.Exception.class)
+ && (supa != java.lang.Throwable.class)
+ && (supa != java.rmi.RemoteException.class)
+ && (supa != org.apache.axis.AxisFault.class)) {
configureTypeMapping(desc, supa, defaultNameSpace);
}
// check to see if a type mapping was created for the
// super class.
superTd = TypeDesc.getTypeDescForClass(supa);
- if (superTd != null) // super class is a regular java
+ if(superTd != null) // super class is a regular java
// bean with axis typedesc.
{
superPd = superTd.getPropertyDescriptors(); // this
@@ -422,7 +434,8 @@
// null as it is
// for the case when it is already provided (when td
// !=null)
- } else {
+ }
+ else {
td = null; // we don't need type desc. any more this is
// a complete td
}
@@ -448,14 +461,14 @@
// type mapping.
// next regidster type for this class.
tm.register(type, q, new EnhancedBeanSerializerFactory(
- type, q, td),
- /*
- * NOTE jcolwell@bea.com 2004-Oct-11 -- should check that
- * the type to deserialize has a default contructor but with
- * this setup there is no way to know if it is used only in
- * serialization.
- */
- new EnhancedBeanDeSerializerFactory(type, q, td));
+ type, q, td),
+ /*
+ * NOTE jcolwell@bea.com 2004-Oct-11 -- should check that
+ * the type to deserialize has a default contructor but with
+ * this setup there is no way to know if it is used only in
+ * serialization.
+ */
+ new EnhancedBeanDeSerializerFactory(type, q, td));
// now register the types for this bean properties
// (attributes)
@@ -463,22 +476,22 @@
// properties may be XML bean
// or a class that can deal with its own serialization.
Map serProps = BeanDeserializerFactory.getProperties(type,
- null); // Note this is all of the bean properties
- for (BeanPropertyDescriptor beanProps : (Collection<BeanPropertyDescriptor>) serProps
- .values()) {
+ null); // Note this is all of the bean properties
+ for(BeanPropertyDescriptor beanProps : (Collection<BeanPropertyDescriptor>)serProps
+ .values()) {
Class subType = beanProps.getType();
// make sure the property type is configred with Type
// mapping and its serializer information
- if (!(subType.isPrimitive()
- || subType.getName().startsWith("java.") || subType
- .getName().startsWith("javax."))) {
+ if(!(subType.isPrimitive()
+ || subType.getName().startsWith("java.") || subType
+ .getName().startsWith("javax."))) {
configureTypeMapping(desc, subType,
- defaultNameSpace); // if this was XML bean
+ defaultNameSpace); // if this was XML bean
// this recursion would
// take care of it
}
- if (td != null) { // if I didn't have type descriptor
+ if(td != null) { // if I didn't have type descriptor
// when I came to this method... I
// created partially filled one
// above
@@ -492,14 +505,14 @@
// element came from
// once you know where the element came form (which
// class) then you know the element's name space.
- if (superTd != null && superPd != null) { // if I
+ if(superTd != null && superPd != null) { // if I
// had a
// parent,
- for (int j = 0; j < superPd.length; j++) {
- if (beanProps.getName().equals(
- superPd[j].getName())) {
+ for(int j = 0; j < superPd.length; j++) {
+ if(beanProps.getName().equals(
+ superPd[j].getName())) {
ns = superTd.getXmlType()
- .getNamespaceURI();
+ .getNamespaceURI();
break;
}
}
@@ -511,7 +524,7 @@
// NOTE jcolwell@bea.com 2004-Oct-28 -- might need
// to do more to ensure a useful type QName.
fd.setXmlType(tm.getTypeQName(subType));
- ((ElementDesc) fd).setNillable(true);
+ ((ElementDesc)fd).setNillable(true);
// mmerz@apache.com 2005-Mar-09: required since Axis
// 1.2RC3 to allow for null values in complex
// objects; note that there is no (JSR-181)
@@ -519,16 +532,18 @@
td.addFieldDesc(fd);
}
}
- } else {
+ }
+ else {
throw new InvalidTypeMappingException("failed to register "
- + type.getName()
- + " as a valid web service datatype,"
- + " consider using a custom type mapping");
+ + type.getName()
+ + " as a valid web service datatype,"
+ + " consider using a custom type mapping");
}
}
return q;
- } catch (RuntimeException e) {
+ }
+ catch(RuntimeException e) {
logger.error("Error in type registeration", e);
e.printStackTrace();
throw e;
@@ -537,40 +552,43 @@
private static QName generateQName(Class type, ServiceDesc desc) {
String namespace = Namespaces.makeNamespace(type.getName());
- if (namespace == null || namespace.endsWith("DefaultNamespace")) {
+ if(namespace == null || namespace.endsWith("DefaultNamespace")) {
namespace = desc.getDefaultNamespace();
}
return new QName(namespace, Types.getLocalNameFromFullName(type
- .getName()));
+ .getName()));
}
protected static void configureSoapBinding(ServiceDesc sd,
- BeehiveWsSOAPBindingInfo sbi) {
+ BeehiveWsSOAPBindingInfo sbi) {
javax.jws.soap.SOAPBinding.Style style = javax.jws.soap.SOAPBinding.Style.DOCUMENT;
javax.jws.soap.SOAPBinding.Use use = javax.jws.soap.SOAPBinding.Use.LITERAL;
javax.jws.soap.SOAPBinding.ParameterStyle paramStyle = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED;
- if (sbi != null) {
+ if(sbi != null) {
style = sbi.getStyle();
use = sbi.getUse();
paramStyle = sbi.getParameterStyle();
}
- if (style == javax.jws.soap.SOAPBinding.Style.RPC) {
+ if(style == javax.jws.soap.SOAPBinding.Style.RPC) {
sd.setStyle(Style.RPC);
- if (use == javax.jws.soap.SOAPBinding.Use.ENCODED) {
+ if(use == javax.jws.soap.SOAPBinding.Use.ENCODED) {
sd.setUse(Use.ENCODED);
- } else {
+ }
+ else {
sd.setUse(Use.LITERAL);
}
- } else {
+ }
+ else {
/*
* since DOCUMENT ENCODED is not valid so force to use LITERAL
*/
sd.setUse(Use.LITERAL);
// check if this is a wrapped document literal
- if (paramStyle == javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED) {
+ if(paramStyle == javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED) {
sd.setStyle(Style.WRAPPED);
- } else {
+ }
+ else {
// just regular document style
sd.setStyle(Style.DOCUMENT);
}
@@ -585,24 +603,27 @@
* gets the type descriptor in the constructor
*/
-class EnhancedBeanSerializerFactory extends BeanSerializerFactory {
+class EnhancedBeanSerializerFactory
+ extends BeanSerializerFactory {
public EnhancedBeanSerializerFactory(Class javaType, QName xmlType,
- TypeDesc typeDesc) {
+ TypeDesc typeDesc) {
super(javaType, xmlType);
this.typeDesc = typeDesc;
- if (typeDesc != null) {
+ if(typeDesc != null) {
propertyDescriptor = typeDesc.getPropertyDescriptors();
- } else {
+ }
+ else {
propertyDescriptor = BeanUtils.getPd(javaType, null);
}
}
}
-class EnhancedBeanDeSerializerFactory extends BeanDeserializerFactory {
+class EnhancedBeanDeSerializerFactory
+ extends BeanDeserializerFactory {
public EnhancedBeanDeSerializerFactory(Class javaType, QName xmlType,
- TypeDesc typeDesc) {
+ TypeDesc typeDesc) {
super(javaType, xmlType);
this.typeDesc = typeDesc;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java Wed Jun 1 13:53:19 2005
@@ -36,27 +36,27 @@
*
* @author Jonathan Colwell
*/
-public class ControlProvider extends RPCProvider {
-
+public class ControlProvider
+ extends RPCProvider {
protected Object makeNewServiceObject(MessageContext msgContext, String clsName)
- throws Exception
- {
+ throws Exception {
Object obj = super.makeNewServiceObject(msgContext, clsName);
initializeControls(obj);
return obj;
}
- private void initializeControls(Object obj) throws Exception {
-
+ private void initializeControls(Object obj)
+ throws Exception {
+
Class cls = obj.getClass();
// search for fields with @Control annotations
- for (Field field : cls.getFields()) {
- if (null != field.getAnnotation(Control.class)) {
-
+ for(Field field : cls.getFields()) {
+ if(null != field.getAnnotation(Control.class)) {
+
//attempt to load using client initializer.
ControlContainerContext ccc = ControlThreadContext.getContext();
- if (null == ccc) {
+ if(null == ccc) {
throw new Exception("no control container context found");
}
Class clientInitializer = cls.getClassLoader().loadClass(cls.getName() + "ClientInitializer");
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGenerator.java Wed Jun 1 13:53:19 2005
@@ -33,13 +33,13 @@
import org.apache.axis.wsdl.toJava.Emitter;
import org.apache.axis.wsdl.toJava.JavaGeneratorFactory;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
-public class AxisTypeGenerator extends JavaGeneratorFactory {
-
+public class AxisTypeGenerator
+ extends JavaGeneratorFactory {
public AxisTypeGenerator() {
super();
Emitter e = new Emitter();
@@ -47,12 +47,13 @@
emitter.setFactory(this);
}
- public void generateTypes(String wsdl, String outputDir) throws Exception {
-
+ public void generateTypes(String wsdl, String outputDir)
+ throws Exception {
+
emitter.setOutputDir(outputDir);
emitter.run(wsdl);
}
-
+
public Generator getGenerator(Message message, SymbolTable symbolTable) {
return new NoopGenerator();
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/AxisTypeGeneratorTask.java Wed Jun 1 13:53:19 2005
@@ -30,28 +30,30 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
-public class AxisTypeGeneratorTask extends Task {
-
+public class AxisTypeGeneratorTask
+ extends Task {
File mWSDL, mOutDir;
- boolean generateJWS=false;
-
- /**
- * @return Returns the generateJWS.
- */
- public boolean isGenerateJWS() {
- return generateJWS;
- }
- /**
- * @param generateJWS The generateJWS to set.
- */
- public void setGenerateJWS(boolean generateJWS) {
- this.generateJWS = generateJWS;
- }
+ boolean generateJWS = false;
+
+ /**
+ * @return Returns the generateJWS.
+ */
+ public boolean isGenerateJWS() {
+ return generateJWS;
+ }
+
+ /**
+ * @param generateJWS The generateJWS to set.
+ */
+ public void setGenerateJWS(boolean generateJWS) {
+ this.generateJWS = generateJWS;
+ }
+
public void setWSDLDir(File wsdl) {
mWSDL = wsdl;
}
@@ -60,24 +62,24 @@
mOutDir = outputDir;
}
- public void execute() throws BuildException {
+ public void execute()
+ throws BuildException {
try {
AntClassLoader acl = (AntClassLoader)getClass().getClassLoader();
//System.out.println(acl.getClasspath());
- if (mOutDir != null && mWSDL != null && mWSDL.isDirectory()) {
+ if(mOutDir != null && mWSDL != null && mWSDL.isDirectory()) {
AxisTypeGenerator atg = new AxisTypeGenerator();
- for (File f : mWSDL.listFiles(new WSDLFilter())) {
- atg.generateTypes(f.getPath(),
- mOutDir.getPath());
+ for(File f : mWSDL.listFiles(new WSDLFilter())) {
+ atg.generateTypes(f.getPath(), mOutDir.getPath());
}
}
else {
throw new BuildException("Both a valid wsdl directory and an output directory must be provided.");
}
}
- catch (Throwable e) {
+ catch(Throwable e) {
e.printStackTrace();
- if (e instanceof BuildException) {
+ if(e instanceof BuildException) {
throw (BuildException)e;
}
else {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDL2AJavaTask.java Wed Jun 1 13:53:19 2005
@@ -22,8 +22,6 @@
import java.io.File;
-
-
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Java;
@@ -31,10 +29,13 @@
import org.apache.tools.ant.types.Reference;
-public class WSDL2AJavaTask extends Java {
- File mWSDL, mOutDir;
+public class WSDL2AJavaTask
+ extends Java {
+ File mWSDL
+ ,
+ mOutDir;
+
-
public void setWSDLFile(File wsdl) {
mWSDL = wsdl;
}
@@ -42,7 +43,7 @@
public void setOutputDir(File outputDir) {
mOutDir = outputDir;
}
-
+
/**
* Classpath to use, by reference.
*
@@ -51,7 +52,7 @@
public void setClasspathRef(Reference r) {
super.setClasspathRef(r);
}
-
+
/**
* Set the classpath to be used when running the Java class
*
@@ -60,25 +61,27 @@
public void setClasspath(Path s) {
super.setClasspath(s);
}
- /**
- *
- */
- public WSDL2AJavaTask() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public void execute() throws BuildException {
+
+ /**
+ *
+ */
+ public WSDL2AJavaTask() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public void execute()
+ throws BuildException {
try {
- setClassname("org.apache.beehive.wsm.axis.tools.Wsdl2AJava");
- setArgs(mWSDL.getCanonicalPath());
- setArgs(mOutDir.getCanonicalPath());
- super.execute();
-
+ setClassname("org.apache.beehive.wsm.axis.tools.Wsdl2AJava");
+ setArgs(mWSDL.getCanonicalPath());
+ setArgs(mOutDir.getCanonicalPath());
+ super.execute();
+
}
- catch (Throwable e) {
+ catch(Throwable e) {
e.printStackTrace();
- if (e instanceof BuildException) {
+ if(e instanceof BuildException) {
throw (BuildException)e;
}
else {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDLFilter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDLFilter.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDLFilter.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ant/WSDLFilter.java Wed Jun 1 13:53:19 2005
@@ -19,19 +19,18 @@
*
* Original author: Jonathan Colwell
*/
-package org.apache.beehive.wsm.axis.ant;
+package org.apache.beehive.wsm.axis.ant;
-/*******************************************************************************
- *
+/**
+ * ****************************************************************************
*
* @author Jonathan Colwell
*/
-public class WSDLFilter implements java.io.FileFilter {
-
-
+public class WSDLFilter
+ implements java.io.FileFilter {
public boolean accept(java.io.File f) {
- return (f.isFile()
- && (f.getName().endsWith("wsdl")
- || f.getName().endsWith("WSDL")));
+ return (f.isFile()
+ && (f.getName().endsWith("wsdl")
+ || f.getName().endsWith("WSDL")));
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/AxisTypeLookup.java Wed Jun 1 13:53:19 2005
@@ -31,101 +31,105 @@
import org.apache.beehive.wsm.databinding.BindingLookupService;
import org.apache.log4j.Logger;
-public class AxisTypeLookup implements BindingLookupService {
- static Logger logger = Logger.getLogger(AxisTypeLookup.class);
+public class AxisTypeLookup
+ implements BindingLookupService {
+ static Logger logger = Logger.getLogger(AxisTypeLookup.class);
+
+ /**
+ * @param tm
+ */
+ public AxisTypeLookup() {
+ super();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see TypeLookUpServices#getClassQName(java.lang.Class)
+ */
+ public QName class2qname(Class cls) {
+ if(cls.isArray())
+ cls = cls.getComponentType();
+ TypeDesc td = TypeDesc.getTypeDescForClass(cls); // a class can
+ if(null != td) {
+ return td.getXmlType();
+ }
+ else {
+ String namespace = Namespaces.makeNamespace(cls.getName());
+ if(namespace == null || namespace.endsWith("DefaultNamespace")) {
+ namespace = "http://no.namespace.specified";
+ }
+ return class2qname(cls, namespace);
+ }
+
+ }
+
+ /**
+ * @param cls
+ * @param namespace
+ * @return
+ */
+ public QName class2qname(Class cls, String namespace) {
+ if(AxisTypeMappingMetaData.isBuiltInType(cls))
+ return AxisTypeMappingMetaData.getBuiltInTypeQname(cls);
+ return new QName(namespace, Types.getLocalNameFromFullName(cls
+ .getName()));
+ }
+
+ public Class qname2class(QName qType) {
+
+ if(qType == null) {
+ return null;
+ }
+
+ String packageName = getPackageNameFromQName(qType);
+ String className;
+ if(packageName != null && packageName.length() > 0) {
+ className = packageName + "."
+ + Utils.xmlNameToJavaClass(qType.getLocalPart());
+ }
+ else {
+ className = Utils.xmlNameToJavaClass(qType.getLocalPart());
+ }
+
+ Class javaType = null;
+
+ try {
+ javaType = ClassUtils.forName(className);
+
+ }
+ catch(ClassNotFoundException e) {
+ System.out.println("Failed to find the class: " + className
+ + " No Axis generated classes was found for qname: "
+ + qType);
+ }
+
+ if(null != javaType)
+ System.out.println("Found an Axis generated type for qname: "
+ + qType + " class: " + javaType.getCanonicalName());
+
+ return javaType;
+ }
+
+ private String getPackageNameFromQName(QName qType) {
+
+ // TODO: Later keep a cache of previous conversions, and return the
+ // result
+ // from cache if there is any.
+ String packageName = Utils.makePackageName(qType.getNamespaceURI());
+ packageName = normalizePackageName(packageName, '.');
+ return packageName;
+ }
+
+ private static final char[] pkgSeparators = {'.', ':'};
+
+ private static String normalizePackageName(String pkg, char separator) {
+
+ for(int i = 0; i < pkgSeparators.length; i++) {
+ pkg = pkg.replace(pkgSeparators[i], separator);
+ }
- /**
- * @param tm
- */
- public AxisTypeLookup() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see TypeLookUpServices#getClassQName(java.lang.Class)
- */
- public QName class2qname(Class cls) {
- if (cls.isArray())
- cls = cls.getComponentType();
- TypeDesc td = TypeDesc.getTypeDescForClass(cls); // a class can
- if (null != td) {
- return td.getXmlType();
- } else {
- String namespace = Namespaces.makeNamespace(cls.getName());
- if (namespace == null || namespace.endsWith("DefaultNamespace")) {
- namespace = "http://no.namespace.specified";
- }
- return class2qname(cls, namespace);
- }
-
- }
-
- /**
- * @param cls
- * @param namespace
- * @return
- */
- public QName class2qname(Class cls, String namespace) {
- if (AxisTypeMappingMetaData.isBuiltInType(cls))
- return AxisTypeMappingMetaData.getBuiltInTypeQname(cls);
- return new QName(namespace, Types.getLocalNameFromFullName(cls
- .getName()));
- }
-
- public Class qname2class(QName qType) {
-
- if (qType == null) {
- return null;
- }
-
- String packageName = getPackageNameFromQName(qType);
- String className;
- if (packageName != null && packageName.length() > 0) {
- className = packageName + "."
- + Utils.xmlNameToJavaClass(qType.getLocalPart());
- } else {
- className = Utils.xmlNameToJavaClass(qType.getLocalPart());
- }
-
- Class javaType = null;
-
- try {
- javaType = ClassUtils.forName(className);
-
- } catch (ClassNotFoundException e) {
- System.out.println("Failed to find the class: " + className
- + " No Axis generated classes was found for qname: "
- + qType);
- }
-
- if (null != javaType)
- System.out.println("Found an Axis generated type for qname: "
- + qType + " class: " + javaType.getCanonicalName());
-
- return javaType;
- }
-
- private String getPackageNameFromQName(QName qType) {
-
- // TODO: Later keep a cache of previous conversions, and return the
- // result
- // from cache if there is any.
- String packageName = Utils.makePackageName(qType.getNamespaceURI());
- packageName = normalizePackageName(packageName, '.');
- return packageName;
- }
-
- private static final char[] pkgSeparators = { '.', ':' };
-
- private static String normalizePackageName(String pkg, char separator) {
-
- for (int i = 0; i < pkgSeparators.length; i++) {
- pkg = pkg.replace(pkgSeparators[i], separator);
- }
-
- return pkg;
- }
+ return pkg;
+ }
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/databinding/SystemTypeLookupService.java Wed Jun 1 13:53:19 2005
@@ -21,71 +21,69 @@
import java.util.ArrayList;
import java.util.List;
-
import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.XMLType;
import org.apache.beehive.wsm.databinding.BindingLookupService;
import org.apache.beehive.wsm.databinding.xmlbeans.XmlBeanTypeLookup;
-public class SystemTypeLookupService implements BindingLookupService {
-
- List<BindingLookupService> lookupServiceList = new ArrayList<BindingLookupService>();
-
- /**
- *
- */
- public SystemTypeLookupService() {
- lookupServiceList.add(new XmlBeanTypeLookup());
- lookupServiceList.add(new AxisTypeLookup());
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see TypeLookUpServices#getClassQName(java.lang.Class)
- */
- public QName class2qname(Class cls) {
- QName qname = null;
-
- for (BindingLookupService lookUpService : lookupServiceList) {
- if (null != (qname = lookUpService.class2qname(cls)))
- break;
- }
- return qname;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see TypeLookUpServices#getClassQName(java.lang.Class)
- */
- public QName class2qname(Class cls, String namespace) {
- QName qname = null;
-
- for (BindingLookupService lookUpService : lookupServiceList) {
- if (null != (qname = lookUpService.class2qname(cls, namespace)))
- break;
- }
- return qname;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see TypeLookUpServices#Qname2Class(javax.xml.namespace.QName)
- */
- public Class qname2class(QName qname) {
- Class cls = null;
- for (BindingLookupService lookUpService : lookupServiceList) {
- if (null != (cls = lookUpService.qname2class(qname)))
- break;
- }
- if (null == cls)
- cls = Object.class;
- return cls;
- }
+public class SystemTypeLookupService
+ implements BindingLookupService {
+ List<BindingLookupService> lookupServiceList = new ArrayList<BindingLookupService>();
+
+ /**
+ *
+ */
+ public SystemTypeLookupService() {
+ lookupServiceList.add(new XmlBeanTypeLookup());
+ lookupServiceList.add(new AxisTypeLookup());
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see TypeLookUpServices#getClassQName(java.lang.Class)
+ */
+ public QName class2qname(Class cls) {
+ QName qname = null;
+
+ for(BindingLookupService lookUpService : lookupServiceList) {
+ if(null != (qname = lookUpService.class2qname(cls)))
+ break;
+ }
+ return qname;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see TypeLookUpServices#getClassQName(java.lang.Class)
+ */
+ public QName class2qname(Class cls, String namespace) {
+ QName qname = null;
+
+ for(BindingLookupService lookUpService : lookupServiceList) {
+ if(null != (qname = lookUpService.class2qname(cls, namespace)))
+ break;
+ }
+ return qname;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see TypeLookUpServices#Qname2Class(javax.xml.namespace.QName)
+ */
+ public Class qname2class(QName qname) {
+ Class cls = null;
+ for(BindingLookupService lookUpService : lookupServiceList) {
+ if(null != (cls = lookUpService.qname2class(qname)))
+ break;
+ }
+ if(null == cls)
+ cls = Object.class;
+ return cls;
+ }
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/AnnotatedWebServiceDeploymentHandler.java Wed Jun 1 13:53:19 2005
@@ -18,18 +18,12 @@
*
*/
-import java.io.File;
-import java.io.FilenameFilter;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
-
-
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.HandlerInfo;
@@ -37,7 +31,6 @@
import org.apache.axis.Constants;
import org.apache.axis.MessageContext;
import org.apache.axis.client.Call;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.constants.Use;
import org.apache.axis.description.ServiceDesc;
import org.apache.axis.handlers.BasicHandler;
@@ -45,21 +38,18 @@
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.providers.java.RPCProvider;
import org.apache.axis.utils.ClassUtils;
-
-
import org.apache.beehive.wsm.axis.AxisHook;
import org.apache.beehive.wsm.axis.ControlProvider;
import org.apache.beehive.wsm.model.BeehiveWsSOAPMessageHandlerInfo;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
import org.apache.beehive.wsm.model.jsr181.Jsr181ObjectModelStore;
-import org.w3c.dom.Element;
-
import org.apache.log4j.Logger;
+
/**
* ****************************************************************************
* A few annotation specific things added and lots of code copied from the
* JWSHandler class by
- *
+ *
* @author Jonathan Colwell (jcolwell@bea.com) but most of the original code was
* written by:
* @author Glen Daniels (gdaniels@allaire.com)
@@ -67,9 +57,9 @@
* @author Sam Ruby (rubys@us.ibm.com) todo: fix directory
* structure/classloaders for output files
*/
-public class AnnotatedWebServiceDeploymentHandler extends BasicHandler {
-
- protected static Logger logger = Logger.getLogger(AnnotatedWebServiceDeploymentHandler.class);
+public class AnnotatedWebServiceDeploymentHandler
+ extends BasicHandler {
+ protected static Logger logger = Logger.getLogger(AnnotatedWebServiceDeploymentHandler.class);
protected Map<String, SOAPService> soapServices = new HashMap<String, SOAPService>();
@@ -77,11 +67,12 @@
* @param mc
* @throws AxisFault
*/
- public void invoke(MessageContext mc) throws AxisFault {
+ public void invoke(MessageContext mc)
+ throws AxisFault {
try {
SOAPService ss = getSOAPService(getWebServiceClass(mc));
- if (null != ss) {
+ if(null != ss) {
ss.setEngine(mc.getAxisEngine());
mc.setService(ss);
/*
@@ -90,12 +81,13 @@
* to not send the types unless encoded.
*/
mc.setProperty(Call.SEND_TYPE_ATTR, new Boolean(Use.ENCODED
- .equals(ss.getUse())));
+ .equals(ss.getUse())));
// blow away the real path to bypass the regular JWSHandler
mc.removeProperty(Constants.MC_REALPATH);
}
- } catch (Exception e) {
+ }
+ catch(Exception e) {
throw AxisFault.makeFault(e);
}
}
@@ -104,7 +96,8 @@
* @param mc
* @throws AxisFault
*/
- public void generateWSDL(MessageContext mc) throws AxisFault {
+ public void generateWSDL(MessageContext mc)
+ throws AxisFault {
invoke(mc);
}
@@ -113,13 +106,14 @@
* @return SOAPService
* @throws Exception
*/
- protected SOAPService getSOAPService(Class clazz) throws Exception {
+ protected SOAPService getSOAPService(Class clazz)
+ throws Exception {
SOAPService ss = null;
- if (null != clazz) {
+ if(null != clazz) {
ss = soapServices.get(clazz.getName());
- if (null == ss) {
+ if(null == ss) {
ss = createSOAPService(Jsr181ObjectModelStore.load(clazz),
- clazz);
+ clazz);
}
}
return ss;
@@ -132,10 +126,10 @@
* @throws Exception
*/
protected SOAPService createSOAPService(BeehiveWsTypeMetadata wsm, Class cls)
- throws Exception {
+ throws Exception {
SOAPService ss = null;
- if (null != wsm) {
+ if(null != wsm) {
// HandlerHandler hh = new HandlerHandler(wsm);
// hh.init();
// // NOTE jcolwell@bea.com 2004-Nov-01 --
@@ -148,7 +142,7 @@
// Add jaxrpc handlers if there are any.
HandlerInfoChainFactory jaxrpcChain;
- if (null != (jaxrpcChain = getJaxRPCHandlerChainFactory(wsm))) {
+ if(null != (jaxrpcChain = getJaxRPCHandlerChainFactory(wsm))) {
ss.setOption(Constants.ATTR_HANDLERINFOCHAIN, jaxrpcChain);
}
ss.setName(wsm.getWsName());
@@ -156,8 +150,8 @@
// Take the setting for the scope option from the handler
// parameter named "scope"
- String scope = (String) getOption(RPCProvider.OPTION_SCOPE);
- if (null == scope) {
+ String scope = (String)getOption(RPCProvider.OPTION_SCOPE);
+ if(null == scope) {
scope = "Request";
}
ss.setOption(RPCProvider.OPTION_SCOPE, scope);
@@ -167,20 +161,20 @@
Iterator allowIt = allowedMethodNames.iterator();
StringBuffer sb = new StringBuffer();
boolean firstPass = true;
- while (allowIt.hasNext()) {
- if (firstPass) {
+ while(allowIt.hasNext()) {
+ if(firstPass) {
sb.append(' ');
firstPass = false;
}
- sb.append(((String) allowIt.next()));
+ sb.append(((String)allowIt.next()));
}
ss.setOption(RPCProvider.OPTION_ALLOWEDMETHODS, sb.toString());
ss.setOption(RPCProvider.OPTION_WSDL_PORTTYPE, wsm.getWsName());
ss.setOption(RPCProvider.OPTION_WSDL_SERVICEPORT, wsm.getWsName());
ss.setOption(RPCProvider.OPTION_WSDL_SERVICEELEMENT, wsm
- .getWsServiceName());
+ .getWsServiceName());
ss.setOption(RPCProvider.OPTION_WSDL_TARGETNAMESPACE, wsm
- .getWsTargetNamespace());
+ .getWsTargetNamespace());
ss.setStyle(sd.getStyle());
ss.setUse(sd.getUse());
soapServices.put(cls.getName(), ss);
@@ -189,20 +183,21 @@
}
protected HandlerInfoChainFactory getJaxRPCHandlerChainFactory(
- BeehiveWsTypeMetadata wsm) throws ClassNotFoundException {
+ BeehiveWsTypeMetadata wsm)
+ throws ClassNotFoundException {
HandlerInfoChainFactory res = null;
- List< ? extends BeehiveWsSOAPMessageHandlerInfo> handlers = wsm
- .getSoapHandlers();
- if (handlers.size() > 0) { // there are handlers to install
+ List<? extends BeehiveWsSOAPMessageHandlerInfo> handlers = wsm
+ .getSoapHandlers();
+ if(handlers.size() > 0) { // there are handlers to install
ArrayList<HandlerInfo> infoList = new ArrayList<HandlerInfo>();
HashSet<String> roles = new HashSet<String>();
- for (BeehiveWsSOAPMessageHandlerInfo handler : handlers) {
+ for(BeehiveWsSOAPMessageHandlerInfo handler : handlers) {
Class handlerClass = ClassUtils.forName(handler.getClassName());
QName[] handlerHeaders = handler.getHeaders().toArray(
- new QName[0]);
- infoList.add(new HandlerInfo(handlerClass, (Map) handler
- .getParameterMap(), handlerHeaders));
+ new QName[0]);
+ infoList.add(new HandlerInfo(handlerClass, (Map)handler
+ .getParameterMap(), handlerHeaders));
roles.addAll(handler.getRoles());
}
res = new HandlerInfoChainFactory(infoList);
@@ -217,17 +212,18 @@
* @return web service Class
* @throws Exception
*/
- protected Class getWebServiceClass(MessageContext mc) throws Exception {
+ protected Class getWebServiceClass(MessageContext mc)
+ throws Exception {
// check message context
- if (null == mc) {
+ if(null == mc) {
throw new IllegalArgumentException("message context not set");
}
// retrieve & check relative path
String relativePath = mc.getStrProp(Constants.MC_RELATIVE_PATH);
- if (null == relativePath) {
+ if(null == relativePath) {
throw new Exception(
- "relative path not set properly in message context");
+ "relative path not set properly in message context");
}
// turn relative path into fq class name
@@ -242,24 +238,24 @@
".");
*/
- if (! relativePath.startsWith("/")) {
- throw new Exception ("invalid relative path: " + relativePath);
+ if(! relativePath.startsWith("/")) {
+ throw new Exception("invalid relative path: " + relativePath);
}
String className = null;
- if (relativePath.endsWith(JWS_EXTENSION)) {
+ if(relativePath.endsWith(JWS_EXTENSION)) {
className = relativePath.substring(1, relativePath.length() - JWS_EXTENSION.length()).replaceAll("/", ".");
}
else {
className = relativePath.substring(1, relativePath.length()).replaceAll("/", ".");
}
-
+
// load class
- if (logger.isDebugEnabled()) {
+ if(logger.isDebugEnabled()) {
logger.debug("trying to load web service class: " + className);
}
Class clazz = Jsr181ObjectModelStore.loadWebServiceClass(className);
- if (null == clazz) {
- if (logger.isDebugEnabled()) {
+ if(null == clazz) {
+ if(logger.isDebugEnabled()) {
logger.debug("failed to load web service class: " + className);
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java?rev=179419&r1=179418&r2=179419&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/handlers/HandlerHandler.java Wed Jun 1 13:53:19 2005
@@ -22,7 +22,6 @@
import org.apache.axis.handlers.JAXRPCHandler;
import org.apache.beehive.wsm.model.BeehiveWsSOAPMessageHandlerInfo;
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
-import org.apache.beehive.wsm.model.jsr181.SOAPMessageHandlerInfo;
/**
* ****************************************************************************
@@ -33,8 +32,8 @@
*
* @author Jonathan Colwell
*/
-public class HandlerHandler extends JAXRPCHandler {
-
+public class HandlerHandler
+ extends JAXRPCHandler {
private BeehiveWsTypeMetadata wsm;
/**
@@ -51,7 +50,7 @@
* configure the HandlerChain.
*/
public void init() {
- for (BeehiveWsSOAPMessageHandlerInfo info : wsm.getSoapHandlers()) {
+ for(BeehiveWsSOAPMessageHandlerInfo info : wsm.getSoapHandlers()) {
addNewHandler(info.getClassName(), info.getParameterMap());
}
}