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/02 00:57:50 UTC
svn commit: r179452 [1/2] - 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/jsr181/ 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 15:57:48 2005
New Revision: 179452
URL: http://svn.apache.org/viewcvs?rev=179452&view=rev
Log:
Little bit more code formatting / cleanup.
Done now, fwiw...
BB: self
DRT: Beehive pass / build.dist pass
Removed:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/
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/handlers/AnnotatedWebServiceDeploymentHandler.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/BeehiveWsSOAPMessageHandlerInfo.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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -23,6 +23,7 @@
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.TYPE)
public @interface HandlerChain {
+
String file();
String name();
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -23,5 +23,4 @@
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.METHOD)
public @interface Oneway {
-
}
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -23,6 +23,7 @@
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.METHOD)
public @interface WebMethod {
+
String action() default "";
String operationName() default "";
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -23,6 +23,7 @@
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.PARAMETER)
public @interface WebParam {
+
boolean header() default false;
Mode mode() default Mode.IN;
@@ -34,6 +35,4 @@
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -23,6 +23,7 @@
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.METHOD)
public @interface WebResult {
+
String name() default "return";
String targetNamespace() default "";
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -23,6 +23,7 @@
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = ElementType.TYPE)
public @interface WebService {
+
String endpointInterface() default "";
String name() default "";
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -33,17 +33,11 @@
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -24,5 +24,4 @@
@Target(value = ElementType.TYPE)
public @interface SOAPMessageHandlers {
SOAPMessageHandler[] value();
-
}
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -151,9 +151,8 @@
ParameterDesc pd = od.getParameter(pcnt++);
final Class paramType = param.getJavaType();
- if(pd.getTypeQName() == null) { // set the typeQName if
- // it is not set
- // already.
+ if(pd.getTypeQName() == null) {
+ // set the typeQName if it is not set already
QName typeQName = configureTypeMapping(sd, paramType, param.getWpTargetNamespace());
/*
* jongjinchoi@apache.org 2005-Mar-16 -- The typeQName
@@ -209,8 +208,7 @@
+ " 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());
+ QName qname = configureTypeMapping(sd, thrown, meth.getWrTargetNamespace());
fd.setXmlType(qname);
fd.setQName(qname);
fd.setComplex(true);
@@ -306,37 +304,37 @@
BindingLookupService lookupService = new SystemTypeLookupService(); // move this to the constructor
QName q = lookupService.class2qname(type, defaultNameSpace);
-
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) {
- tm.register(type, q, new ArraySerializerFactory(type, q),
+ if(!tm.isRegistered(type, q) && desc.getStyle() == Style.RPC && desc.getUse() == Use.ENCODED) {
+ tm.register(type,
+ q,
+ new ArraySerializerFactory(type, q),
new ArrayDeserializerFactory());
}
- QName qcomp = configureTypeMapping(desc, type
- .getComponentType(), defaultNameSpace);
- if(desc.getUse() == Use.LITERAL) {
+ QName qcomp = configureTypeMapping(desc, type.getComponentType(), defaultNameSpace);
+ if(desc.getUse() == Use.LITERAL)
q = qcomp;
- }
}
else if(!tm.isRegistered(type, q)) {
if(XmlObject.class.isAssignableFrom(type)) {
q = XmlBeans.typeForClass(type).getName();
- tm.register(type, q, new XmlBeanSerializerFactory(type, q),
+ tm.register(type,
+ q,
+ new XmlBeanSerializerFactory(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
@@ -354,14 +352,15 @@
// 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");
- Constructor<SerializerFactory> sfCon = sfClass
- .getConstructor(Class.class, QName.class);
- Constructor<DeserializerFactory> dsfCon = dsfClass
- .getConstructor(Class.class, QName.class);
+ 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);
+ Constructor<DeserializerFactory> dsfCon =
+ dsfClass.getConstructor(Class.class, QName.class);
SerializerFactory sf = sfCon.newInstance(type, q);
DeserializerFactory dsf = dsfCon.newInstance(type, q);
tm.register(type, q, sf, dsf);
@@ -374,26 +373,24 @@
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)) {
+ /*
+ * 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
+ */
+ else if(!Remote.class.isAssignableFrom(type) && !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
@@ -415,17 +412,10 @@
// 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
- // bean with axis typedesc.
- {
- superPd = superTd.getPropertyDescriptors(); // this
- // is
- // mapping
- // for
- // all
- // my
- // super
- // classes.
+ if(superTd != null) {
+ // super class is a regular javabean with axis typedesc
+ superPd = superTd.getPropertyDescriptors();
+ // this is mapping for all my super classes
}
td.setXmlType(q);
TypeDesc.registerTypeDescForClass(type, td);
@@ -436,8 +426,8 @@
// !=null)
}
else {
- td = null; // we don't need type desc. any more this is
- // a complete td
+ // we don't need type desc. any more this is a complete td
+ td = null;
}
//
// // At this all parent bean classes and their properties
@@ -460,8 +450,9 @@
// (attributes) have been registered with typedecriptor and
// type mapping.
// next regidster type for this class.
- tm.register(type, q, new EnhancedBeanSerializerFactory(
- type, q, td),
+ 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
@@ -475,44 +466,34 @@
// Note: we have to consider the case that one of the
// 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()) {
+
+ // Note this is all of the bean properties
+ Map serProps = BeanDeserializerFactory.getProperties(type, null);
+ 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."))) {
- configureTypeMapping(desc, subType,
- defaultNameSpace); // if this was XML bean
- // this recursion would
- // take care of it
+ if(!(subType.isPrimitive() ||
+ subType.getName().startsWith("java.") ||
+ subType.getName().startsWith("javax."))) {
+ configureTypeMapping(desc, subType, defaultNameSpace);
+ // if this was XML bean this recursion would take care of it
}
- if(td != null) { // if I didn't have type descriptor
- // when I came to this method... I
- // created partially filled one
- // above
- // now need to complete this.
- String ns = q.getNamespaceURI(); // name space
- // for the class
- // if there is
- // no parent
+ if(td != null) {
+ // if I didn't have type descriptor when I came to this method... I
+ // created partially filled one above now need to complete this.
+ String ns = q.getNamespaceURI();
+ // name space for the class if there is no parent
// find proper namespace for this element... we need
// to find out whihc class in the hierarchy the
- // element came from
- // once you know where the element came form (which
+ // 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
- // had a
- // parent,
+ 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())) {
- ns = superTd.getXmlType()
- .getNamespaceURI();
+ if(beanProps.getName().equals(superPd[j].getName())) {
+ ns = superTd.getXmlType().getNamespaceURI();
break;
}
}
@@ -555,12 +536,10 @@
if(namespace == null || namespace.endsWith("DefaultNamespace")) {
namespace = desc.getDefaultNamespace();
}
- return new QName(namespace, Types.getLocalNameFromFullName(type
- .getName()));
+ return new QName(namespace, Types.getLocalNameFromFullName(type.getName()));
}
- protected static void configureSoapBinding(ServiceDesc sd,
- BeehiveWsSOAPBindingInfo sbi) {
+ protected static void configureSoapBinding(ServiceDesc sd, 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;
@@ -605,8 +584,8 @@
class EnhancedBeanSerializerFactory
extends BeanSerializerFactory {
- public EnhancedBeanSerializerFactory(Class javaType, QName xmlType,
- TypeDesc typeDesc) {
+
+ public EnhancedBeanSerializerFactory(Class javaType, QName xmlType, TypeDesc typeDesc) {
super(javaType, xmlType);
this.typeDesc = typeDesc;
@@ -622,12 +601,10 @@
class EnhancedBeanDeSerializerFactory
extends BeanDeserializerFactory {
- public EnhancedBeanDeSerializerFactory(Class javaType, QName xmlType,
- TypeDesc typeDesc) {
+ public EnhancedBeanDeSerializerFactory(Class javaType, QName xmlType, TypeDesc typeDesc) {
super(javaType, xmlType);
this.typeDesc = typeDesc;
propertyMap = getProperties(javaType, 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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -38,6 +38,7 @@
*/
public class ControlProvider
extends RPCProvider {
+
protected Object makeNewServiceObject(MessageContext msgContext, String clsName)
throws Exception {
Object obj = super.makeNewServiceObject(msgContext, clsName);
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -40,6 +40,7 @@
*/
public class AxisTypeGenerator
extends JavaGeneratorFactory {
+
public AxisTypeGenerator() {
super();
Emitter e = new Emitter();
@@ -70,8 +71,7 @@
return new NoopGenerator();
}
- public Generator getGenerator(Definition definition,
- SymbolTable symbolTable) {
+ public Generator getGenerator(Definition definition, 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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -37,6 +37,7 @@
*/
public class AxisTypeGeneratorTask
extends Task {
+
File mWSDL, mOutDir;
boolean generateJWS = false;
@@ -65,8 +66,6 @@
public void execute()
throws BuildException {
try {
- AntClassLoader acl = (AntClassLoader)getClass().getClassLoader();
- //System.out.println(acl.getClasspath());
if(mOutDir != null && mWSDL != null && mWSDL.isDirectory()) {
AxisTypeGenerator atg = new AxisTypeGenerator();
for(File f : mWSDL.listFiles(new WSDLFilter())) {
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -22,19 +22,20 @@
import java.io.File;
-import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Java;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
-
public class WSDL2AJavaTask
extends Java {
- File mWSDL
- ,
- mOutDir;
+ File mWSDL, mOutDir;
+
+ public WSDL2AJavaTask() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
public void setWSDLFile(File wsdl) {
mWSDL = wsdl;
@@ -60,14 +61,6 @@
*/
public void setClasspath(Path s) {
super.setClasspath(s);
- }
-
- /**
- *
- */
- public WSDL2AJavaTask() {
- super();
- // TODO Auto-generated constructor stub
}
public void execute()
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -28,9 +28,8 @@
*/
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -33,24 +33,23 @@
public class AxisTypeLookup
implements BindingLookupService {
+
static Logger logger = Logger.getLogger(AxisTypeLookup.class);
+ private static final char[] pkgSeparators = {'.', ':'};
- /**
- * @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
+
+ TypeDesc td = TypeDesc.getTypeDescForClass(cls);
+
if(null != td) {
return td.getXmlType();
}
@@ -72,8 +71,7 @@
public QName class2qname(Class cls, String namespace) {
if(AxisTypeMappingMetaData.isBuiltInType(cls))
return AxisTypeMappingMetaData.getBuiltInTypeQname(cls);
- return new QName(namespace, Types.getLocalNameFromFullName(cls
- .getName()));
+ return new QName(namespace, Types.getLocalNameFromFullName(cls.getName()));
}
public Class qname2class(QName qType) {
@@ -85,18 +83,15 @@
String packageName = getPackageNameFromQName(qType);
String className;
if(packageName != null && packageName.length() > 0) {
- className = packageName + "."
- + Utils.xmlNameToJavaClass(qType.getLocalPart());
+ 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
@@ -114,15 +109,12 @@
private String getPackageNameFromQName(QName qType) {
// TODO: Later keep a cache of previous conversions, and return the
- // result
- // from cache if there is any.
+ // 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++) {
@@ -131,5 +123,4 @@
return pkg;
}
-
}
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=179452&r1=179451&r2=179452&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 15:57:48 2005
@@ -186,18 +186,16 @@
BeehiveWsTypeMetadata wsm)
throws ClassNotFoundException {
HandlerInfoChainFactory res = null;
- List<? extends BeehiveWsSOAPMessageHandlerInfo> handlers = wsm
- .getSoapHandlers();
+ 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) {
Class handlerClass = ClassUtils.forName(handler.getClassName());
- QName[] handlerHeaders = handler.getHeaders().toArray(
- new QName[0]);
- infoList.add(new HandlerInfo(handlerClass, (Map)handler
- .getParameterMap(), handlerHeaders));
+ QName[] handlerHeaders = handler.getHeaders().toArray(new QName[0]);
+ infoList.add(new HandlerInfo(handlerClass, handler.getParameterMap(), handlerHeaders));
roles.addAll(handler.getRoles());
}
res = new HandlerInfoChainFactory(infoList);
@@ -222,8 +220,7 @@
// retrieve & check relative path
String relativePath = mc.getStrProp(Constants.MC_RELATIVE_PATH);
if(null == relativePath) {
- throw new Exception(
- "relative path not set properly in message context");
+ throw new Exception("relative path not set properly in message context");
}
// turn relative path into fq class name
@@ -241,6 +238,7 @@
if(! relativePath.startsWith("/")) {
throw new Exception("invalid relative path: " + relativePath);
}
+
String className = null;
if(relativePath.endsWith(JWS_EXTENSION)) {
className = relativePath.substring(1, relativePath.length() - JWS_EXTENSION.length()).replaceAll("/", ".");
@@ -253,6 +251,7 @@
if(logger.isDebugEnabled()) {
logger.debug("trying to load web service class: " + className);
}
+
Class clazz = Jsr181ObjectModelStore.loadWebServiceClass(className);
if(null == clazz) {
if(logger.isDebugEnabled()) {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeMappingMetaData.java Wed Jun 1 15:57:48 2005
@@ -20,11 +20,11 @@
* Window - Preferences - Java - Code Style - Code Templates
*/
public class AxisTypeMappingMetaData {
+
static Map<Class, QName> builtInTypes = new HashMap<Class, QName>();
static {
initBuildInTypes();
-
}
/**
@@ -35,7 +35,7 @@
return (builtInTypes.containsKey(cls));
}
- /* (non-Javadoc)
+ /*
* @see org.apache.beehive.wsm.registration.TypeRegistrar#getBuiltInTypeQname(java.lang.Class)
*/
static public QName getBuiltInTypeQname(Class cls) {
@@ -97,13 +97,11 @@
// Mapping for xsd:time. Map to Axis type Time
addBuiltInType(Constants.XSD_TIME, org.apache.axis.types.Time.class);
// These are the g* types (gYearMonth, etc) which map to Axis types
- addBuiltInType(Constants.XSD_YEARMONTH,
- org.apache.axis.types.YearMonth.class);
+ addBuiltInType(Constants.XSD_YEARMONTH, org.apache.axis.types.YearMonth.class);
addBuiltInType(Constants.XSD_YEAR, org.apache.axis.types.Year.class);
addBuiltInType(Constants.XSD_MONTH, org.apache.axis.types.Month.class);
addBuiltInType(Constants.XSD_DAY, org.apache.axis.types.Day.class);
- addBuiltInType(Constants.XSD_MONTHDAY,
- org.apache.axis.types.MonthDay.class);
+ addBuiltInType(Constants.XSD_MONTHDAY, org.apache.axis.types.MonthDay.class);
// Serialize all extensions of Map to SOAP_MAP
// Order counts here, HashMap should be last.
@@ -131,106 +129,35 @@
// javax.activation.DataHandler.class);
// }
- // xsd:token
addBuiltInType(Constants.XSD_TOKEN, org.apache.axis.types.Token.class);
-
- // a xsd:normalizedString
- addBuiltInType(Constants.XSD_NORMALIZEDSTRING,
- org.apache.axis.types.NormalizedString.class);
-
- // a xsd:unsignedLong
- addBuiltInType(Constants.XSD_UNSIGNEDLONG,
- org.apache.axis.types.UnsignedLong.class);
-
- // a xsd:unsignedInt
- addBuiltInType(Constants.XSD_UNSIGNEDINT,
- org.apache.axis.types.UnsignedInt.class);
-
- // a xsd:unsignedShort
- addBuiltInType(Constants.XSD_UNSIGNEDSHORT,
- org.apache.axis.types.UnsignedShort.class);
-
- // a xsd:unsignedByte
- addBuiltInType(Constants.XSD_UNSIGNEDBYTE,
- org.apache.axis.types.UnsignedByte.class);
-
- // a xsd:nonNegativeInteger
- addBuiltInType(Constants.XSD_NONNEGATIVEINTEGER,
- org.apache.axis.types.NonNegativeInteger.class);
-
- // a xsd:negativeInteger
- addBuiltInType(Constants.XSD_NEGATIVEINTEGER,
- org.apache.axis.types.NegativeInteger.class);
-
- // a xsd:positiveInteger
- addBuiltInType(Constants.XSD_POSITIVEINTEGER,
- org.apache.axis.types.PositiveInteger.class);
-
- // a xsd:nonPositiveInteger
- addBuiltInType(Constants.XSD_NONPOSITIVEINTEGER,
- org.apache.axis.types.NonPositiveInteger.class);
-
- // a xsd:Name
+ addBuiltInType(Constants.XSD_NORMALIZEDSTRING, org.apache.axis.types.NormalizedString.class);
+ addBuiltInType(Constants.XSD_UNSIGNEDLONG, org.apache.axis.types.UnsignedLong.class);
+ addBuiltInType(Constants.XSD_UNSIGNEDINT, org.apache.axis.types.UnsignedInt.class);
+ addBuiltInType(Constants.XSD_UNSIGNEDSHORT, org.apache.axis.types.UnsignedShort.class);
+ addBuiltInType(Constants.XSD_UNSIGNEDBYTE, org.apache.axis.types.UnsignedByte.class);
+ addBuiltInType(Constants.XSD_NONNEGATIVEINTEGER, org.apache.axis.types.NonNegativeInteger.class);
+ addBuiltInType(Constants.XSD_NEGATIVEINTEGER, org.apache.axis.types.NegativeInteger.class);
+ addBuiltInType(Constants.XSD_POSITIVEINTEGER, org.apache.axis.types.PositiveInteger.class);
+ addBuiltInType(Constants.XSD_NONPOSITIVEINTEGER, org.apache.axis.types.NonPositiveInteger.class);
addBuiltInType(Constants.XSD_NAME, org.apache.axis.types.Name.class);
-
- // a xsd:NCName
addBuiltInType(Constants.XSD_NCNAME, org.apache.axis.types.NCName.class);
-
- // a xsd:ID
addBuiltInType(Constants.XSD_ID, org.apache.axis.types.Id.class);
-
- // a xml:lang
addBuiltInType(Constants.XML_LANG, org.apache.axis.types.Language.class);
-
- // a xsd:language
- addBuiltInType(Constants.XSD_LANGUAGE,
- org.apache.axis.types.Language.class);
-
- // a xsd:NmToken
- addBuiltInType(Constants.XSD_NMTOKEN,
- org.apache.axis.types.NMToken.class);
-
- // a xsd:NmTokens
- addBuiltInType(Constants.XSD_NMTOKENS,
- org.apache.axis.types.NMTokens.class);
-
- // a xsd:NOTATION
- addBuiltInType(Constants.XSD_NOTATION,
- org.apache.axis.types.Notation.class);
-
- // a xsd:XSD_ENTITY
+ addBuiltInType(Constants.XSD_LANGUAGE, org.apache.axis.types.Language.class);
+ addBuiltInType(Constants.XSD_NMTOKEN, org.apache.axis.types.NMToken.class);
+ addBuiltInType(Constants.XSD_NMTOKENS, org.apache.axis.types.NMTokens.class);
+ addBuiltInType(Constants.XSD_NOTATION, org.apache.axis.types.Notation.class);
addBuiltInType(Constants.XSD_ENTITY, org.apache.axis.types.Entity.class);
-
- // a xsd:XSD_ENTITIES
- addBuiltInType(Constants.XSD_ENTITIES,
- org.apache.axis.types.Entities.class);
-
- // a xsd:XSD_IDREF
+ addBuiltInType(Constants.XSD_ENTITIES, org.apache.axis.types.Entities.class);
addBuiltInType(Constants.XSD_IDREF, org.apache.axis.types.IDRef.class);
-
- // a xsd:XSD_XSD_IDREFS
addBuiltInType(Constants.XSD_IDREFS, org.apache.axis.types.IDRefs.class);
-
- // a xsd:Duration
- addBuiltInType(Constants.XSD_DURATION,
- org.apache.axis.types.Duration.class);
-
- // a xsd:anyURI
+ addBuiltInType(Constants.XSD_DURATION, org.apache.axis.types.Duration.class);
addBuiltInType(Constants.XSD_ANYURI, org.apache.axis.types.URI.class);
-
- // a xsd:schema
addBuiltInType(Constants.XSD_SCHEMA, org.apache.axis.types.Schema.class);
-
addBuiltInType(Constants.SOAP_ARRAY, java.util.ArrayList.class);
}
- /**
- * @param xsd_hexbin
- * @param name
- */
static private void addBuiltInType(QName q, Class c) {
builtInTypes.put(c, q);
-
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/registration/AxisTypeRegistrar.java Wed Jun 1 15:57:48 2005
@@ -50,10 +50,8 @@
public AxisTypeRegistrar(TypeMapping tm, BindingLookupService lookupService) {
super(tm, lookupService);
-
}
-
/**
* @param cls
* @return boolean
@@ -62,20 +60,15 @@
return (AxisTypeMappingMetaData.isBuiltInType(cls));
}
-
/**
* @param cls
* @param q
*/
- protected void registerClassAsWithDefaultSearialization(Class cls, QName q, SOAPBinding.Style style,
- SOAPBinding.Use use) {
+ protected void registerClassAsWithDefaultSearialization(Class cls, QName q, SOAPBinding.Style style, SOAPBinding.Use use) {
try {
- logger.debug("Assigned Default Serialization to class: " + cls.getCanonicalName()
- + " qname:" + q);
- TypeDesc td = TypeDesc.getTypeDescForClass(cls); // a class can
- // provide its
- // own
- // descriptors
+ logger.debug("Assigned Default Serialization to class: " + cls.getCanonicalName() + " qname:" + q);
+ TypeDesc td = TypeDesc.getTypeDescForClass(cls);
+ // a class can provide its own descriptors
TypeDesc superTd = null;
BeanPropertyDescriptor[] superPd = null;
boolean shoudRegisterFields = false;
@@ -83,11 +76,13 @@
shoudRegisterFields = true;
td = new TypeDesc(cls);
Class supa = cls.getSuperclass();
- if((supa != null) && (supa != java.lang.Object.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)) {
+
registerType(supa, style, use);
superTd = TypeDesc.getTypeDescForClass(supa);
if(superTd != null) {
@@ -104,13 +99,13 @@
* is no way to know if it is used only in serialization.
*/
new BeanDeserializerFactory(cls, q));
+
Map serProps = BeanDeserializerFactory.getProperties(cls, null);
- for(BeanPropertyDescriptor beanProps : (Collection<BeanPropertyDescriptor>)serProps
- .values()) {
+ for(BeanPropertyDescriptor beanProps : (Collection<BeanPropertyDescriptor>)serProps.values()) {
Class subType = beanProps.getType();
if(!(subType.isPrimitive()
- || subType.getName().startsWith("java.") || subType
- .getName().startsWith("javax."))) {
+ || subType.getName().startsWith("java.")
+ || subType.getName().startsWith("javax."))) {
registerType(subType, style, use);
}
if(shoudRegisterFields) {
@@ -143,8 +138,7 @@
}
}
catch(RuntimeException e) {
- logger.error("Error in registering class: "
- + cls.getCanonicalName() + " qname:" + q);
+ logger.error("Error in registering class: " + cls.getCanonicalName() + " qname:" + q);
e.printStackTrace();
throw e;
}
@@ -155,10 +149,8 @@
* @param q
*/
protected void registerClassAsXMLBeans(Class cls, QName q) {
- logger.debug("Assigned XMLBeans Serialization to class: " + cls.getCanonicalName()
- + " qname:" + q);
- mTypeMapping.register(cls, q, new XmlBeanSerializerFactory(cls, q),
- new XmlBeanDeserializerFactory(cls, q));
+ logger.debug("Assigned XMLBeans Serialization to class: " + cls.getCanonicalName() + " qname:" + q);
+ mTypeMapping.register(cls, q, new XmlBeanSerializerFactory(cls, q), new XmlBeanDeserializerFactory(cls, q));
}
/**
@@ -174,20 +166,18 @@
throws ClassNotFoundException, NoSuchMethodException,
InstantiationException, IllegalAccessException,
InvocationTargetException {
- logger.debug("Assigned DataHandler to class: " + cls.getCanonicalName()
- + " qname:" + q); /*
+ logger.debug("Assigned DataHandler to class: " + cls.getCanonicalName() + " qname:" + q);
+ /*
* NOTE jcolwell@bea.com 2004-Oct-08 -- doing reflection here in case
* AXIS was built without attachment support.
*/
ClassLoader cl = getClass().getClassLoader();
- 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);
- Constructor<DeserializerFactory> dsfCon = dsfClass.getConstructor(
- Class.class, QName.class);
+ 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);
+ Constructor<DeserializerFactory> dsfCon = dsfClass.getConstructor(Class.class, QName.class);
SerializerFactory sf = sfCon.newInstance(cls, q);
DeserializerFactory dsf = dsfCon.newInstance(cls, q);
mTypeMapping.register(cls, q, sf, dsf);
@@ -201,7 +191,6 @@
logger.debug("Assigned Array Serialization to class: " + cls.getCanonicalName()
+ " qname:" + q + " Array element qname: " + lookupService.class2qname(cls.getComponentType()));
-
mTypeMapping.register(cls, q, new ArraySerializerFactory(lookupService.class2qname(cls.getComponentType())),
new ArrayDeserializerFactory());
}
@@ -220,8 +209,7 @@
* @return QName
*/
protected QName getRegisteredQName(Class cls) {
- QName currentQName = ((org.apache.axis.encoding.TypeMapping)mTypeMapping)
- .getTypeQName(cls);
+ QName currentQName = ((org.apache.axis.encoding.TypeMapping)mTypeMapping).getTypeQName(cls);
return currentQName;
}
@@ -230,7 +218,6 @@
*/
public QName getVoidType() {
return XMLType.AXIS_VOID;
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Group.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Group.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Group.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Group.java Wed Jun 1 15:57:48 2005
@@ -27,19 +27,16 @@
public String getName();
-
public void addUser(User user);
public User getUser(String user);
public Collection<User> getUsers();
-
public void addRole(Role role);
public Role getRole(String role);
public Collection<Role> getRoles();
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Role.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Role.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Role.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/Role.java Wed Jun 1 15:57:48 2005
@@ -20,12 +20,10 @@
*
*/
-
public interface Role {
public String getName();
public void setName(String name);
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/SecurityModel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/SecurityModel.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/SecurityModel.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/SecurityModel.java Wed Jun 1 15:57:48 2005
@@ -26,7 +26,6 @@
public void init(MessageContext msgContext);
public boolean isUserInRole(MessageContext msgContext, Collection<String> rolesAllowed);
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/User.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/User.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/User.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/User.java Wed Jun 1 15:57:48 2005
@@ -48,6 +48,5 @@
public Role getRole(String role);
public Collection<Role> getRoles();
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/UserList.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/UserList.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/UserList.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/UserList.java Wed Jun 1 15:57:48 2005
@@ -29,19 +29,16 @@
public Collection<User> getUsers();
-
public void addGroup(Group user);
public Group getGroup(String name);
public Collection<Group> getGroups();
-
public void addRole(Role role);
public Role getRole(String role);
public Collection<Role> getRoles();
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/AxisSecurityModel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/AxisSecurityModel.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/AxisSecurityModel.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/AxisSecurityModel.java Wed Jun 1 15:57:48 2005
@@ -35,7 +35,6 @@
protected static Logger logger = Logger.getLogger(AxisSecurityModel.class);
public void init(MessageContext msgContext) {
- // do nothing
}
/**
@@ -99,6 +98,4 @@
return false;
}
-
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/BeehiveMemorySecurityModel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/BeehiveMemorySecurityModel.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/BeehiveMemorySecurityModel.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/BeehiveMemorySecurityModel.java Wed Jun 1 15:57:48 2005
@@ -54,39 +54,34 @@
return;
}
- synchronized(BeehiveMemorySecurityModel.class)
- {
+ synchronized(BeehiveMemorySecurityModel.class) {
+ if(userList == null) {
- if(userList == null) {
-
- String configPath = msgContext.getStrProp(Constants.MC_CONFIGPATH);
- if(configPath == null) {
- configPath = "";
- }
- else {
- configPath += File.separator;
- }
-
- if(logger.isDebugEnabled()) {
- logger.debug("BEEHIVE_ROLE_FILE : " + configPath + BEEHIVE_ROLE_FILE);
- }
-
- BeehiveRoleDocument brd = null;
-
- try {
- brd = BeehiveRoleDocument.Factory.parse(new File(configPath + BEEHIVE_ROLE_FILE));
- }
- catch(Exception e) {
- logger.error("BeehiveRoleDocument couldn't parse the file (" + configPath + BEEHIVE_ROLE_FILE + ") : " + e.getMessage(), e);
- return;
- }
+ String configPath = msgContext.getStrProp(Constants.MC_CONFIGPATH);
+ if(configPath == null) {
+ configPath = "";
+ }
+ else {
+ configPath += File.separator;
+ }
- userList = createUserList(brd);
+ if(logger.isDebugEnabled()) {
+ logger.debug("BEEHIVE_ROLE_FILE : " + configPath + BEEHIVE_ROLE_FILE);
+ }
+ BeehiveRoleDocument brd = null;
+ try {
+ brd = BeehiveRoleDocument.Factory.parse(new File(configPath + BEEHIVE_ROLE_FILE));
+ }
+ catch(Exception e) {
+ logger.error("BeehiveRoleDocument couldn't parse the file (" + configPath + BEEHIVE_ROLE_FILE + ") : " + e.getMessage(), e);
+ return;
}
- } // synchronized
+ userList = createUserList(brd);
+ }
+ } // synchronized
if(logger.isDebugEnabled()) {
logger.debug("Exit : BeehiveMemorySecurityModel::init");
}
@@ -98,8 +93,7 @@
UserList userList = new MemoryUserListImpl();
// constructs Role.
- for(org.apache.beehive.wsm.axis.security.xmlbeans.Role role : beehiveRole.getRoleArray())
- {
+ for(org.apache.beehive.wsm.axis.security.xmlbeans.Role role : beehiveRole.getRoleArray()) {
MemoryRoleImpl memoryRole = new MemoryRoleImpl();
memoryRole.setName(role.getName());
@@ -114,10 +108,8 @@
userList.addGroup(memoryGroup);
- for(org.apache.beehive.wsm.axis.security.xmlbeans.Role role : beehiveRole.getRoleArray())
- {
- for(String groupName : role.getGroupArray())
- {
+ for(org.apache.beehive.wsm.axis.security.xmlbeans.Role role : beehiveRole.getRoleArray()) {
+ for(String groupName : role.getGroupArray()) {
if(groupName.equals(group.getName())) {
Role memoryRole = userList.getRole(role.getName());
if(memoryRole != null) {
@@ -133,17 +125,14 @@
}
// constructs User.
- for(org.apache.beehive.wsm.axis.security.xmlbeans.User user : beehiveRole.getUserArray())
- {
+ for(org.apache.beehive.wsm.axis.security.xmlbeans.User user : beehiveRole.getUserArray()) {
MemoryUserImpl memoryUser = new MemoryUserImpl();
memoryUser.setName(user.getName());
memoryUser.setPassword(user.getPassword());
memoryUser.setMd5(user.getMd5());
- for(org.apache.beehive.wsm.axis.security.xmlbeans.Group group : beehiveRole.getGroupArray())
- {
- for(String userName : group.getUserArray())
- {
+ for(org.apache.beehive.wsm.axis.security.xmlbeans.Group group : beehiveRole.getGroupArray()) {
+ for(String userName : group.getUserArray()) {
if(userName.equals(user.getName())) {
Group memoryGroup = userList.getGroup(group.getName());
if(memoryGroup != null) {
@@ -156,8 +145,7 @@
memoryUser.addGroup(memoryGroup);
// user inherits this group's roles.
- for(Role memoryRole : memoryGroup.getRoles())
- {
+ for(Role memoryRole : memoryGroup.getRoles()) {
memoryUser.addRole(memoryRole);
}
@@ -166,11 +154,8 @@
}
}
-
- for(org.apache.beehive.wsm.axis.security.xmlbeans.Role role : beehiveRole.getRoleArray())
- {
- for(String userName : role.getUserArray())
- {
+ for(org.apache.beehive.wsm.axis.security.xmlbeans.Role role : beehiveRole.getRoleArray()) {
+ for(String userName : role.getUserArray()) {
if(userName.equals(user.getName())) {
Role memoryRole = userList.getRole(role.getName());
if(memoryRole != null) {
@@ -209,8 +194,6 @@
}
User user = userList.getUser(username);
-
-
if(user == null) {
if(logger.isDebugEnabled()) {
logger.debug("user returned from userList is null");
@@ -229,15 +212,13 @@
logger.debug("authenticate passed (" + username + ")");
}
- for(Role role : user.getRoles())
- {
+ for(Role role : user.getRoles()) {
if(logger.isDebugEnabled()) {
logger.debug("user [" + user.getName() + "] role [" + role.getName() + "]");
}
- for(String roleAllowed : rolesAllowed)
- {
+ for(String roleAllowed : rolesAllowed) {
if(role.getName().equals(roleAllowed)) {
if(logger.isDebugEnabled()) {
logger.debug("auth : " + user.getName() + " is in role [" + roleAllowed + "]");
@@ -246,7 +227,6 @@
return true;
}
}
-
}
if(logger.isDebugEnabled()) {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryGroupImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryGroupImpl.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryGroupImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryGroupImpl.java Wed Jun 1 15:57:48 2005
@@ -29,7 +29,6 @@
import org.apache.beehive.wsm.axis.security.User;
import org.apache.commons.codec.digest.DigestUtils;
-
public class MemoryGroupImpl
implements Group {
private String name;
@@ -50,7 +49,6 @@
return name;
}
-
public void addUser(User user) {
users.put(user.getName(), user);
}
@@ -63,7 +61,6 @@
return users.values();
}
-
public void addRole(Role role) {
roles.put(role.getName(), role);
}
@@ -75,6 +72,5 @@
public Collection<Role> getRoles() {
return roles.values();
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryRoleImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryRoleImpl.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryRoleImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryRoleImpl.java Wed Jun 1 15:57:48 2005
@@ -36,7 +36,6 @@
public void setName(String name) {
this.name = name;
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserImpl.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserImpl.java Wed Jun 1 15:57:48 2005
@@ -90,7 +90,6 @@
}
return false;
-
}
public void addGroup(Group group) {
@@ -116,5 +115,4 @@
public Collection<Role> getRoles() {
return roles.values();
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserListImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserListImpl.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserListImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/MemoryUserListImpl.java Wed Jun 1 15:57:48 2005
@@ -53,7 +53,6 @@
return users.values();
}
-
public void addGroup(Group group) {
groups.put(group.getName(), group);
}
@@ -66,7 +65,6 @@
return groups.values();
}
-
public void addRole(Role role) {
roles.put(role.getName(), role);
}
@@ -78,6 +76,5 @@
public Collection<Role> getRoles() {
return roles.values();
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/ServletSecurityModel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/ServletSecurityModel.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/ServletSecurityModel.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/security/model/ServletSecurityModel.java Wed Jun 1 15:57:48 2005
@@ -77,8 +77,7 @@
return false;
}
- for(String role : rolesAllowed)
- {
+ for(String role : rolesAllowed) {
if(provider.userMatches(authUser, role)) {
// BINGO !!
@@ -97,6 +96,4 @@
return false;
}
-
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/tools/Wsdl2AJava.java Wed Jun 1 15:57:48 2005
@@ -28,13 +28,13 @@
public class Wsdl2AJava
extends AbstractWsdl2AJava {
+
public Wsdl2AJava()
throws Exception {
super();
// TODO Auto-generated constructor stub
}
-
protected BeehiveWsTypeMetadata getWSObjectModel(InputStream wsdl)
throws Exception {
XmlBeanWSDLProcessor processor = new XmlBeanWSDLProcessor(wsdl);
@@ -43,18 +43,15 @@
}
-
public static int main(String args[])
throws Exception {
if(args.length < 2) {
- System.out
- .println("Usage: Wsdl2AJava <wsdlFileName> <base source dir>");
+ System.out.println("Usage: Wsdl2AJava <wsdlFileName> <base source dir>");
return (-1);
}
Wsdl2AJava processor = new Wsdl2AJava();
processor.init();
processor.generateAnnotatedJavaFromWSDL(args[0], args[1]);
return 0;
-
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/AxisTypeMappingUtil.java Wed Jun 1 15:57:48 2005
@@ -54,11 +54,11 @@
*/
public class AxisTypeMappingUtil
extends XmlBeanTypeMappingUtil {
+
private TypeMapping mTypeMapping;
public AxisTypeMappingUtil(TypeMapping tm) {
super();
-
mTypeMapping = tm;
}
@@ -76,11 +76,9 @@
q = null;
}
else {
-
q = mTypeMapping.getTypeQName(cls);
- if(q == null ||
- (expectedType != null && !expectedType.equals(q))) {
+ if(q == null || (expectedType != null && !expectedType.equals(q))) {
if(expectedType == null) {
q = generateQName(cls, "http://no.namespace.specified");
@@ -91,7 +89,8 @@
if(cls.isArray()) {
if(!mTypeMapping.isRegistered(cls, q)) {
- mTypeMapping.register(cls, q,
+ mTypeMapping.register(cls,
+ q,
new ArraySerializerFactory(cls, q),
new ArrayDeserializerFactory());
}
@@ -103,7 +102,8 @@
}
else if(!mTypeMapping.isRegistered(cls, q)) {
if(XmlObject.class.isAssignableFrom(cls)) {
- mTypeMapping.register(cls, q,
+ mTypeMapping.register(cls,
+ q,
new XmlBeanSerializerFactory(cls, q),
new XmlBeanDeserializerFactory(cls, q));
}
@@ -124,17 +124,13 @@
*/
ClassLoader cl = getClass().getClassLoader();
Class<SerializerFactory> sfClass =
- (Class<SerializerFactory>)
- cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
+ (Class<SerializerFactory>)cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory");
Class<DeserializerFactory> dsfClass =
- (Class<DeserializerFactory>)
- cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory");
+ (Class<DeserializerFactory>)cl.loadClass("org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory");
Constructor<SerializerFactory> sfCon =
- sfClass.getConstructor(Class.class,
- QName.class);
+ sfClass.getConstructor(Class.class, QName.class);
Constructor<DeserializerFactory> dsfCon =
- dsfClass.getConstructor(Class.class,
- QName.class);
+ dsfClass.getConstructor(Class.class, QName.class);
SerializerFactory sf = sfCon.newInstance(cls, q);
DeserializerFactory dsf = dsfCon.newInstance(cls, q);
mTypeMapping.register(cls, q, sf, dsf);
@@ -177,8 +173,7 @@
&& (supa != org.apache.axis.AxisFault.class)) {
registerType(supa);
}
- superTd = TypeDesc
- .getTypeDescForClass(supa);
+ superTd = TypeDesc.getTypeDescForClass(supa);
if(superTd != null) {
superPd = superTd.getPropertyDescriptors();
}
@@ -188,7 +183,8 @@
else {
td = null;
}
- mTypeMapping.register(cls, q,
+ mTypeMapping.register(cls,
+ q,
new BeanSerializerFactory(cls, q),
/*
* NOTE jcolwell@bea.com 2004-Oct-11 --
@@ -198,11 +194,9 @@
* used only in serialization.
*/
new BeanDeserializerFactory(cls, q));
- Map serProps = BeanDeserializerFactory
- .getProperties(cls, null);
- for(BeanPropertyDescriptor beanProps :
- (Collection<BeanPropertyDescriptor>)serProps
- .values()) {
+
+ Map serProps = BeanDeserializerFactory.getProperties(cls, null);
+ for(BeanPropertyDescriptor beanProps : (Collection<BeanPropertyDescriptor>)serProps.values()) {
Class subType = beanProps.getType();
if(!(subType.isPrimitive()
|| subType.getName().startsWith("java.")
@@ -213,11 +207,8 @@
String ns = q.getNamespaceURI();
if(superTd != null && superPd != null) {
for(int j = 0; j < superPd.length; j++) {
- if(beanProps.getName()
- .equals(superPd[j]
- .getName())) {
- ns = superTd.getXmlType()
- .getNamespaceURI();
+ if(beanProps.getName().equals(superPd[j].getName())) {
+ ns = superTd.getXmlType().getNamespaceURI();
break;
}
}
@@ -225,8 +216,7 @@
FieldDesc fd = new ElementDesc();
fd.setJavaType(subType);
fd.setFieldName(beanProps.getName());
- fd.setXmlName(new QName(ns,
- beanProps.getName()));
+ fd.setXmlName(new QName(ns, beanProps.getName()));
// NOTE jcolwell@bea.com 2004-Oct-28 -- might need
// to do more to ensure a useful type QName.
fd.setXmlType(mTypeMapping.getTypeQName(subType));
@@ -267,8 +257,7 @@
private Class getDataHandlerClass() {
try {
- return getClass().getClassLoader()
- .loadClass("javax.activation.DataHandler");
+ return getClass().getClassLoader().loadClass("javax.activation.DataHandler");
}
catch(Exception e) {
}
@@ -277,8 +266,7 @@
private Class getMultipartClass() {
try {
- return getClass().getClassLoader()
- .loadClass("javax.mail.internet.MimeMultipart");
+ return getClass().getClassLoader().loadClass("javax.mail.internet.MimeMultipart");
}
catch(Exception e) {
}
@@ -290,13 +278,10 @@
QName generated = super.generateQName(type, defaultNS);
if(generated == null) {
String namespace = Namespaces.makeNamespace(type.getName());
- if(namespace == null || namespace
- .endsWith("DefaultNamespace")) {
+ if(namespace == null || namespace.endsWith("DefaultNamespace")) {
namespace = defaultNS;
}
- generated = new QName(namespace,
- Types.getLocalNameFromFullName(type
- .getName()));
+ generated = new QName(namespace, Types.getLocalNameFromFullName(type.getName()));
}
return generated;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/DebugPrintMessageHandler.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/DebugPrintMessageHandler.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/DebugPrintMessageHandler.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/DebugPrintMessageHandler.java Wed Jun 1 15:57:48 2005
@@ -24,12 +24,12 @@
import org.apache.axis.MessageContext;
import org.apache.axis.handlers.BasicHandler;
-
public class DebugPrintMessageHandler
extends BasicHandler {
- /* (non-Javadoc)
- * @see org.apache.axis.Handler#invoke(org.apache.axis.MessageContext)
- */
+
+ /*
+ * @see org.apache.axis.Handler#invoke(org.apache.axis.MessageContext)
+ */
public void invoke(MessageContext mc)
throws AxisFault {
try {
@@ -43,7 +43,5 @@
catch(IOException e) {
e.printStackTrace();
}
-
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java Wed Jun 1 15:57:48 2005
@@ -40,6 +40,7 @@
*/
public class XmlBeanDeserializer
extends DeserializerImpl {
+
private Class mJavaType;
private QName mXmlType;
@@ -48,14 +49,15 @@
mXmlType = xmlType;
}
- public void onStartElement(String namespace, String localName,
- String prefix, Attributes attributes,
+ public void onStartElement(String namespace,
+ String localName,
+ String prefix,
+ Attributes attributes,
DeserializationContext context)
throws SAXException {
try {
MessageElement me = context.getCurElement();
- XmlOptions opts = new XmlOptions()
- .setLoadReplaceDocumentElement(null);
+ XmlOptions opts = new XmlOptions().setLoadReplaceDocumentElement(null);
XmlObject xObj = XmlObject.Factory.parse(me, opts);
SchemaType st = xObj.schemaType();
SchemaType jt = (SchemaType)mJavaType.getField("type").get(null);
@@ -79,4 +81,4 @@
throw new SAXException(xe);
}
}
-}
+}
\ No newline at end of file
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java Wed Jun 1 15:57:48 2005
@@ -32,6 +32,7 @@
*/
public class XmlBeanDeserializerFactory
extends BaseDeserializerFactory {
+
public XmlBeanDeserializerFactory(Class javaType, QName xmlType) {
super(XmlBeanDeserializer.class, xmlType, javaType);
}