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 [2/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/
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java Wed Jun 1 15:57:48 2005
@@ -51,6 +51,7 @@
*/
public class XmlBeanSerializer
implements Serializer {
+
/**
* Serialize an element named name, with the indicated attributes and value.
*
@@ -63,10 +64,8 @@
SerializationContext context)
throws IOException {
if(!(value instanceof XmlObject)) {
- throw new IOException(((value != null)
- ? value.getClass().getName()
- : "null")
- + " is not an " + XmlObject.class.getName());
+ throw new IOException(
+ ((value != null) ? value.getClass().getName() : "null") + " is not an " + XmlObject.class.getName());
}
else {
context.setWriteXMLType(null);
@@ -103,11 +102,11 @@
*/
public Element writeSchema(Class javaType, Types types)
throws Exception {
+
try {
if(!XmlObject.class.isAssignableFrom(javaType)) {
- throw new RuntimeException(
- "Invalid Object type is assigned to the XMLBeanSerialization Type: "
- + javaType.getCanonicalName());
+ throw new RuntimeException
+ ("Invalid Object type is assigned to the XMLBeanSerialization Type: " + javaType.getCanonicalName());
}
SchemaType docType = XmlBeans.typeForClass(javaType);
@@ -194,8 +193,7 @@
* @return Walk all the nodes under the nodeInWSDL if there is an 'element' type the
* add its types or references to the dependent type.
*/
- private void getAllDependentTypes(XmlObject nodeInWSDL,
- Set<QName> dependentTypes) {
+ private void getAllDependentTypes(XmlObject nodeInWSDL, Set<QName> dependentTypes) {
// scan for any node under the type that has "type" or "ref" attribute
XmlCursor cursor = nodeInWSDL.newCursor();
if(cursor.toFirstChild()) { // has child
@@ -205,8 +203,7 @@
break;
}
}
- if(nodeInWSDL.schemaType().getName().getLocalPart().equals(
- "localElement")) {
+ if(nodeInWSDL.schemaType().getName().getLocalPart().equals("localElement")) {
LocalElement e = (LocalElement)nodeInWSDL;
if(e.isSetType())
@@ -215,22 +212,5 @@
dependentTypes.add(e.getRef());
}
return;
- }
-
- // NOTE jcolwell@bea.com 2004-Nov-15 --
- // once the WSDLProcessor is changed to an interface, remove this function
- // and use the one in the upcoming XmlBeanWSDLProcessor.
- private static <T extends XmlObject> T[] selectChildren(XmlObject parent,
- Class<T> childClass)
- throws IllegalAccessException,
- NoSuchFieldException {
- // retrieve the SchemaType from the static type field
- SchemaType st = (SchemaType)childClass.getField("type").get(null);
- XmlObject[] kids = parent.selectChildren(st.getDocumentElementName());
- T[] castKids = (T[])Array.newInstance(childClass, kids.length);
- for(int j = 0; j < castKids.length; j++) {
- castKids[j] = childClass.cast(kids[j]);
- }
- return castKids;
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java Wed Jun 1 15:57:48 2005
@@ -32,6 +32,7 @@
*/
public class XmlBeanSerializerFactory
extends BaseSerializerFactory {
+
public XmlBeanSerializerFactory(Class javaType, QName xmlType) {
super(XmlBeanSerializer.class, xmlType, javaType);
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/BindingLookupService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/BindingLookupService.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/BindingLookupService.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/BindingLookupService.java Wed Jun 1 15:57:48 2005
@@ -19,7 +19,6 @@
*/
package org.apache.beehive.wsm.databinding;
-
import javax.xml.namespace.QName;
/*
@@ -35,7 +34,6 @@
* And for a given QName:
* qnameA = class2qname(qname2class(qnameA)
*/
-
public interface BindingLookupService {
public abstract QName class2qname(Class cls);
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/GenericHolder.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/GenericHolder.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/GenericHolder.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/GenericHolder.java Wed Jun 1 15:57:48 2005
@@ -19,7 +19,6 @@
*/
package org.apache.beehive.wsm.databinding;
-
import javax.xml.rpc.holders.Holder;
/**
@@ -29,6 +28,7 @@
*/
public class GenericHolder<T>
implements Holder {
+
public T value;
public GenericHolder(T value) {
@@ -41,6 +41,4 @@
// looking at its class, which requires that for the value class to have been instantiated.
private GenericHolder() {
}
-
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/databinding/xmlbeans/XmlBeanTypeLookup.java Wed Jun 1 15:57:48 2005
@@ -33,6 +33,7 @@
public class XmlBeanTypeLookup
implements BindingLookupService {
+
static Logger logger = Logger.getLogger(XmlBeanTypeLookup.class);
static XmlBeanTypeLookup theLookup = new XmlBeanTypeLookup();
@@ -49,9 +50,9 @@
return res;
}
- /* (non-Javadoc)
- * @see TypeLookUpServices#Qname2Class(javax.xml.namespace.QName)
- */
+ /*
+ * @see TypeLookUpServices#Qname2Class(javax.xml.namespace.QName)
+ */
public Class qname2class(QName qname) {
logger.debug("Get XMLBeans class for Qname: " + qname);
SchemaTypeLoader stl = XmlBeans.getContextTypeLoader();
@@ -69,8 +70,7 @@
//String clName = xmlClass.getName();
if(st.isBuiltinType()) {
Method[] declared = xmlClass.getDeclaredMethods();
- Class natural =
- scanDeclaredMethodsForViableReturnType(declared);
+ Class natural = scanDeclaredMethodsForViableReturnType(declared);
if(natural != null) {
return natural;
}
@@ -80,8 +80,7 @@
if(xmlClass.isInterface()) {
for(Class cl : xmlClass.getInterfaces()) {
- natural = scanDeclaredMethodsForViableReturnType
- (cl.getDeclaredMethods());
+ natural = scanDeclaredMethodsForViableReturnType(cl.getDeclaredMethods());
if(natural != null) {
return natural;
}
@@ -89,8 +88,7 @@
}
else {
declared = xmlClass.getSuperclass().getDeclaredMethods();
- natural = scanDeclaredMethodsForViableReturnType
- (declared);
+ natural = scanDeclaredMethodsForViableReturnType(declared);
if(natural != null) {
return natural;
}
@@ -107,13 +105,11 @@
}
}
- private Class scanDeclaredMethodsForViableReturnType
- (Method[] declared) {
+ private Class scanDeclaredMethodsForViableReturnType(Method[] declared) {
/* TODO: Does this make sense? IT looks as if the type of the class is determined based on the
* method return types.
*/
for(Method meth : declared) {
-
Class returnType = meth.getReturnType();
//System.out.println(returnType.getName());
if(!returnType.equals(Void.TYPE)) {
@@ -146,5 +142,4 @@
public static Class q2Class(QName q) {
return theLookup.qname2class(q);
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsMethodMetadata.java Wed Jun 1 15:57:48 2005
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.wsm.model;
-
import java.util.List;
import javax.xml.namespace.QName;
@@ -28,7 +27,6 @@
boolean isOneWay();
void setOneWay(boolean oneway);
-
String getWmAction();
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsSOAPMessageHandlerInfo.java Wed Jun 1 15:57:48 2005
@@ -24,6 +24,7 @@
* @author dmehrtash
*/
public interface BeehiveWsSOAPMessageHandlerInfo {
+
/**
* @return Returns the className.
*/
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/BeehiveWsTypeMetadata.java Wed Jun 1 15:57:48 2005
@@ -27,6 +27,7 @@
* @author Daryoush
*/
public interface BeehiveWsTypeMetadata {
+
void initHandlersFromChainConfig(URL chainConfigURL, String chainName)
throws Exception;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/ValidationException.java Wed Jun 1 15:57:48 2005
@@ -19,6 +19,7 @@
public class ValidationException
extends Exception {
+
public ValidationException() {
super();
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaMethodInfo.java Wed Jun 1 15:57:48 2005
@@ -23,6 +23,7 @@
import java.util.List;
public interface JavaMethodInfo {
+
boolean isPublic();
boolean throwsExceptions();
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaParameterInfo.java Wed Jun 1 15:57:48 2005
@@ -22,6 +22,7 @@
import java.util.Collection;
public interface JavaParameterInfo {
+
boolean isFinal();
String getName();
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/java/JavaTypeInfo.java Wed Jun 1 15:57:48 2005
@@ -23,6 +23,7 @@
import java.util.Collection;
public interface JavaTypeInfo {
+
boolean isAbstract();
boolean isFinal();
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InitParamInfo.java Wed Jun 1 15:57:48 2005
@@ -22,10 +22,10 @@
public class InitParamInfo
implements java.io.Serializable {
+
private static final long serialVersionUID = 1L;
String name;
-
String value;
/**
@@ -74,5 +74,4 @@
public void setValue(String value) {
this.value = value;
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/InvalidFileType.java Wed Jun 1 15:57:48 2005
@@ -20,6 +20,7 @@
public class InvalidFileType
extends Exception {
+
private static final long serialVersionUID = 1L;
/**
@@ -50,5 +51,4 @@
public InvalidFileType(Throwable arg0) {
super(arg0);
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181MethodMetadataImpl.java Wed Jun 1 15:57:48 2005
@@ -37,19 +37,18 @@
public class Jsr181MethodMetadataImpl
implements BeehiveWsMethodMetadata, java.io.Serializable {
+
private static final long serialVersionUID = 1L;
private static final String DEFAULT_WRNAME = "return";
private String wmOperationName;
private String wmAction;
private boolean oneway = false;
- private List<BeehiveWsParameterMetadata> params =
- new ArrayList<BeehiveWsParameterMetadata>();
+ private List<BeehiveWsParameterMetadata> params = new ArrayList<BeehiveWsParameterMetadata>();
private String wrName;
private String wrTargetNamespace;
private String javaMethodName;
private Class javaReturnType;
-
private QName mXMLReturnType;
public void validate()
@@ -85,8 +84,7 @@
javaReturnType = jm.getReturnType();
// get webMethod's webParams
- List<BeehiveWsParameterMetadata> webParams =
- new ArrayList<BeehiveWsParameterMetadata>();
+ List<BeehiveWsParameterMetadata> webParams = new ArrayList<BeehiveWsParameterMetadata>();
for(JavaParameterInfo param : jm.getParameters()) {
BeehiveWsParameterMetadata wspm = new Jsr181ParameterMetadataImpl(param);
if(null == wspm) {
@@ -102,6 +100,7 @@
if(! jm.isPublic()) {
jm.logError("@WebMethod must be public: " + javaMethodName);
}
+
if(null != jm.getAnnotation(Oneway.class)) {
// prohibit @Oneway with @WebResult
if(null != jm.getAnnotation(WebResult.class)) {
@@ -149,6 +148,7 @@
if((null == getWmOperationName()) || (0 == getWmOperationName().length())) {
setWmOperationName(javaMethodName);
}
+
if((null == getWmAction()) || (0 == getWmAction().length())) {
setWmAction("");
}
@@ -157,7 +157,6 @@
addParams(webParams);
}
-
private void initFromAnnotation(WebResult annotation) {
if(null != annotation) {
setWrName(annotation.name());
@@ -184,7 +183,6 @@
this.oneway = oneway;
}
-
public String getWmAction() {
return wmAction;
}
@@ -295,7 +293,6 @@
return false;
}
}
-
// check exceptions?
return true;
@@ -329,7 +326,7 @@
mXMLReturnType = xmlReturnType;
}
- /* (non-Javadoc)
+ /*
* @see org.apache.beehive.wsm.jsr181.model.Jsr181MethodMetadata#setReturnType(java.lang.Class)
*/
public void setReturnType(Class javaType) {
@@ -337,13 +334,15 @@
}
- /* (non-Javadoc)
+ /*
* @see org.apache.beehive.wsm.jsr181.model.BeehiveWsMethodMetadata#findParam(java.lang.String)
*/
public BeehiveWsParameterMetadata findParam(String parmName) {
// walk the list of parameters until the parameter with paramName is found
// there are small number of parameters, so walking the list should be ok
- if(null == parmName) return null;
+ if(null == parmName)
+ return null;
+
BeehiveWsParameterMetadata res = null;
for(BeehiveWsParameterMetadata nxtParam : params) {
if(parmName.equals(nxtParam.getWpName())) {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ObjectModelStore.java Wed Jun 1 15:57:48 2005
@@ -17,7 +17,6 @@
*
* $Header:$Factory
*/
-
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -111,6 +110,7 @@
*/
public void store(BeehiveWsTypeMetadata objectModel)
throws IOException {
+
OutputStream os = env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE, "", getLocation(objectModel.getClassName()));
ObjectOutputStream oos = null;
try {
@@ -155,7 +155,6 @@
try {
clazz = cl.loadClass(className);
}
-
// try className as simple class name
catch(ClassNotFoundException e) {
final File wsDirectory = new File(new File(cl.getResource(LOCATOR).getFile()).getParent());
@@ -179,16 +178,15 @@
* @param wsDirectory The directory to be searched.
* @param simpleName A simple name for the class.
* @return The fully qualified class name if it can be found.
- * @throws ClassNotFoundException If a matching fully qualified class name
- * cannot be found.
*/
- private static String getFullyQualifiedClassName(final File wsDirectory, final String simpleName)
- throws ClassNotFoundException {
+ private static String getFullyQualifiedClassName(final File wsDirectory, final String simpleName) {
+
FilenameFilter filenameFilter = new FilenameFilter() {
public boolean accept(File dir, String name) {
return (wsDirectory.equals(dir) && (name.endsWith(simpleName + EXTENSION)));
}
};
+
String fqClassName = null;
for(File file : wsDirectory.listFiles(filenameFilter)) {
String filename = file.getName();
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181ParameterMetadataImpl.java Wed Jun 1 15:57:48 2005
@@ -29,6 +29,7 @@
public class Jsr181ParameterMetadataImpl
implements BeehiveWsParameterMetadata, java.io.Serializable {
+
private static final long serialVersionUID = 1L;
private String wpName;
@@ -38,7 +39,6 @@
private Class javaType;
private QName mXMLType;
-
public void validate()
throws ValidationException {
return; // no validation required
@@ -136,7 +136,6 @@
*/
public String getJavaTypeFullName() {
return getClassName(getJavaType());
-
}
private String getClassName(Class cls) {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/Jsr181TypeMetadataImpl.java Wed Jun 1 15:57:48 2005
@@ -55,6 +55,7 @@
*/
public class Jsr181TypeMetadataImpl
implements BeehiveWsTypeMetadata, java.io.Serializable {
+
private static final long serialVersionUID = 1L;
private String wsName;
@@ -62,14 +63,12 @@
private String wsWsdlLocation;
private String wsTargetNamespace;
private String wsEndpointInterface;
- private Map<String, BeehiveWsMethodMetadata> methodMap =
- new HashMap<String, BeehiveWsMethodMetadata>();
+ private Map<String, BeehiveWsMethodMetadata> methodMap = new HashMap<String, BeehiveWsMethodMetadata>();
private Set<BeehiveWsMethodMetadata> noDuplicateMethods;
private BeehiveWsSOAPBindingInfo soapBinding;
private String hcFileName;
private String hcName;
- private List<BeehiveWsSOAPMessageHandlerInfo> soapHandlers =
- new ArrayList<BeehiveWsSOAPMessageHandlerInfo>();
+ private List<BeehiveWsSOAPMessageHandlerInfo> soapHandlers = new ArrayList<BeehiveWsSOAPMessageHandlerInfo>();
private String siValue;
private String className;
private File baseLocation;
@@ -748,8 +747,7 @@
}
// todo: this needs to go, as it should really be in Jsr181MethodMetadataImpl!!!
- private String createCompleteMethodSignature(String name,
- Class... paramTypes) {
+ private String createCompleteMethodSignature(String name, Class... paramTypes) {
StringBuilder sb = new StringBuilder(name);
sb.append('(');
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPBindingInfo.java Wed Jun 1 15:57:48 2005
@@ -24,12 +24,12 @@
public class SOAPBindingInfo
implements java.io.Serializable, BeehiveWsSOAPBindingInfo {
+
private static final long serialVersionUID = 1L;
SOAPBinding.Style style = SOAPBinding.Style.DOCUMENT;
SOAPBinding.Use use = SOAPBinding.Use.LITERAL;
- SOAPBinding.ParameterStyle parameterStyle = SOAPBinding
- .ParameterStyle.WRAPPED;
+ SOAPBinding.ParameterStyle parameterStyle = SOAPBinding.ParameterStyle.WRAPPED;
/**
*
@@ -96,8 +96,7 @@
}
public int hashCode() {
- return (((getStyle().hashCode() * 31) + getUse().hashCode()) * 31)
- + getParameterStyle().hashCode();
+ return (((getStyle().hashCode() * 31) + getUse().hashCode()) * 31) + getParameterStyle().hashCode();
}
public String toString() {
@@ -109,9 +108,7 @@
sb.append(encoded ? "ENCODED" : "LITERAL");
if(!rpc && !encoded) {
sb.append('-');
- sb.append((getParameterStyle() == SOAPBinding
- .ParameterStyle.BARE)
- ? "BARE" : "WRAPPED");
+ sb.append((getParameterStyle() == SOAPBinding.ParameterStyle.BARE) ? "BARE" : "WRAPPED");
}
return sb.toString();
}
@@ -120,9 +117,9 @@
if(o != null) {
if(o instanceof SOAPBindingInfo) {
SOAPBindingInfo sbi = (SOAPBindingInfo)o;
- return (getStyle().equals(sbi.getStyle())
- && getUse().equals(sbi.getUse())
- && getParameterStyle().equals(sbi.getParameterStyle()));
+ return getStyle().equals(sbi.getStyle())
+ && getUse().equals(sbi.getUse())
+ && getParameterStyle().equals(sbi.getParameterStyle());
}
}
return false;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/jsr181/SOAPMessageHandlerInfo.java Wed Jun 1 15:57:48 2005
@@ -61,16 +61,13 @@
}
}
- public SOAPMessageHandlerInfo(
- String handlerClassName,
- String handlerName,
- Map<String, String> initParams,
- Collection<String> roles,
- Collection<String> headers
- ) {
+ public SOAPMessageHandlerInfo(String handlerClassName,
+ String handlerName,
+ Map<String, String> initParams,
+ Collection<String> roles,
+ Collection<String> headers) {
setClassName(handlerClassName);
- setName((handlerName != null && handlerName.length() > 0)
- ? handlerName : handlerClassName);
+ setName((handlerName != null && handlerName.length() > 0) ? handlerName : handlerClassName);
addInitParams(initParams);
addRoles(roles);
addHeaders(headers);
@@ -151,5 +148,4 @@
public void addRoles(Collection<String> roles) {
this.roles.addAll(roles);
}
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/model/wsdl/XmlBeanWSDLProcessor.java Wed Jun 1 15:57:48 2005
@@ -73,12 +73,8 @@
*/
public class XmlBeanWSDLProcessor {
private BindingLookupService lookupService;
- DefinitionsDocument defDoc;
- public QName getServiceName() {
- TService[] services = defDoc.getDefinitions().getServiceArray();
- return new QName(services[0].getName());
- }
+ DefinitionsDocument defDoc;
public static final String TRANSPORT = "http://schemas.xmlsoap.org/soap/http";
@@ -88,6 +84,11 @@
public static final String WSDLSOAPNS = "http://schemas.xmlsoap.org/wsdl/soap/";
+ public QName getServiceName() {
+ TService[] services = defDoc.getDefinitions().getServiceArray();
+ return new QName(services[0].getName());
+ }
+
public BeehiveWsTypeMetadata getObjectModel(BindingLookupService lookupService)
throws Exception {
@@ -150,11 +151,9 @@
BeehiveWsParameterMetadata[] paraMeta = new BeehiveWsParameterMetadata[0]; // defualt value
if(null != outputParam) {
-
- TPart[] messageParts = messageMap.get(outputParam.getMessage()
- .getLocalPart());
- paraMeta = processParameters(opName, messageParts, tBind, types,
- messageMap, wsm, true); // output parameters are not wrapped
+ TPart[] messageParts = messageMap.get(outputParam.getMessage().getLocalPart());
+ // output parameters are not wrapped
+ paraMeta = processParameters(opName, messageParts, tBind, types, messageMap, wsm, true);
}
Class returnType;
QName returnXMLType;
@@ -183,18 +182,14 @@
}
}
}
- BeehiveWsMethodMetadata wmm = new Jsr181MethodMetadataImpl(opName, returnType,
- returnXMLType);
+ BeehiveWsMethodMetadata wmm = new Jsr181MethodMetadataImpl(opName, returnType, returnXMLType);
wmm.setWmOperationName(opName);
- // FIXME jcolwell@bea.com 2004-Nov-10 --
- // do something better with the action
+ // FIXME jcolwell@bea.com 2004-Nov-10 -- do something better with the action
wmm.setWmAction(opName);
if(Void.TYPE.equals(returnType)) {
-
if(paraMeta.length == 0) {
- // FIXME jcolwell@bea.com 2004-Nov-22 --
- // also check for faults before setting as oneway.
+ // FIXME jcolwell@bea.com 2004-Nov-22 -- also check for faults before setting as oneway.
wmm.setOneWay(true);
}
}
@@ -205,29 +200,23 @@
methodMap.put(opName, wmm);
- List paramOrder = op.getParameterOrder(); // this is the one used by
- // rpc wsdls.
+ List paramOrder = op.getParameterOrder(); // this is the one used by rpc wsdls.
TParam inputParam = op.getInput();
if(inputParam != null) {
+ TPart[] messageParts = messageMap.get(inputParam.getMessage().getLocalPart());
- TPart[] messageParts = messageMap.get(inputParam.getMessage()
- .getLocalPart());
-
-
- BeehiveWsParameterMetadata[] params = processParameters(opName, messageParts, tBind, types,
- messageMap, wsm, false);
+ BeehiveWsParameterMetadata[] params =
+ processParameters(opName, messageParts, tBind, types, messageMap, wsm, false);
if(paramOrder != null) {
- // Paramorder is only used for rpc.
- // if there is a paramoder then order the parameters, remove all the in/out parameters
- // from the out map
+ // Paramorder is only used for rpc. if there is a paramoder then order the parameters,
+ // remove all the in/out parameters from the out map
for(Object ord : paramOrder) {
for(BeehiveWsParameterMetadata wpm : params) {
if(ord.equals(wpm.getWpName())) {
if(outParamMap != null && outParamMap.containsKey(wpm.getWpName())) {
- outParamMap.remove(wpm.getWpName()); // important...
- // if this param is in.out it was in the out list
- // also, so removeit.
+ outParamMap.remove(wpm.getWpName());
+ // important...if this param is in.out it was in the out list also, so removeit.
wpm.setWpMode(WebParam.Mode.INOUT);
}
else {
@@ -244,13 +233,8 @@
// FIXME jcolwell@bea.com 2005-Jan-04 --
// Double check DOC/Lit rules
if(outParamMap != null && outParamMap.containsKey(wpm.getWpName())) {
- outParamMap.remove(wpm.getWpName()); // important...
- // if
- // this param is
- // in.out it was
- // in the out list
- // also, so remove
- // it.
+ outParamMap.remove(wpm.getWpName());
+ // important...if this param is in.out it was in the out list also, so remove it.
wpm.setWpMode(WebParam.Mode.INOUT);
}
else {
@@ -313,11 +297,8 @@
}
shouldUnwrap = isWrapped(operationName, messageParts, tBind, isOutputParameters);
- List<BeehiveWsParameterMetadata> paramList = new ArrayList<BeehiveWsParameterMetadata>(
- messageParts.length);
- int j = 0;
+ List<BeehiveWsParameterMetadata> paramList = new ArrayList<BeehiveWsParameterMetadata>(messageParts.length);
for(TPart messagePart : messageParts) {
- QName paramXmlType;
// if element attribute is set we are looking at document style
// in case of rpc message part would look something like:
// <part name="key type="xsd:string"/>
@@ -339,17 +320,14 @@
// the parts that are for headers, for instance, should remain intact.
) {
if(!isOutputParameters) {// only set the mode if this is input parameters
- wsm.getSoapBinding().setParameterStyle(
- SOAPBinding.ParameterStyle.WRAPPED);
+ wsm.getSoapBinding().setParameterStyle(SOAPBinding.ParameterStyle.WRAPPED);
paramStyleIsSet = true;
}
if(types != null) { // if there are some type
try {
Schema[] schemas = selectChildren(types, Schema.class);
// We are looking at schemas that are defined in
- // this schema.
- // ---- // THIS WOULD NOT RECOGNIZE IMPORTED
- // SCHEMAS.
+ // this schema. THIS WOULD NOT RECOGNIZE IMPORTED SCHEMAS.
for(Schema s : schemas) {
if(!s.getTargetNamespace().equals(element.getNamespaceURI()))
@@ -369,23 +347,17 @@
.getTargetNamespace(), e));
}
else {
- // we have <element
- // name=xxx> and its child
- // must be comlexType, or
- // somethig is wrong
-
+ // we have <element name=xxx> and its child must be comlexType, or somethig is wrong
ComplexType ct = e.getComplexType();
if(ct != null && ct.isSetSequence()) {
// DOC/LIT WSDL
/* NOTE: There may be other groupings that this code needs
- * to understand also. At this point we expect:
- * <element name="xxx" type="yyy">
+ * to understand also. At this point we expect: <element name="xxx" type="yyy">
* or <element ref="zzz">
*/
Group g = ct.getSequence();
for(Element el : g.getElementArray()) {
- paramList.add(elementToParamMetaData(s
- .getTargetNamespace(), el));
+ paramList.add(elementToParamMetaData(s.getTargetNamespace(), el));
}
}
}
@@ -405,8 +377,7 @@
// the xml we let them do the
// processing.
if(!paramStyleIsSet) // Only set the style to bare if it hasn't been done in previous parts processing
- wsm.getSoapBinding().setParameterStyle(
- SOAPBinding.ParameterStyle.BARE);
+ wsm.getSoapBinding().setParameterStyle(SOAPBinding.ParameterStyle.BARE);
BeehiveWsParameterMetadata wpm = new Jsr181ParameterMetadataImpl();
@@ -458,14 +429,18 @@
private boolean unwrapMessagePart(String operationName, boolean isOutputParameters, TPart message) {
String name = message.getName();
- if("parameters".equals(name)) return true;
- if(isOutputParameters) {
- if(message.getElement().getLocalPart().equals(operationName + "Response")) return true;
+ if("parameters".equals(name))
+ return true;
+ if(isOutputParameters) {
+ if(message.getElement().getLocalPart().equals(operationName + "Response"))
+ return true;
}
else {
- if(message.getElement().getLocalPart().equals(operationName)) return true;
+ if(message.getElement().getLocalPart().equals(operationName))
+ return true;
}
+
return false;
}
@@ -478,8 +453,7 @@
// FIXME
// jcolwell@bea.com
// 2004-Nov-09
- // double check the
- // namespace stuff
+ // double check the namespace stuff
wpm.setWpTargetNamespace(targetNamespace);
boolean isArray = false;
if(el.isSetMaxOccurs()) {
@@ -496,17 +470,13 @@
String name = null;
QName xmlType = null;
if(el.isSetName() && el.isSetType()) {
-
name = el.getName();
-
xmlType = el.getType();
-
}
else if(el.isSetRef()) {
QName ref = el.getRef();
name = ref.getLocalPart();
xmlType = ref;
-
}
else
throw new RuntimeException("invalid element: " + el);
@@ -563,14 +533,11 @@
soapInfo.setUse(SOAPBinding.Use.ENCODED);
}
}
-
setSoapHeaders(wmm, tbMsg);
-
}
// tBop.getOutput and get the headers out of it.
setSoapHeaders(wmm, tBop.getOutput());
-
}
}
@@ -592,12 +559,11 @@
if(argument == null) throw new RuntimeException("Couldn't find part name: " + part + " in method " + wmm.getJavaMethodName());
argument.setWpHeader(true);
}
-
}
}
public static DefinitionsDocument parseWSDL(String wsdlLocation)
- throws IOException, MalformedURLException, XmlException {
+ throws XmlException, IOException, MalformedURLException {
if(wsdlLocation.indexOf("://") > 2) {
return parseWSDL(new URL(wsdlLocation));
}
@@ -612,12 +578,12 @@
}
public static DefinitionsDocument parseWSDL(URL wsdlURL)
- throws IOException, MalformedURLException, XmlException {
+ throws IOException, XmlException {
return DefinitionsDocument.Factory.parse(wsdlURL);
}
public static DefinitionsDocument parseWSDL(InputStream wsdlStream)
- throws IOException, MalformedURLException, XmlException {
+ throws IOException, XmlException {
return DefinitionsDocument.Factory.parse(wsdlStream);
}
@@ -708,13 +674,11 @@
}
public XmlBeanWSDLProcessor(InputStream wsdlStream)
- throws MalformedURLException, IOException, XmlException {
+ throws IOException, XmlException {
super();
this.defDoc = parseWSDL(wsdlStream);
-
}
private XmlBeanWSDLProcessor() {
- // no default constrcutor!
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/ProcessorException.java Wed Jun 1 15:57:48 2005
@@ -25,6 +25,7 @@
*/
public class ProcessorException
extends RuntimeException {
+
public ProcessorException(String msg, Exception e) {
super(msg, e);
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorMethodInfo.java Wed Jun 1 15:57:48 2005
@@ -17,7 +17,6 @@
*
* $Header:$Factory
*/
-
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,6 +33,7 @@
public class MirrorMethodInfo
implements JavaMethodInfo {
+
protected MethodDeclaration decl;
protected AnnotationProcessorEnvironment env;
protected Class returnType;
@@ -43,6 +43,7 @@
if(null == decl) {
throw new IllegalArgumentException("method declaration: <null>");
}
+
this.decl = decl;
this.env = env;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorParameterInfo.java Wed Jun 1 15:57:48 2005
@@ -31,6 +31,7 @@
public class MirrorParameterInfo
implements JavaParameterInfo {
+
protected ParameterDeclaration decl;
protected AnnotationProcessorEnvironment env;
protected Class clazz;
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/MirrorTypeInfo.java Wed Jun 1 15:57:48 2005
@@ -37,6 +37,7 @@
public class MirrorTypeInfo
implements JavaTypeInfo {
+
protected TypeDeclaration decl;
protected AnnotationProcessorEnvironment env;
protected Collection<JavaMethodInfo> methods = new ArrayList<JavaMethodInfo>();
@@ -107,7 +108,6 @@
}
}
}
-
return result;
}
@@ -115,9 +115,7 @@
boolean result = false;
for(MethodDeclaration mdecl : decl.getMethods()) {
if(mdecl.getSimpleName().equals("finalize") && (null == mdecl.getParameters() || mdecl.getParameters().isEmpty()))
- {
result = true;
- }
}
return result;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TwoPhaseAnnotationProcessor.java Wed Jun 1 15:57:48 2005
@@ -64,8 +64,11 @@
*/
abstract public class TwoPhaseAnnotationProcessor
implements AnnotationProcessor {
- public TwoPhaseAnnotationProcessor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
+
+ Set<AnnotationTypeDeclaration> _atds;
+ AnnotationProcessorEnvironment _env;
+
+ public TwoPhaseAnnotationProcessor(Set<AnnotationTypeDeclaration> atds, AnnotationProcessorEnvironment env) {
_atds = atds;
_env = env;
}
@@ -129,7 +132,4 @@
protected AnnotationProcessorEnvironment getAnnotationProcessorEnvironment() {
return _env;
}
-
- Set<AnnotationTypeDeclaration> _atds;
- AnnotationProcessorEnvironment _env;
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/TypeMirrorUtil.java Wed Jun 1 15:57:48 2005
@@ -24,6 +24,7 @@
import com.sun.mirror.type.VoidType;
public class TypeMirrorUtil {
+
// returns a class object of the specified type.
public static Class classForName(TypeMirror type)
throws ClassNotFoundException {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WebServiceMetadataViewer.java Wed Jun 1 15:57:48 2005
@@ -26,6 +26,7 @@
import org.apache.beehive.wsm.model.BeehiveWsTypeMetadata;
public class WebServiceMetadataViewer {
+
// adhock. assume Metadata is not nested more than 5 times. :p
private static String[] TABS = new String[]{
"",
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessor.java Wed Jun 1 15:57:48 2005
@@ -43,6 +43,7 @@
*/
public class WsmAnnotationProcessor
extends TwoPhaseAnnotationProcessor {
+
private Set<TypeDeclaration> handledDecls = new HashSet<TypeDeclaration>();
private Jsr181ObjectModelStore oms;
@@ -64,9 +65,7 @@
public void check(Declaration _decl) {
Messager messager = _env.getMessager();
-
try {
-
// check if we've already handled this declaration
if(handledDecls.contains(_decl)) {
return;
@@ -115,7 +114,6 @@
// persist object model
oms.store(om);
}
-
// service endpoint interface
else if(_decl instanceof InterfaceDeclaration) {
InterfaceDeclaration interfaceDecl = (InterfaceDeclaration)_decl;
@@ -149,14 +147,12 @@
*/
@Override
public void generate(Declaration _decl) {
-
// todo: persist all object models that have been created [by check()]
}
private BeehiveWsTypeMetadata getEndpointInterfaceObjectModel(String endpointInterface) {
BeehiveWsTypeMetadata om = null;
-
// search for persistent object model
try {
om = Jsr181ObjectModelStore.load(getClass().getClassLoader().getResourceAsStream(Jsr181ObjectModelStore.getLocation(endpointInterface).toString()));
@@ -174,7 +170,6 @@
catch(Throwable t) {
}
}
-
return om;
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/processor/apt/WsmAnnotationProcessorFactory.java Wed Jun 1 15:57:48 2005
@@ -30,6 +30,7 @@
public class WsmAnnotationProcessorFactory
implements AnnotationProcessorFactory {
+
private static final Collection<String> supportedAnnotations =
Collections.unmodifiableCollection(Arrays.asList(new String[]{
"javax.jws.WebService",
@@ -54,8 +55,7 @@
return supportedOptions;
}
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds, AnnotationProcessorEnvironment env)
- {
+ public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds, AnnotationProcessorEnvironment env) {
return new WsmAnnotationProcessor(atds, env);
}
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/registration/TypeRegistrar.java Wed Jun 1 15:57:48 2005
@@ -47,8 +47,7 @@
* @param typeMapping
* @param lookupService
*/
- public TypeRegistrar(TypeMapping typeMapping,
- BindingLookupService lookupService) {
+ public TypeRegistrar(TypeMapping typeMapping, BindingLookupService lookupService) {
super();
mTypeMapping = typeMapping;
this.lookupService = lookupService;
@@ -65,7 +64,8 @@
* @param q
*/
abstract protected void registerClassAsWithDefaultSearialization(Class cls,
- QName q, SOAPBinding.Style style,
+ QName q,
+ SOAPBinding.Style style,
SOAPBinding.Use use);
/**
@@ -84,8 +84,10 @@
* @throws InvocationTargetException
*/
abstract protected void registerClassAsDataHandler(Class cls, QName q)
- throws ClassNotFoundException, NoSuchMethodException,
- InstantiationException, IllegalAccessException,
+ throws ClassNotFoundException,
+ NoSuchMethodException,
+ InstantiationException,
+ IllegalAccessException,
InvocationTargetException;
/**
@@ -122,11 +124,10 @@
return registerType(cls, q, style, use);
}
- public QName registerType(Class cls, QName q, SOAPBinding.Style style,
- SOAPBinding.Use use) {
+ public QName registerType(Class cls, QName q, SOAPBinding.Style style, SOAPBinding.Use use) {
try {
- logger.debug("Register class: " + cls.getCanonicalName()
- + " qName: " + q);
+ logger.debug("Register class: " + cls.getCanonicalName() + " qName: " + q);
+
if(Void.TYPE.equals(cls))
return null;
@@ -153,20 +154,20 @@
}
// incase of literal, or encoded register the class also
q = registerType(cls.getComponentType(), q, style, use);
-
}
else if(!classIsRegistered(cls, q)) {
+
if(org.apache.xmlbeans.XmlObject.class.isAssignableFrom(cls)) {
registerClassAsXMLBeans(cls, q);
}
/*
- * NOTE jcolwell@bea.com 2004-Oct-11 -- these datahandler using
- * classes are generally already registered but just in case...
- */
+ * 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(cls)
- || getMultipartClass().isAssignableFrom(cls) || getDataHandlerClass()
- .isAssignableFrom(cls))) {
+ || getMultipartClass().isAssignableFrom(cls)
+ || getDataHandlerClass().isAssignableFrom(cls))) {
try {
registerClassAsDataHandler(cls, q);
}
@@ -178,19 +179,17 @@
e.printStackTrace();
}
}
- else if(!Remote.class.isAssignableFrom(cls)
- /*
- * NOTE jcolwell@bea.com 2004-Oct-11 -- 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. That and
- * it causes an infinite loop as it keeps returning itself from
- * the getAbsoluteFile and getCanonicalFile calls
- */
- && !File.class.isAssignableFrom(cls)) {
+ /*
+ * NOTE jcolwell@bea.com 2004-Oct-11 -- 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. That and
+ * it causes an infinite loop as it keeps returning itself from
+ * the getAbsoluteFile and getCanonicalFile calls
+ */
+ else if(!Remote.class.isAssignableFrom(cls) && !File.class.isAssignableFrom(cls)) {
registerClassAsWithDefaultSearialization(cls, q, style, use);
}
else {
@@ -200,10 +199,7 @@
+ " consider using a custom type mapping");
}
}
- // }
- // }
- logger.info("Registered class: " + cls.getCanonicalName()
- + " qName: " + q);
+ logger.info("Registered class: " + cls.getCanonicalName() + " qName: " + q);
return q;
}
catch(RuntimeException e) {
@@ -213,7 +209,7 @@
e.printStackTrace();
throw e;
}
- } // public Class q2Class(QName qType) { //
+ }
private boolean isActivationEnabled() {
return null != getDataHandlerClass() && null != getMultipartClass();
@@ -221,8 +217,7 @@
private Class getDataHandlerClass() {
try {
- return getClass().getClassLoader().loadClass(
- "javax.activation.DataHandler");
+ return getClass().getClassLoader().loadClass("javax.activation.DataHandler");
}
catch(Exception e) {
}
@@ -231,8 +226,7 @@
private Class getMultipartClass() {
try {
- return getClass().getClassLoader().loadClass(
- "javax.mail.internet.MimeMultipart");
+ return getClass().getClassLoader().loadClass("javax.mail.internet.MimeMultipart");
}
catch(Exception e) {
}
@@ -241,7 +235,6 @@
/**
* @param t
- * @throws Exception
*/
static public Class getHoldersValueClass(Type t) {
Class res = null;
@@ -252,8 +245,7 @@
if(GenericHolder.class.isAssignableFrom((Class)raw)) {
Type[] typeArgs = pt.getActualTypeArguments();
if(typeArgs[0] instanceof GenericArrayType) {
- Class arrayElementType = (Class)((GenericArrayType)typeArgs[0])
- .getGenericComponentType();
+ Class arrayElementType = (Class)((GenericArrayType)typeArgs[0]).getGenericComponentType();
res = Array.newInstance(arrayElementType, 0).getClass();
}
else {
@@ -261,8 +253,7 @@
}
}
else {
- throw new RuntimeException(
- "Invalid parameterized type for holder: " + t);
+ throw new RuntimeException("Invalid parameterized type for holder: " + t);
}
}
@@ -279,11 +270,10 @@
}
}
else {
- throw new RuntimeException("Invalid class. Type: " + t
- + " is not a holder.");
+ throw new RuntimeException("Invalid class. Type: " + t + " is not a holder.");
}
}
// other wise just return the type
return res;
}
-}
+}
\ No newline at end of file
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/InvalidTypeMappingException.java Wed Jun 1 15:57:48 2005
@@ -24,7 +24,8 @@
* @author Jonathan Colwell
*/
public class InvalidTypeMappingException
- extends java.lang.Exception {
+ extends Exception {
+
public InvalidTypeMappingException() {
super();
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/TypeMappingUtil.java Wed Jun 1 15:57:48 2005
@@ -29,11 +29,10 @@
* @author Jonathan Colwell
*/
public interface TypeMappingUtil {
- public QName registerType(Class cls)
- throws InvalidTypeMappingException;
- public QName registerType(Class cls, QName expectedType)
- throws InvalidTypeMappingException;
+ public QName registerType(Class cls) throws InvalidTypeMappingException;
+
+ public QName registerType(Class cls, QName expectedType) throws InvalidTypeMappingException;
public Class q2Class(QName qType);
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/util/XmlBeanTypeMappingUtil.java Wed Jun 1 15:57:48 2005
@@ -37,21 +37,18 @@
*/
public class XmlBeanTypeMappingUtil
implements TypeMappingUtil {
+
public QName registerType(Class cls)
throws InvalidTypeMappingException {
- throw new InvalidTypeMappingException
- ("this implementation does not support type registration");
+ throw new InvalidTypeMappingException("this implementation does not support type registration");
}
public QName registerType(Class cls, QName expectedType)
throws InvalidTypeMappingException {
-
- throw new InvalidTypeMappingException
- ("this implementation does not support type registration");
+ throw new InvalidTypeMappingException("this implementation does not support type registration");
}
public QName generateQName(Class type, String defaultNS) {
-
if(XmlObject.class.isAssignableFrom(type)) {
return XmlBeans.typeForClass(type).getName();
}
@@ -61,7 +58,6 @@
}
public Class q2Class(QName qType) {
-
SchemaTypeLoader stl = XmlBeans.getContextTypeLoader();
SchemaType st = stl.findType(qType);
if(st == null) {
@@ -77,8 +73,7 @@
//String clName = xmlClass.getName();
if(st.isBuiltinType()) {
Method[] declared = xmlClass.getDeclaredMethods();
- Class natural =
- scanDeclaredMethodsForViableReturnType(declared);
+ Class natural = scanDeclaredMethodsForViableReturnType(declared);
if(natural != null) {
return natural;
}
@@ -88,8 +83,7 @@
if(xmlClass.isInterface()) {
for(Class cl : xmlClass.getInterfaces()) {
- natural = scanDeclaredMethodsForViableReturnType
- (cl.getDeclaredMethods());
+ natural = scanDeclaredMethodsForViableReturnType(cl.getDeclaredMethods());
if(natural != null) {
return natural;
}
@@ -97,8 +91,7 @@
}
else {
declared = xmlClass.getSuperclass().getDeclaredMethods();
- natural = scanDeclaredMethodsForViableReturnType
- (declared);
+ natural = scanDeclaredMethodsForViableReturnType(declared);
if(natural != null) {
return natural;
}
@@ -125,8 +118,7 @@
}
}
- private Class scanDeclaredMethodsForViableReturnType
- (Method[] declared) {
+ private Class scanDeclaredMethodsForViableReturnType(Method[] declared) {
for(Method meth : declared) {
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java Wed Jun 1 15:57:48 2005
@@ -42,11 +42,9 @@
VelocityEngine ve = null;
Template template = null;
-
protected abstract BeehiveWsTypeMetadata getWSObjectModel(InputStream wsdl)
throws Exception;
-
/**
* @throws Exception
*/
@@ -101,30 +99,23 @@
}
}
- public void generateAnnotatedJavaFromWSDL(String wsdlFileName,
- String baseSrcDir)
+ public void generateAnnotatedJavaFromWSDL(String wsdlFileName, String baseSrcDir)
throws Exception {
InputStream wsdl = new FileInputStream(wsdlFileName);
BeehiveWsTypeMetadata om = getWSObjectModel(wsdl);
String className = om.getWsName();
- String packageName = "web"; // Later see if the target name service is
- // better option
- String packageDirName = packageName.replaceAll("\\.", "/"); // nop right
- // now,
- // useful if
- // the
- // target
- // package
- // name
+ // Later see if the target name service is better option
+ String packageName = "web";
+ // nop right now, useful if the target package name
+ String packageDirName = packageName.replaceAll("\\.", "/");
File packageDir = new File(baseSrcDir + "/" + packageDirName);
if(!packageDir.exists())
packageDir.mkdirs();
- String fullFilePath = baseSrcDir + "/" + packageDirName + "/"
- + className + ".java";
+ String fullFilePath = baseSrcDir + "/" + packageDirName + "/" + className + ".java";
File srcFile = new File(fullFilePath);
srcFile.createNewFile();
@@ -132,10 +123,8 @@
generateAnnotatedJavaFromOM(om, w);
}
-
public void generateAnnotatedJavaFromWSDL(InputStream wsdl, Writer w)
throws Exception {
-
BeehiveWsTypeMetadata om = getWSObjectModel(wsdl);
generateAnnotatedJavaFromOM(om, w);
}
@@ -157,6 +146,4 @@
template.merge(context, w);
w.close();
}
-
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Schema.java Wed Jun 1 15:57:48 2005
@@ -31,8 +31,8 @@
import org.apache.xmlbeans.impl.xb.xsdschema.TopLevelSimpleType;
import org.xmlsoap.schemas.wsdl.TTypes;
-
public class Schema {
+
SchemaDocument.Schema[] schemas;
/**
@@ -42,7 +42,6 @@
*/
public Schema(TTypes tt)
throws IllegalAccessException, NoSuchFieldException {
-
schemas = Utilities.selectChildren(tt, SchemaDocument.Schema.class);
}
@@ -72,7 +71,6 @@
if(null == schema)
return null; // namespace is not found in this schema.
-
// look in complex types
TopLevelComplexType[] tlComplexTypes = schema.getComplexTypeArray();
for(TopLevelComplexType nxtComplexType : tlComplexTypes) {
@@ -99,5 +97,4 @@
return null; // it is not in comlex or simple types!
}
-
-}
+}
\ No newline at end of file
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/Utilities.java Wed Jun 1 15:57:48 2005
@@ -30,10 +30,13 @@
import org.apache.xmlbeans.XmlObject;
public class Utilities {
- public static <T extends XmlObject> T[] selectChildren(XmlObject parent,
- Class<T> childClass)
- throws IllegalAccessException,
- NoSuchFieldException {
+
+ // Keep a cache of schemas that have been read.
+ static Map<String, Schema> schemaCache = new HashMap<String, Schema>();
+
+ public static <T extends XmlObject> T[] selectChildren(XmlObject parent, Class<T> childClass)
+ throws IllegalAccessException, NoSuchFieldException {
+
// retrieve the SchemaType from the static type field
SchemaType st = (SchemaType)childClass.getField("type").get(null);
XmlObject[] kids = parent.selectChildren(st.getDocumentElementName());
@@ -44,29 +47,15 @@
return castKids;
}
- /**
- * @param docType
- * @return
- * @throws XmlException
- * @throws IOException
- * @throws IllegalAccessException
- * @throws NoSuchFieldException
- */
-
- // Keep a cache of schemas that have been read.
- static Map<String, Schema> schemaCache = new HashMap<String, Schema>();
-
public static Schema findtSchemaDocument(SchemaType docType)
- throws XmlException, IOException, IllegalAccessException,
- NoSuchFieldException {
+ throws XmlException, IOException, IllegalAccessException, NoSuchFieldException {
+
Schema mySchema = null;
- if(null != (mySchema = schemaCache.get(docType.getName()
- .getNamespaceURI()))) {
+ if(null != (mySchema = schemaCache.get(docType.getName().getNamespaceURI()))) {
return mySchema;
}
String schemaSrc = docType.getSourceName();
- InputStream stream = docType.getTypeSystem().getSourceAsStream(
- schemaSrc);
+ InputStream stream = docType.getTypeSystem().getSourceAsStream(schemaSrc);
if(null == stream) {
throw new RuntimeException("WSDL file not found: " + schemaSrc);
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLParser.java Wed Jun 1 15:57:48 2005
@@ -31,6 +31,7 @@
import org.xmlsoap.schemas.wsdl.soap.TAddress;
public class WSDLParser {
+
InputStream stream;
DefinitionsDocument defDoc;
TTypes tt;
@@ -39,13 +40,12 @@
/**
* @param stream
- * @throws IOException
- * @throws XmlException
* @throws NoSuchFieldException
* @throws IllegalAccessException
*/
public WSDLParser(InputStream stream)
throws XmlException, IOException, IllegalAccessException, NoSuchFieldException {
+
super();
this.stream = stream;
@@ -53,7 +53,6 @@
tt = defDoc.getDefinitions().getTypesArray(0);
schema = new Schema(tt);
services = defDoc.getDefinitions().getServiceArray();
-
}
/**
@@ -82,6 +81,4 @@
}
return location;
}
-
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/WSDLProcessor.java Wed Jun 1 15:57:48 2005
@@ -29,6 +29,7 @@
* @author Jonathan Colwell
*/
public interface WSDLProcessor {
+
/**
* Converts a WSDL document in the provided InputStream into the WSM
* Model.
@@ -38,5 +39,4 @@
*/
public BeehiveWsTypeMetadata createObjectModel(InputStream wsdlStream)
throws Exception;
-
}
Modified: incubator/beehive/trunk/wsm/src/runtime/schema/beehive-role.xsd
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/schema/beehive-role.xsd?rev=179452&r1=179451&r2=179452&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/schema/beehive-role.xsd (original)
+++ incubator/beehive/trunk/wsm/src/runtime/schema/beehive-role.xsd Wed Jun 1 15:57:48 2005
@@ -1,4 +1,5 @@
-<!-- Copyright 2004 The Apache Software Foundation
+<!--
+ Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -10,7 +11,8 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License. -->
+ limitations under the License.
+-->
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:bh="http://www.apache.org/beehive/wsm/axis/security/xmlbeans"